dsh-taskboard 0.6.5 → 0.6.7

package/src/client/board/TaskDetail.tsx

@@ -9,12 +9,12 @@
  */
 import { useEffect, useState, type ReactNode } from 'react'
 import type { BoardController } from '../controller.ts'
-import type { ExecutionRecord, TaskRecord } from '../../shared/protocol.ts'
-import { canTransition, checklistProgress } from '../../shared/protocol.ts'
+import type { CommentRecord, ExecutionRecord, TaskRecord } from '../../shared/protocol.ts'
+import { canTransition, checklistProgress, taskAssociatedSessionIds } from '../../shared/protocol.ts'
 import { useAlert } from './AlertModal.tsx'
 import { fmtTime, isStaleClaim } from './format.ts'
 import { MOVE_KEYS, OUTCOME_KEYS, STATUS_KEYS, URGENCY_KEYS } from './labels.ts'
-import { useT } from '../i18n/runtime.ts'
+import { useT, type Translate } from '../i18n/runtime.ts'
 
 /** Statuses a user may move this task to, per the state machine. */
 function moveTargets(task: TaskRecord): TaskRecord['status'][] {
@@ -28,6 +28,26 @@ function shortId(id: string | undefined): string {
   return id.replace(/^session-(taskboard-)?/, '').slice(0, 8)
 }
 
+/**
+ * Render a comment body, localizing host-generated system messages (0.6.4).
+ * System comments carry a `systemKey` (+ flat params, or structured per-repo
+ * rows for the multi-repo merge summary); user/agent comments render raw.
+ */
+export function commentBody(t: Translate, c: CommentRecord): string {
+  if (c.systemKey === undefined) return c.body
+  if (c.systemRows !== undefined) {
+    const summary = c.systemRows
+      .map(r => {
+        const label = r.repo === '' ? t('iso.repo.root') : r.repo
+        const mark = r.outcome === 'merged' ? '✓' : r.outcome === 'noop' ? '⟲' : '✗'
+        return r.outcome === 'failed' && r.error !== undefined ? `${label} ${mark} ${r.error}` : `${label} ${mark}`
+      })
+      .join(' · ')
+    return t(c.systemKey, { summary })
+  }
+  return t(c.systemKey, c.systemParams)
+}
+
 /** Execution duration between start and end. */
 function duration(startedAt: number | undefined, endedAt: number | undefined): string {
   if (startedAt === undefined || endedAt === undefined) return ''
@@ -497,6 +517,7 @@ export function TaskDetail({ task, controller, now }: { task: TaskRecord; contro
   const [confirmDone, setConfirmDone] = useState(false)
   const [confirmPurge, setConfirmPurge] = useState(false)
   const [confirmCancel, setConfirmCancel] = useState(false)
+  const [confirmArchive, setConfirmArchive] = useState(false)
   // Top action buttons (duplicate / save-as-template / run / reuse-run)
   // share one in-flight guard: a double click used to fire duplicate runs or
   // copies while the first round-trip was still pending (review P0).
@@ -510,6 +531,9 @@ export function TaskDetail({ task, controller, now }: { task: TaskRecord; contro
   const unchecked = (task.checklist ?? []).filter(i => !i.checked).length
   const sessionExecution = [...task.executions].reverse().find(e => e.sessionId !== undefined)
   const targetSessionId = runningExecution?.sessionId ?? sessionExecution?.sessionId ?? (task.claimedBy?.startsWith('session-') ? task.claimedBy : undefined)
+  const associatedSessions = taskAssociatedSessionIds(task)
+  const archiveState = controller.getSnapshot()
+  const archiveResult = archiveState.sessionArchive?.taskId === task.id ? archiveState.sessionArchive.result : undefined
 
   /** Fire one top action under the shared busy guard; re-enable on settle. */
   const runAction = (action: () => Promise<unknown>): void => {
@@ -680,10 +704,21 @@ export function TaskDetail({ task, controller, now }: { task: TaskRecord; contro
 
       <ChecklistBlock task={task} controller={controller} />
 
+      {archiveResult !== undefined && (
+        <div role="status" className="dsh-atb-confirm">
+          <span>{t('detail.move.archiveResult', { n: archiveResult.archived.length })}</span>
+          {archiveResult.failed.map(item => <span key={item.sessionId}>{item.sessionId}: {item.error}</span>)}
+          {archiveResult.unsupported.length > 0 && <span>{t('detail.move.archiveUnsupported')} {archiveResult.unsupported.join(', ')}</span>}
+        </div>
+      )}
+      {task.status === 'archived' && associatedSessions.length > 0 && archiveState.archiveSessionsSupported && (
+        <button type="button" className="dsh-atb-btn" disabled={actionBusy} onClick={() => runAction(() => controller.retryArchiveSessions(task.id))}>{t('detail.move.archiveRetry')}</button>
+      )}
       <div className="dsh-atb-detail-actions">
         <div className="dsh-atb-movebtns">
-          {moveTargets(task).map(to => to === 'done'
-            ? (confirmDone
+          {moveTargets(task).map(to => {
+            if (to === 'done') {
+              return confirmDone
                 ? (
                     <span key={to} className="dsh-atb-confirm">
                       <span className="dsh-atb-confirm-label" data-tone={unchecked > 0 ? 'bad' : undefined}>
@@ -693,12 +728,83 @@ export function TaskDetail({ task, controller, now }: { task: TaskRecord; contro
                       <button type="button" className="dsh-atb-btn" onClick={() => setConfirmDone(false)}>{t('shared.cancel')}</button>
                     </span>
                   )
-                : <button key={to} type="button" className="dsh-atb-movebtn" data-to={to} onClick={() => setConfirmDone(true)}>{t('detail.move.to', { status: t(MOVE_KEYS[to]) })}</button>)
-            : (
-                <button key={to} type="button" className="dsh-atb-movebtn" data-to={to} onClick={() => void controller.move(task.id, task.version, to)}>
+                : <button key={to} type="button" className="dsh-atb-movebtn" data-to={to} onClick={() => { setConfirmDone(true); setConfirmArchive(false) }}>{t('detail.move.to', { status: t(MOVE_KEYS[to]) })}</button>
+            }
+            if (to === 'archived') {
+              if (confirmArchive) {
+                return (
+                  <span key={to} className="dsh-atb-confirm">
+                    <span className="dsh-atb-confirm-label">
+                      {associatedSessions.length === 1
+                        ? t('detail.move.confirmArchiveSessionWithId', { id: shortId(associatedSessions[0]) })
+                        : associatedSessions.length > 1
+                          ? t('detail.move.confirmArchiveSessionCount', { n: associatedSessions.length })
+                          : t('detail.move.confirmArchive')}
+                    </span>
+                    {associatedSessions.length > 0 && <span className="dsh-atb-confirm-label">{associatedSessions.join(', ')}</span>}
+                    {associatedSessions.length > 0 ? (
+                      <>
+                        <button
+                          type="button"
+                          className="dsh-atb-btn"
+                          disabled={!archiveState.archiveSessionsSupported || actionBusy}
+                          title={!archiveState.archiveSessionsSupported ? t('detail.move.archiveUnsupported') : undefined}
+                          onClick={() => {
+                            runAction(() => controller.move(task.id, task.version, 'archived', { archiveSessions: true }))
+                            setConfirmArchive(false)
+                          }}
+                        >
+                          {t('detail.move.archiveWithSession')}
+                        </button>
+                        <button
+                          type="button"
+                          className="dsh-atb-btn"
+                          onClick={() => {
+                            runAction(() => controller.move(task.id, task.version, 'archived', { archiveSessions: false }))
+                            setConfirmArchive(false)
+                          }}
+                        >
+                          {t('detail.move.archiveCardOnly')}
+                        </button>
+                      </>
+                    ) : (
+                      <button
+                        type="button"
+                        className="dsh-atb-btn"
+                        data-primary="true"
+                        onClick={() => {
+                          void controller.move(task.id, task.version, 'archived')
+                          setConfirmArchive(false)
+                        }}
+                      >
+                        {t('detail.move.confirm')}
+                      </button>
+                    )}
+                    <button type="button" className="dsh-atb-btn" onClick={() => setConfirmArchive(false)}>{t('shared.cancel')}</button>
+                  </span>
+                )
+              }
+              return (
+                <button
+                  key={to}
+                  type="button"
+                  className="dsh-atb-movebtn"
+                  data-to={to}
+                  onClick={() => {
+                    setConfirmArchive(true)
+                    setConfirmDone(false)
+                  }}
+                >
                   {t('detail.move.to', { status: t(MOVE_KEYS[to]) })}
                 </button>
-              ))}
+              )
+            }
+            return (
+              <button key={to} type="button" className="dsh-atb-movebtn" data-to={to} onClick={() => void controller.move(task.id, task.version, to)}>
+                {t('detail.move.to', { status: t(MOVE_KEYS[to]) })}
+              </button>
+            )
+          })}
           <button type="button" className="dsh-atb-movebtn" data-to="blocked" onClick={() => void controller.toggleBlocked(task)}>
             {task.blocked ? t('detail.blocked.unmark') : t('detail.blocked.mark')}
           </button>
@@ -730,7 +836,7 @@ export function TaskDetail({ task, controller, now }: { task: TaskRecord; contro
                         <b>{c.threadId !== undefined ? `agent ${shortId(c.threadId)}` : t('detail.comments.user')}</b>
                         <span>{fmtTime(c.createdAt)}</span>
                       </div>
-                      <div className="dsh-atb-bubble-body">{c.body}</div>
+                      <div className="dsh-atb-bubble-body">{commentBody(t, c)}</div>
                     </div>
                   </div>
                 ))}

package/src/client/board/TemplateManager.tsx

@@ -7,8 +7,12 @@
  */
 import { useState } from 'react'
 import type { BoardController } from '../controller.ts'
+import type { TaskTemplate } from '../../shared/api.ts'
+import type { Urgency } from '../../shared/protocol.ts'
 import { useAlert } from './AlertModal.tsx'
+import { URGENCY_KEYS } from './labels.ts'
 import { useT } from '../i18n/runtime.ts'
+import { localizeBuiltinName, localizeBuiltinTask } from '../i18n/templates.ts'
 
 /**
  * The template manager modal.
@@ -23,12 +27,20 @@ export function TemplateManager({ controller }: { controller: BoardController })
 
   const close = (): void => controller.closeTemplateManager()
 
-  const nameOf = (id: string, fallback: string): string => edits[id] ?? fallback
+  /** The name a row currently shows: an in-flight rename edit, else the localized name. */
+  const nameOf = (tpl: TaskTemplate): string => edits[tpl.id] ?? localizeBuiltinName(tpl)
+
+  /** Localized urgency label for the meta line ('' when the template pins none). */
+  const urgencyLabel = (urgency: string | undefined): string => {
+    if (urgency === undefined) return ''
+    const key = URGENCY_KEYS[urgency as Urgency]
+    return key !== undefined ? ` · ${t(key)}` : ` · ${urgency}`
+  }
 
   /** Save one template's rename. */
   const save = (id: string, name: string): void => {
     const template = state.templates.find(t => t.id === id)
-    if (template === undefined || name === template.name) return
+    if (template === undefined || name === localizeBuiltinName(template)) return
     void controller.upsertTemplate({ id, name, task: template.task }).then(ok => {
       if (ok) {
         setEdits(prev => { const next = { ...prev }; delete next[id]; return next })
@@ -57,31 +69,31 @@ export function TemplateManager({ controller }: { controller: BoardController })
                     <div key={tpl.id} className="dsh-atb-tplm-row">
                       <input
                         className="dsh-atb-tplm-name"
-                        value={nameOf(tpl.id, tpl.name)}
+                        value={nameOf(tpl)}
                         maxLength={60}
                         spellCheck={false}
-                        aria-label={t('tpl.name.aria', { name: tpl.name })}
+                        aria-label={t('tpl.name.aria', { name: localizeBuiltinName(tpl) })}
                         onChange={e => setEdits(prev => ({ ...prev, [tpl.id]: e.target.value }))}
                         onKeyDown={e => {
-                          if (e.key === 'Enter') save(tpl.id, nameOf(tpl.id, tpl.name))
+                          if (e.key === 'Enter') save(tpl.id, nameOf(tpl))
                         }}
                       />
                       <span
                         className="dsh-atb-tplm-meta"
-                        title={`${tpl.builtin === true ? t('tpl.builtin') : t('tpl.custom')}${tpl.task.checklist !== undefined && tpl.task.checklist.length > 0 ? t('tpl.meta.checklist', { n: tpl.task.checklist.length }) : ''}${tpl.task.urgency !== undefined ? ` · ${tpl.task.urgency}` : ''}${tpl.task.permission !== undefined ? ` · ${t('shared.permission')}: ${tpl.task.permission}` : ''}`}
+                        title={`${tpl.builtin === true ? t('tpl.builtin') : t('tpl.custom')}${tpl.task.checklist !== undefined && tpl.task.checklist.length > 0 ? t('tpl.meta.checklist', { n: tpl.task.checklist.length }) : ''}${urgencyLabel(tpl.task.urgency)}${tpl.task.permission !== undefined ? ` · ${t('shared.permission')}: ${tpl.task.permission}` : ''}`}
                       >
                         {tpl.builtin === true ? t('tpl.builtin') : t('tpl.custom')}
                         {tpl.task.checklist !== undefined && tpl.task.checklist.length > 0 ? t('tpl.meta.checklist', { n: tpl.task.checklist.length }) : ''}
-                        {tpl.task.urgency !== undefined ? ` · ${tpl.task.urgency}` : ''}
+                        {urgencyLabel(tpl.task.urgency)}
                         {tpl.task.permission !== undefined && tpl.task.permission !== 'workspace-write' ? ` · ${tpl.task.permission === 'read-only' ? t('tpl.meta.permReadOnly') : t('tpl.meta.permFull')}` : ''}
                       </span>
                       <span className="dsh-atb-tplm-btns">
                         <button
                           type="button"
                           className="dsh-atb-btn"
-                          disabled={nameOf(tpl.id, tpl.name) === tpl.name || nameOf(tpl.id, tpl.name).trim().length === 0}
+                          disabled={nameOf(tpl) === localizeBuiltinName(tpl) || nameOf(tpl).trim().length === 0}
                           title={t('tpl.rename.title')}
-                          onClick={() => save(tpl.id, nameOf(tpl.id, tpl.name))}
+                          onClick={() => save(tpl.id, nameOf(tpl))}
                         >
                           {t('tpl.rename.button')}
                         </button>
@@ -91,7 +103,7 @@ export function TemplateManager({ controller }: { controller: BoardController })
                           title={t('tpl.use.title')}
                           onClick={() => {
                             close()
-                            controller.newFromTemplate(tpl.task)
+                            controller.newFromTemplate(localizeBuiltinTask(tpl))
                           }}
                         >
                           {t('tpl.use.button')}

package/src/client/board-mount.tsx

@@ -19,6 +19,7 @@ import { createRoot, type Root } from 'react-dom/client'
 import type { BoardController } from './controller.ts'
 import { TaskBoard } from './board/TaskBoard.tsx'
 import { ENTRY_SELECTOR } from './sidebar-entry.ts'
+import { installWindowInset } from './window-inset.ts'
 
 /** The injected board container. */
 export const BOARD_VIEW_SELECTOR = '[data-dsh-atb-view]'
@@ -45,6 +46,7 @@ function conversationColumn(): HTMLElement | undefined {
 export function mountBoard(controller: BoardController): () => void {
   let root: Root | undefined
   let container: HTMLDivElement | undefined
+  let disposeWindowInset: (() => void) | undefined
 
   const ensure = (): void => {
     if (container !== undefined) return
@@ -54,6 +56,7 @@ export function mountBoard(controller: BoardController): () => void {
     container.dataset.dshAtbView = ''
     container.className = 'dsh-atb-view'
     column.appendChild(container)
+    disposeWindowInset = installWindowInset(container)
     root = createRoot(container)
     root.render(<TaskBoard controller={controller} />)
   }
@@ -101,6 +104,7 @@ export function mountBoard(controller: BoardController): () => void {
     document.removeEventListener(ACTIVATE_EVENT, onOtherActivate)
     waitObserver.disconnect()
     unsubscribe()
+    disposeWindowInset?.()
     document.documentElement.removeAttribute(ACTIVE_ATTR)
     root?.unmount()
     container?.remove()

package/src/client/controller.ts

@@ -1,3 +1,4 @@
+import type { SessionArchiveResult } from '../shared/api.ts'
 /**
  * The board controller: framework-free state holder the React views render
  * from. Owns the ledger snapshot, workspace listing, view state (open,
@@ -47,6 +48,8 @@ function loadView(): { workspaceId?: string; urgencies: Urgency[]; sortBy: SortB
 
 /** Controller snapshot the views render. */
 export interface ControllerState {
+  archiveSessionsSupported?: boolean
+  sessionArchive?: { taskId: string; result: SessionArchiveResult }
   boardOpen: boolean
   ledger: TaskLedger
   workspaces: WorkspaceView[]
@@ -185,7 +188,7 @@ export class BoardController {
           if (this.state.selectedId !== undefined) {
             selected = ledger.tasks.find(t => t.id === this.state.selectedId)
           }
-          this.setState({ ledger, workspaces, error: undefined, selectedId: selected === undefined ? undefined : this.state.selectedId })
+          this.setState({ archiveSessionsSupported: ledger.capabilities?.archiveSessions === true, ledger, workspaces, error: undefined, selectedId: selected === undefined ? undefined : this.state.selectedId })
           if (this.seenRevision === undefined || ledger.revision >= this.seenRevision) break
         }
       } catch (error) {
@@ -422,10 +425,27 @@ export class BoardController {
     }
   }
 
+  /** Retry session archiving without repeating the task's terminal transition. */
+  async retryArchiveSessions(id: string): Promise<void> {
+    try {
+      if (this.client.archiveSessions === undefined) return
+      const result = await this.client.archiveSessions(id)
+      this.setState({ sessionArchive: { taskId: id, result } })
+      await this.refresh()
+    } catch (error) {
+      this.setState({ error: error instanceof Error ? error.message : String(error) })
+    }
+  }
+
   /** Move a task (user surface: done allowed). */
-  async move(id: string, ifVersion: number, status: string): Promise<void> {
+  async move(id: string, ifVersion: number, status: string, options?: { archiveSessions?: boolean }): Promise<void> {
     try {
-      await this.client.move(id, { ifVersion, status })
+      const result = await this.client.move(id, {
+        ifVersion,
+        status,
+        ...(options?.archiveSessions !== undefined ? { archiveSessions: options.archiveSessions } : {}),
+      })
+      if (result.sessionArchive !== undefined) this.setState({ sessionArchive: { taskId: id, result: result.sessionArchive } })
       await this.refresh()
     } catch (error) {
       this.setState({ error: error instanceof Error ? error.message : String(error) })

package/src/client/i18n/en.ts

@@ -213,6 +213,14 @@ export const en: TaskboardDict = {
   'detail.move.to': 'Move to → {status}',
   'detail.move.confirmDoneUnchecked': '{n} checklist items are still unchecked — confirm done?',
   'detail.move.confirmDone': 'Confirm done?',
+  'detail.move.confirmArchive': 'Confirm archive this task?',
+  'detail.move.confirmArchiveSessionWithId': 'Archive execution session {id} together?',
+  'detail.move.confirmArchiveSessionCount': 'Archive {n} execution sessions together?',
+  'detail.move.archiveWithSession': 'With session',
+  'detail.move.archiveUnsupported': 'Session archiving is unavailable on this host',
+  'detail.move.archiveResult': 'Card archived; {n} execution sessions archived. Failed sessions, if any:',
+  'detail.move.archiveRetry': 'Archive / retry execution sessions',
+  'detail.move.archiveCardOnly': 'Card only',
   'detail.move.confirm': 'Confirm',
   'detail.blocked.unmark': '✓ Unblock',
   'detail.blocked.mark': '⛔ Mark blocked',
@@ -456,4 +464,14 @@ export const en: TaskboardDict = {
   'slash.skill.source-driven-development': 'Design from authoritative docs and source code',
   'slash.skill.spec-driven-development': 'Write clear technical specs before coding',
   'slash.skill.using-agent-skills': 'Discover and invoke agent skills dynamically',
+
+  // ── host-generated system comments (0.6.4; localized at render) ────
+  'sys.execFailed': '[System] Execution failed: {error}; the task was returned to todo.',
+  'sys.endedWithComment': '[System] The execution session ended with comments but was not moved to in review; the system moved it to in review automatically.',
+  'sys.endedNoHandoff': '[System] The execution session ended without a protocol handoff (no comments, not moved to in review); the system moved it to in review automatically — review it, then send back or accept.',
+  'sys.sessionError': '[System] Session execution error: {error}; the task was returned to todo.',
+  'sys.sessionDone': '[System] The session finished; automatically moved to in review.',
+  'sys.cronDead': '[System] The cron expression {cron} has no trigger time within 4 years; scheduling disabled — fix the cron and re-enable.',
+  'sys.mergeSingle': '[System] Branch {branch} merged into the main worktree (--no-ff).',
+  'sys.mergeMulti': '[System] Branches merged per repo (--no-ff): {summary}',
 }

package/src/client/i18n/templates.ts

@@ -0,0 +1,25 @@
+/**
+ * Client-side localization of built-in task templates (0.6.4). Built-in
+ * templates are seeded host-side with zh fallback text; this module resolves
+ * the ACTIVE locale's content (name + task spec) so the new-task dropdown,
+ * the template manager, and the create-form prefill follow the GUI language
+ * live. Custom templates (no `builtin` flag) and unknown built-in ids pass
+ * through untouched.
+ *
+ * @module dsh-taskboard/client/i18n/templates
+ */
+import type { TaskTemplate, TaskTemplateSpec } from '../../shared/api.ts'
+import { builtinTemplateContent } from '../../shared/builtin-templates.ts'
+import { localeStore } from './runtime.ts'
+
+/** The localized display name for a template (stored name for custom ones). */
+export function localizeBuiltinName(tpl: Pick<TaskTemplate, 'id' | 'name' | 'builtin'>): string {
+  if (tpl.builtin !== true) return tpl.name
+  return builtinTemplateContent(tpl.id, localeStore.getSnapshot().active)?.name ?? tpl.name
+}
+
+/** The localized task spec for a template (stored spec for custom ones). */
+export function localizeBuiltinTask(tpl: Pick<TaskTemplate, 'id' | 'task' | 'builtin'>): TaskTemplateSpec {
+  if (tpl.builtin !== true) return tpl.task
+  return builtinTemplateContent(tpl.id, localeStore.getSnapshot().active)?.task ?? tpl.task
+}

package/src/client/i18n/zh.ts

@@ -215,6 +215,14 @@ export const zh = {
   'detail.move.to': '移至→{status}',
   'detail.move.confirmDoneUnchecked': '仍有 {n} 项清单未勾选，确认完成？',
   'detail.move.confirmDone': '确认完成？',
+  'detail.move.confirmArchive': '确认归档该任务？',
+  'detail.move.confirmArchiveSessionWithId': '是否连同执行会话 {id} 一同归档？',
+  'detail.move.confirmArchiveSessionCount': '是否连同 {n} 个执行会话一同归档？',
+  'detail.move.archiveWithSession': '连同会话归档',
+  'detail.move.archiveUnsupported': '当前宿主不支持会话归档',
+  'detail.move.archiveResult': '卡片已归档；执行会话归档成功 {n} 个。失败会话如下（如有）：',
+  'detail.move.archiveRetry': '归档 / 重试归档执行会话',
+  'detail.move.archiveCardOnly': '仅归档卡片',
   'detail.move.confirm': '确认',
   'detail.blocked.unmark': '✓ 解除受阻',
   'detail.blocked.mark': '⛔ 标记受阻',
@@ -458,6 +466,16 @@ export const zh = {
   'slash.skill.source-driven-development': '基于权威官方文档与源码进行设计实现',
   'slash.skill.spec-driven-development': '在编码前制定清晰的技术规范',
   'slash.skill.using-agent-skills': '发现并动态调用智能体各项专业技能',
+
+  // ── host-generated system comments (0.6.4; localized at render) ────
+  'sys.execFailed': '[系统] 执行失败：{error}；任务已退回待办。',
+  'sys.endedWithComment': '[系统] 执行会话已结束并留有评论，但未移至待验收；系统自动移入待验收。',
+  'sys.endedNoHandoff': '[系统] 执行会话已结束，但未按协议交接（无评论、未移至待验收）；系统自动移入待验收，请审查后退回或验收。',
+  'sys.sessionError': '[系统] 会话执行异常：{error}；任务已退回待办。',
+  'sys.sessionDone': '[系统] 会话执行完毕，已自动进入待验收。',
+  'sys.cronDead': '[系统] 定时表达式 {cron} 在 4 年内没有可触发时间，已停用定时；请修正 cron 后重新开启。',
+  'sys.mergeSingle': '[系统] 分支 {branch} 已合并到主工作区（--no-ff）。',
+  'sys.mergeMulti': '[系统] 分支已按仓库合并（--no-ff）：{summary}',
 } as const
 
 /** The dictionary shape en.ts must match key-for-key. */

package/src/client/styles.ts

@@ -79,6 +79,14 @@ html[data-dsh-atb-active] .dshDesktopConversationSurface > *:not([data-dsh-atb-v
 html[data-dsh-atb-active] .dsh-atb-view { display: flex; flex-direction: column; height: 100%; overflow: hidden; }
 
 .dsh-atb-board { display: flex; flex-direction: column; height: 100%; min-height: 0; padding: 12px 16px; gap: 10px; box-sizing: border-box; }
+/* #20: native Windows caption controls overlay older Desktop content. Reserve
+ * their vertical band, including wrapped toolbar rows. New Desktop layouts
+ * already start below it: subtract the actual view top to avoid double insets.
+ * Electron exposes titlebar-area env values; 36px covers the Desktop frame
+ * when that API is unavailable. Ordinary Web/macOS views never match. */
+.dsh-atb-view[data-dsh-atb-windows] > .dsh-atb-board {
+  padding-top: max(12px, calc(env(titlebar-area-y, 0px) + env(titlebar-area-height, 36px) + 8px - var(--dsh-atb-viewport-top, 0px)));
+}
 .dsh-atb-toolbar { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; }
 /* 0.6.5 / #19: dsh-better-sidebar 钉在视口右上角的常驻按钮簇（2×28px + 4px
  * gap，right:10px → 占视口右边 10~70px）。它对 DSH 原生会话头的避让契约是
@@ -357,7 +365,7 @@ button.dsh-atb-chip2.dsh-atb-chip-btn:hover {
 .dsh-atb-movebtn[data-to="canceled"], .dsh-atb-movebtn[data-to="archived"] { opacity: .75; }
 .dsh-atb-movebtn[data-to="blocked"] { border-color: rgba(229,72,77,.45); }
 .dsh-atb-movebtn[data-to="blocked"]:hover { background: rgba(229,72,77,.1); }
-.dsh-atb-confirm { display: inline-flex; align-items: center; gap: 6px; }
+.dsh-atb-confirm { display: inline-flex; align-items: center; gap: 6px; flex-wrap: wrap; }
 .dsh-atb-confirm-label { font-size: 11.5px; color: var(--dsw-text-secondary, gray); }
 
 .dsh-atb-section { font-size: 13px; display: flex; flex-direction: column; gap: 7px; }
@@ -538,7 +546,10 @@ button.dsh-atb-chip2.dsh-atb-chip-btn:hover {
   color: var(--dsw-alias-label-secondary, gray);
 }
 .dsh-atb-req { color: var(--dsw-alias-state-error-primary, #e5484d); font-style: normal; }
-.dsh-atb-modal-body input, .dsh-atb-modal-body textarea, .dsh-atb-modal-body select {
+/* Checkbox 排除：整行宽输入样式（width:100% + padding/border）特异性 (0,1,1) 高于
+   .dsh-atb-cke-box (0,1,0)，曾把编辑表单清单行的勾选框拉满整行（勾选框画在行
+   中央）、文本框挤扁。清单勾选框保持原生外观与 15px 布局。 */
+.dsh-atb-modal-body input:not([type="checkbox"]), .dsh-atb-modal-body textarea, .dsh-atb-modal-body select {
   font: inherit; font-size: 13px; padding: 7px 10px; border-radius: 8px;
   width: 100%; box-sizing: border-box;
   border: 1px solid var(--dsw-alias-border-l2, rgba(128,128,128,.35));
@@ -546,7 +557,7 @@ button.dsh-atb-chip2.dsh-atb-chip-btn:hover {
   transition: border-color .12s ease, box-shadow .12s ease;
 }
 .dsh-atb-modal-body textarea { min-height: 64px; resize: vertical; }
-.dsh-atb-modal-body input:focus, .dsh-atb-modal-body textarea:focus, .dsh-atb-modal-body select:focus {
+.dsh-atb-modal-body input:not([type="checkbox"]):focus, .dsh-atb-modal-body textarea:focus, .dsh-atb-modal-body select:focus {
   outline: none; border-color: var(--dsw-alias-brand-primary, #1f2328);
   box-shadow: 0 0 0 3px color-mix(in srgb, var(--dsw-alias-brand-primary, #1f2328) 18%, transparent);
 }

package/src/client/window-inset.ts

@@ -0,0 +1,38 @@
+/** Keep injected content below Windows Desktop's native caption controls. */
+export function installWindowInset(view: HTMLElement): () => void {
+  const update = (): void => {
+    const platform = document.body.getAttribute('data-dsh-desktop-platform')
+      ?? new URLSearchParams(window.location.search).get('dsh-desktop-platform')
+    if (platform !== 'win32') {
+      delete view.dataset.dshAtbWindows
+      view.style.removeProperty('--dsh-atb-viewport-top')
+      return
+    }
+    view.dataset.dshAtbWindows = ''
+    view.style.setProperty('--dsh-atb-viewport-top', `${view.getBoundingClientRect().top}px`)
+  }
+  let frame: number | undefined
+  const schedule = (): void => {
+    if (frame !== undefined) return
+    frame = requestAnimationFrame(() => { frame = undefined; update() })
+  }
+  const mutations = new MutationObserver(schedule)
+  mutations.observe(document.body, {
+    attributes: true, childList: true, subtree: true,
+    attributeFilter: ['class', 'data-dsh-desktop-platform', 'data-dsh-desktop-mode', 'data-details-collapsed'],
+  })
+  mutations.observe(document.documentElement, { attributes: true, attributeFilter: ['data-dsh-atb-active'] })
+  const resize = typeof ResizeObserver === 'undefined' ? undefined : new ResizeObserver(schedule)
+  resize?.observe(view)
+  if (view.parentElement !== null) resize?.observe(view.parentElement)
+  window.addEventListener('resize', schedule)
+  schedule()
+  return () => {
+    mutations.disconnect()
+    resize?.disconnect()
+    window.removeEventListener('resize', schedule)
+    if (frame !== undefined) cancelAnimationFrame(frame)
+    delete view.dataset.dshAtbWindows
+    view.style.removeProperty('--dsh-atb-viewport-top')
+  }
+}

package/src/host/archive-sessions.ts

@@ -0,0 +1,18 @@
+import type { SessionArchiveResult } from '../shared/api.ts'
+import { taskAssociatedSessionIds, type TaskRecord } from '../shared/protocol.ts'
+
+/** Idempotent best-effort archiving with explicit per-session outcomes. */
+export async function archiveTaskSessions(task: TaskRecord, archive?: (id: string) => Promise<void>): Promise<SessionArchiveResult> {
+  const sessionIds = taskAssociatedSessionIds(task)
+  if (archive === undefined) return { archived: [], failed: [], unsupported: sessionIds }
+  const result: SessionArchiveResult = { archived: [], failed: [], unsupported: [] }
+  for (const sessionId of sessionIds) {
+    try {
+      await archive(sessionId)
+      result.archived.push(sessionId)
+    } catch (error) {
+      result.failed.push({ sessionId, error: error instanceof Error ? error.message : String(error) })
+    }
+  }
+  return result
+}

package/src/host/execution.ts

@@ -72,7 +72,7 @@ export interface ExecutionWorkspaceFace {
 
 /** Narrow event-bus face for settlement listening. */
 export interface EventsFace {
-  onSessionEvent(listener: (sessionId: string, event: { type: string; data?: unknown }, sessionMeta?: { header?: { cwd?: string } }) => void): () => void
+  onSessionEvent(listener: (sessionId: string, event: { type: string; data?: unknown }, sessionMeta?: { header?: { cwd?: string } }) => void | Promise<void>): () => void
 }
 
 /** Everything the execution service needs. */
@@ -293,6 +293,8 @@ export class ExecutionService {
                 task.comments.push({
                   id: newCommentId(),
                   body: normalizeBody(`[系统] 执行失败：${message.slice(0, 300)}；任务已退回待办。`),
+                  systemKey: 'sys.execFailed',
+                  systemParams: { error: message.slice(0, 300) },
                   version: 1,
                   createdAt: this.deps.now(),
                 })
@@ -598,6 +600,7 @@ export class ExecutionService {
               body: normalizeBody(commented
                 ? '[系统] 执行会话已结束并留有评论，但未移至待验收；系统自动移入待验收。'
                 : '[系统] 执行会话已结束，但未按协议交接（无评论、未移至待验收）；系统自动移入待验收，请审查后退回或验收。'),
+              systemKey: commented ? 'sys.endedWithComment' : 'sys.endedNoHandoff',
               version: 1,
               createdAt: now,
             })

package/src/host/locale.ts

@@ -0,0 +1,44 @@
+/**
+ * Host-side locale reading for the few user-facing HOST log lines (the
+ * gitignore suggestion). Everything else the user sees is localized by the
+ * GUI (client i18n dictionaries), and host-written ledger comments carry a
+ * `systemKey` that the GUI localizes at render — so this module is only for
+ * the raw `console.*` lines the host emits itself.
+ *
+ * Source: the DSH locale plugin persists the explicit language choice as
+ * `locale.preference` in `$DSH_HOME/settings.yaml` (loopback pages) and
+ * exposes it through the settings service. When the preference is absent the
+ * browser delegates, which the host cannot see — so we fall back to `en`,
+ * matching the client's own fallback (zh only when something asked for it).
+ *
+ * @module dsh-taskboard/host/locale
+ */
+import type { Context } from '@deepseek-ai/cordis'
+
+/** The two locales the taskboard ships. */
+export type HostLocale = 'zh' | 'en'
+
+/** Narrow settings-service face this module consumes (stringly-typed soft access). */
+interface SettingsFace {
+  get?: (ns: string) => unknown
+}
+
+/** The DSH locale settings section (`preference` carries the explicit choice). */
+interface LocaleSettings {
+  preference?: unknown
+}
+
+/**
+ * Read the active GUI locale as a host-side hint. Absent / malformed settings
+ * (or no settings service in scope) fall back to `en` and never throw — a
+ * cosmetic log line must not break route boot.
+ */
+export function activeHostLocale(ctx: Context): HostLocale {
+  try {
+    const settings = ctx.get('settings') as SettingsFace | undefined
+    const locale = settings?.get?.('locale') as LocaleSettings | undefined
+    return locale?.preference === 'zh' ? 'zh' : 'en'
+  } catch {
+    return 'en'
+  }
+}