dsh-taskboard 0.2.2 → 0.4.0

package/src/client/board/TaskFormModal.tsx

@@ -10,8 +10,10 @@
  */
 import { useEffect, useRef, useState, type ReactNode } from 'react'
 import type { BoardController } from '../controller.ts'
-import type { Urgency } from '../../shared/protocol.ts'
-import { nextCronTime, parseCron } from '../../shared/protocol.ts'
+import { loadDefaultIsolation, saveDefaultIsolation } from '../controller.ts'
+import type { TaskTemplateSpec } from '../../shared/api.ts'
+import type { ChecklistItem, IsolationMode, Urgency } from '../../shared/protocol.ts'
+import { MAX_CHECKLIST_ITEMS, nextCronTime, parseCron } from '../../shared/protocol.ts'
 import { fmtTime } from './TaskBoard.tsx'
 
 /** One row of the configured model catalog (from llm.models). */
@@ -50,25 +52,98 @@ function Field({ label, required = false, full = false, children }: {
   )
 }
 
+/** One editable checklist row (create: fresh unchecked; edit: preserved ids/flags). */
+interface CheckRow {
+  id?: string
+  text: string
+  checked: boolean
+  checkedBy?: string
+  checkedAt?: number
+  note?: string
+}
+
+/**
+ * The checklist (DoD) editor: toggle + text + remove per row, add button,
+ * cap-enforced. Edit mode preserves checked state and notes (the GUI
+ * replaces the whole list on save).
+ */
+function ChecklistEditor({ rows, onChange, editing }: { rows: CheckRow[]; onChange: (rows: CheckRow[]) => void; editing: boolean }) {
+  const setRow = (index: number, patch: Partial<CheckRow>): void => {
+    const next = rows.map((row, i) => i === index ? { ...row, ...patch } : row)
+    onChange(next)
+  }
+  const checked = rows.filter(r => r.checked).length
+  return (
+    <div className="dsh-atb-cke">
+      {rows.map((row, index) => (
+        <div key={row.id ?? `new-${index}`} className="dsh-atb-cke-row">
+          {editing && (
+            <input
+              type="checkbox"
+              className="dsh-atb-cke-box"
+              checked={row.checked}
+              title={`勾选状态随保存保留（当前勾选人：${row.checkedBy ?? '未勾选'}）`}
+              onChange={e => setRow(index, { checked: e.target.checked })}
+            />
+          )}
+          <input
+            className="dsh-atb-cke-text"
+            value={row.text}
+            maxLength={200}
+            placeholder={`验收项 ${index + 1}（完成标准）`}
+            spellCheck={false}
+            onChange={e => setRow(index, { text: e.target.value })}
+          />
+          <button type="button" className="dsh-atb-cke-del" title="删除该验收项" onClick={() => onChange(rows.filter((_, i) => i !== index))}>✕</button>
+        </div>
+      ))}
+      {rows.length < MAX_CHECKLIST_ITEMS && (
+        <button type="button" className="dsh-atb-cke-add" onClick={() => onChange([...rows, { text: '', checked: false }])}>＋ 添加验收项</button>
+      )}
+      {rows.length > 0 && (
+        <span className="dsh-atb-cke-hint">{editing ? `已勾选 ${checked}/${rows.length}（保存将整体覆盖清单，勾选状态保留）` : `共 ${rows.length} 项，执行会话按清单干活并逐项勾选，未完成项验收时高亮`}</span>
+      )}
+    </div>
+  )
+}
+
 /**
- * The form modal. Without `task` it composes a new task; with `task` it
- * edits that record (project, urgency, execution, model included — the GUI
- * is the owner surface).
+ * The form modal. Without `task` it composes a new task (optionally
+ * prefilled from a chosen template); with `task` it edits that record
+ * (project, urgency, execution, model included — the GUI is the owner
+ * surface).
  * @param controller - the controller.
  * @param task - the task being edited (create mode when absent).
  */
 export function TaskFormModal({ controller, task }: { controller: BoardController; task?: TaskRecordLike }) {
   const state = controller.getSnapshot()
+  const prefill: TaskTemplateSpec | undefined = state.templatePrefill
   const editing = task !== undefined
-  const [title, setTitle] = useState(task?.title ?? '')
-  const [description, setDescription] = useState(task?.description ?? '')
-  const [prompt, setPrompt] = useState(task?.prompt ?? '')
+  const [title, setTitle] = useState(task?.title ?? prefill?.title ?? '')
+  const [description, setDescription] = useState(task?.description ?? prefill?.description ?? '')
+  const [prompt, setPrompt] = useState(task?.prompt ?? prefill?.prompt ?? '')
   const [workspaceId, setWorkspaceId] = useState(task?.workspaceId ?? state.filters.workspaceId ?? state.workspaces[0]?.id ?? '')
-  const [urgency, setUrgency] = useState<Urgency>(task?.urgency ?? 'normal')
-  const [mode, setMode] = useState<'claim' | 'scheduled'>(task?.execution.mode === 'scheduled' ? 'scheduled' : 'claim')
-  const [cron, setCron] = useState(task?.execution.cron ?? '0 9 * * *')
+  const [urgency, setUrgency] = useState<Urgency>(task?.urgency ?? (prefill?.urgency === 'urgent' || prefill?.urgency === 'relaxed' ? prefill.urgency : 'normal'))
+  const [mode, setMode] = useState<'claim' | 'scheduled'>(task?.execution.mode === 'scheduled' || prefill?.execution?.mode === 'scheduled' ? 'scheduled' : 'claim')
+  const [cron, setCron] = useState(task?.execution.cron ?? prefill?.execution?.cron ?? '0 9 * * *')
   const [catalog, setCatalog] = useState<CatalogModel[]>([])
-  const [model, setModel] = useState(task?.model !== undefined ? JSON.stringify(task.model) : '')
+  const [model, setModel] = useState(task?.model !== undefined || prefill?.model !== undefined ? JSON.stringify(task?.model ?? prefill?.model) : '')
+  // Preset roster (0.3.3): create mode PRE-SELECTS the deployment default
+  // (标准模式 in this deployment); '' = 跟随部署默认 (submit omits the field).
+  const initialPreset = task?.presetId ?? prefill?.presetId ?? ''
+  const [presetId, setPresetId] = useState(initialPreset)
+  const [presets, setPresets] = useState<Array<{ id: string; name?: string }>>([])
+  const [presetDefault, setPresetDefault] = useState<string | undefined>(undefined)
+  // Isolation toggle: create mode starts from the remembered choice (default
+  // on) or the template's choice; edit mode starts from the task and locks
+  // once execution began.
+  const [isolation, setIsolation] = useState<IsolationMode>(task?.isolation ?? (prefill?.isolation === 'none' ? 'none' : prefill?.isolation === 'worktree' ? 'worktree' : loadDefaultIsolation()))
+  // Checklist (0.4.0): create = template texts / blank rows; edit = live items.
+  const [checkRows, setCheckRows] = useState<CheckRow[]>(
+    task?.checklist !== undefined && task.checklist.length > 0
+      ? task.checklist.map(i => ({ ...i }))
+      : (prefill?.checklist ?? []).map(text => ({ text, checked: false })),
+  )
   const titleRef = useRef<HTMLInputElement>(null)
 
   // Focus the title and close on Esc while the dialog is open.
@@ -88,6 +163,19 @@ export function TaskFormModal({ controller, task }: { controller: BoardControlle
     void face().then(setCatalog).catch(() => setCatalog([]))
   }, [controller])
 
+  // Preset roster: same lazy face; pre-select the deployment default in
+  // create mode (unless a template pinned one) so executions run with a
+  // real tool set out of the box.
+  useEffect(() => {
+    const face = (controller as unknown as { presetCatalog?: () => Promise<{ presets: Array<{ id: string; name?: string }>; defaultId?: string }> }).presetCatalog
+    if (face === undefined) return
+    void face().then(roster => {
+      setPresets(roster.presets)
+      setPresetDefault(roster.defaultId)
+      if (task?.presetId === undefined && initialPreset === '' && roster.defaultId !== undefined) setPresetId(roster.defaultId)
+    }).catch(() => setPresets([]))
+  }, [controller, task?.presetId, initialPreset])
+
   // Live cron validation + next-run preview (same math as the host).
   const cronMatch = mode === 'scheduled' ? parseCron(cron.trim()) : null
   const nextRun = cronMatch !== null ? nextCronTime(cronMatch, Date.now()) : null
@@ -97,9 +185,33 @@ export function TaskFormModal({ controller, task }: { controller: BoardControlle
   // A task already in progress cannot be run again (host rejects it).
   const runBlocked = editing && task.status === 'in_progress'
 
+  // Isolation editability: locked once the task has execution history (the
+  // branch and its baseline depend on the choice — plan §3.1).
+  const isolationLocked = editing && ((task.executions?.length ?? 0) > 0 || task.status === 'in_progress')
+  const gitOk = controller.gitAvailable(workspaceId)
+  // Non-git project: the worktree option is disabled; submitting keeps the
+  // default (runtime auto-degrades with a note) instead of persisting 'none'.
+  const isolationDisabled = isolationLocked || !gitOk
+
+  /** Isolation payload for submit: undefined keeps the default (degrades naturally). */
+  const isolationPayload = (): string | undefined => {
+    if (!gitOk) return undefined
+    if (!editing) saveDefaultIsolation(isolation)
+    return isolation
+  }
+
+  /** Preset payload: '' = follow the deployment default (submit omits). */
+  const presetPayload = (): string | undefined => (presetId.trim().length > 0 ? presetId.trim() : undefined)
+
+  /** Checklist rows with non-empty text (blank rows are dropped on submit). */
+  const filledRows = (): CheckRow[] => checkRows.map(r => ({ ...r, text: r.text.trim() })).filter(r => r.text.length > 0)
+
   const submit = (): void => {
     if (!valid) return
     const picked = model !== '' ? (JSON.parse(model) as { provider: string; model: string }) : undefined
+    const isolationOut = isolationPayload()
+    const presetOut = presetPayload()
+    const rows = filledRows()
     if (editing) {
       void controller.update(task.id, task.version, {
         title,
@@ -110,6 +222,10 @@ export function TaskFormModal({ controller, task }: { controller: BoardControlle
         execution: mode === 'scheduled' ? { mode, cron: cron.trim() } : { mode },
         // '' in edit mode clears the pinned model back to the default.
         model: picked ?? null,
+        ...(isolationOut !== undefined && !isolationLocked ? { isolation: isolationOut } : {}),
+        presetId: presetOut ?? null,
+        // [] clears the checklist (host deletes the field on empty).
+        checklist: rows.length > 0 ? rows : null,
       })
     } else {
       void controller.create({
@@ -120,6 +236,9 @@ export function TaskFormModal({ controller, task }: { controller: BoardControlle
         prompt: prompt.length > 0 ? prompt : undefined,
         execution: mode === 'scheduled' ? { mode, cron: cron.trim() } : { mode },
         model: picked,
+        ...(isolationOut !== undefined ? { isolation: isolationOut } : {}),
+        ...(presetOut !== undefined ? { presetId: presetOut } : {}),
+        ...(rows.length > 0 ? { checklist: rows.map(r => r.text) } : {}),
       })
     }
   }
@@ -128,6 +247,9 @@ export function TaskFormModal({ controller, task }: { controller: BoardControlle
   const submitAndRun = (): void => {
     if (!valid || runBlocked) return
     const picked = model !== '' ? (JSON.parse(model) as { provider: string; model: string }) : undefined
+    const isolationOut = isolationPayload()
+    const presetOut = presetPayload()
+    const rows = filledRows()
     if (editing) {
       void (async () => {
         const saved = await controller.update(task.id, task.version, {
@@ -138,6 +260,9 @@ export function TaskFormModal({ controller, task }: { controller: BoardControlle
           workspaceId,
           execution: mode === 'scheduled' ? { mode, cron: cron.trim() } : { mode },
           model: picked ?? null,
+          ...(isolationOut !== undefined && !isolationLocked ? { isolation: isolationOut } : {}),
+          presetId: presetOut ?? null,
+          checklist: rows.length > 0 ? rows : null,
         })
         if (saved) await controller.run(task.id)
       })()
@@ -151,6 +276,9 @@ export function TaskFormModal({ controller, task }: { controller: BoardControlle
           prompt: prompt.length > 0 ? prompt : undefined,
           execution: mode === 'scheduled' ? { mode, cron: cron.trim() } : { mode },
           model: picked,
+          ...(isolationOut !== undefined ? { isolation: isolationOut } : {}),
+          ...(presetOut !== undefined ? { presetId: presetOut } : {}),
+          ...(rows.length > 0 ? { checklist: rows.map(r => r.text) } : {}),
         })
         if (id !== undefined) await controller.run(id)
       })()
@@ -199,6 +327,19 @@ export function TaskFormModal({ controller, task }: { controller: BoardControlle
             </select>
           </Field>
 
+          {presets.length > 0 && (
+            <Field label="执行模式（preset）">
+              <select value={presetId} onChange={e => setPresetId(e.target.value)} title="执行会话按该 preset 组合（决定工具集与人设）；默认 = 部署默认 preset">
+                <option value="">跟随部署默认{presetDefault !== undefined ? `（当前：${presets.find(p => p.id === presetDefault)?.name ?? presetDefault}）` : ''}</option>
+                {presets.map(p => (
+                  <option key={p.id} value={p.id}>
+                    {p.name ?? p.id}{p.id === presetDefault ? '（部署默认）' : ''}
+                  </option>
+                ))}
+              </select>
+            </Field>
+          )}
+
           <Field label="紧急度" full>
             <div className="dsh-atb-urgency-picker">
               {URGENCY_OPTIONS.map(o => (
@@ -263,6 +404,42 @@ export function TaskFormModal({ controller, task }: { controller: BoardControlle
               </span>
             </Field>
           )}
+
+          <Field label="执行隔离" full>
+            <div className="dsh-atb-mode-picker" data-disabled={isolationDisabled ? 'true' : undefined}>
+              <button
+                type="button"
+                className="dsh-atb-mode-opt"
+                data-on={isolation === 'worktree'}
+                disabled={isolationDisabled}
+                title={isolationLocked ? '任务已有执行记录，隔离方式已锁定' : !gitOk ? '当前项目非 git 仓库' : '每次执行在独立 worktree 分支上进行'}
+                onClick={() => setIsolation('worktree')}
+              >
+                <span className="dsh-atb-mode-name">🌿 Worktree 隔离</span>
+                <span className="dsh-atb-mode-hint">
+                  {isolationLocked ? '已锁定（执行开始后不可更改）' : !gitOk ? '当前项目非 git 仓库' : '独立分支 task/标题+ID，互不污染'}
+                </span>
+              </button>
+              <button
+                type="button"
+                className="dsh-atb-mode-opt"
+                data-on={isolation === 'none'}
+                disabled={isolationDisabled}
+                title={isolationLocked ? '任务已有执行记录，隔离方式已锁定' : '直接在项目目录执行（不使用 git）'}
+                onClick={() => setIsolation('none')}
+              >
+                <span className="dsh-atb-mode-name">📁 原目录执行</span>
+                <span className="dsh-atb-mode-hint">{isolationLocked ? '已锁定（执行开始后不可更改）' : !gitOk ? '当前项目非 git 仓库，将在原目录执行' : '不使用 git，直接在项目目录工作'}</span>
+              </button>
+            </div>
+            {!gitOk && !isolationLocked && (
+              <span className="dsh-atb-isolation-note">当前项目非 git 仓库，将在原目录执行（任务仍按默认配置创建，运行时自动降级）</span>
+            )}
+          </Field>
+
+          <Field label={editing ? '验收清单（DoD）' : '验收清单（DoD，可选）'} full>
+            <ChecklistEditor rows={checkRows} onChange={setCheckRows} editing={editing} />
+          </Field>
         </div>
 
         <div className="dsh-atb-modal-foot">
@@ -300,4 +477,8 @@ interface TaskRecordLike {
   urgency: Urgency
   execution: { mode: 'claim' | 'scheduled'; cron?: string }
   model?: { provider: string; model: string }
+  isolation?: IsolationMode
+  presetId?: string
+  checklist?: ChecklistItem[]
+  executions?: unknown[]
 }

package/src/client/board/TemplateManager.tsx

@@ -0,0 +1,121 @@
+/**
+ * The template-manager modal (0.4.0): rename / delete / use the stored task
+ * templates. Templates live host-side (side file next to the ledger) and
+ * prefill the create form from the + 新建任务 ▼ dropdown.
+ *
+ * @module dsh-taskboard/client/board/TemplateManager
+ */
+import { useState } from 'react'
+import type { BoardController } from '../controller.ts'
+import { useAlert } from './AlertModal.tsx'
+
+/**
+ * The template manager modal.
+ * @param controller - the controller.
+ */
+export function TemplateManager({ controller }: { controller: BoardController }) {
+  const state = controller.getSnapshot()
+  const [edits, setEdits] = useState<Record<string, string>>({})
+  const [confirmId, setConfirmId] = useState<string | undefined>(undefined)
+  const { alert: showAlert, el: alertEl } = useAlert()
+
+  const close = (): void => controller.closeTemplateManager()
+
+  const nameOf = (id: string, fallback: string): string => edits[id] ?? fallback
+
+  /** 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
+    void controller.upsertTemplate({ id, name, task: template.task }).then(ok => {
+      if (ok) {
+        setEdits(prev => { const next = { ...prev }; delete next[id]; return next })
+        showAlert('模板已改名')
+      }
+    })
+  }
+
+  return (
+    <div className="dsh-atb-modal-backdrop" onClick={e => { if (e.target === e.currentTarget) close() }}>
+      <div className="dsh-atb-modal dsh-atb-tplm" role="dialog" aria-modal="true" aria-label="管理模板">
+        <div className="dsh-atb-modal-head">
+          <span className="dsh-atb-modal-headicon">⌗</span>
+          <div className="dsh-atb-modal-headtext">
+            <h3>任务模板</h3>
+            <p>新建任务 ▼ 下拉的模板：改名 / 删除 / 直接使用；任务详情页「存为模板」可新增</p>
+          </div>
+          <button type="button" className="dsh-atb-modal-close" aria-label="关闭" onClick={close}>✕</button>
+        </div>
+        <div className="dsh-atb-modal-body">
+          {state.templates.length === 0
+            ? <div className="dsh-atb-empty2">暂无模板 — 在任务详情页点「存为模板」把常用配置沉淀下来</div>
+            : (
+                <div className="dsh-atb-tplm-list">
+                  {state.templates.map(t => (
+                    <div key={t.id} className="dsh-atb-tplm-row">
+                      <input
+                        className="dsh-atb-tplm-name"
+                        value={nameOf(t.id, t.name)}
+                        maxLength={60}
+                        spellCheck={false}
+                        aria-label={`模板名 ${t.name}`}
+                        onChange={e => setEdits(prev => ({ ...prev, [t.id]: e.target.value }))}
+                        onKeyDown={e => {
+                          if (e.key === 'Enter') save(t.id, nameOf(t.id, t.name))
+                        }}
+                      />
+                      <span className="dsh-atb-tplm-meta">
+                        {t.builtin === true ? '内置' : '自建'}
+                        {t.task.checklist !== undefined && t.task.checklist.length > 0 ? ` · 清单 ${t.task.checklist.length} 项` : ''}
+                        {t.task.urgency !== undefined ? ` · ${t.task.urgency}` : ''}
+                      </span>
+                      <span className="dsh-atb-tplm-btns">
+                        <button
+                          type="button"
+                          className="dsh-atb-btn"
+                          disabled={nameOf(t.id, t.name) === t.name || nameOf(t.id, t.name).trim().length === 0}
+                          title="保存改名"
+                          onClick={() => save(t.id, nameOf(t.id, t.name))}
+                        >
+                          改名
+                        </button>
+                        <button
+                          type="button"
+                          className="dsh-atb-btn"
+                          title="用此模板打开新建表单"
+                          onClick={() => {
+                            close()
+                            controller.newFromTemplate(t.task)
+                          }}
+                        >
+                          用此新建
+                        </button>
+                        {confirmId === t.id
+                          ? (
+                            <>
+                              <button type="button" className="dsh-atb-btn" data-danger="true" onClick={() => { void controller.deleteTemplate(t.id); setConfirmId(undefined) }}>确认删除</button>
+                              <button type="button" className="dsh-atb-btn" onClick={() => setConfirmId(undefined)}>取消</button>
+                            </>
+                          )
+                          : (
+                              <button type="button" className="dsh-atb-btn" data-danger="true" title="删除该模板" onClick={() => setConfirmId(t.id)}>
+                                🗑
+                              </button>
+                            )}
+                      </span>
+                    </div>
+                  ))}
+                </div>
+              )}
+        </div>
+        <div className="dsh-atb-modal-foot">
+          <span className="dsh-atb-modal-hint">模板随台账一同保存在 DSH 主目录，升级不丢</span>
+          <span className="dsh-atb-modal-footbtns">
+            <button type="button" className="dsh-atb-btn" onClick={close}>关闭</button>
+          </span>
+        </div>
+      </div>
+      {alertEl}
+    </div>
+  )
+}