dsh-taskboard 0.4.5 → 0.5.1

package/src/shared/protocol.ts

@@ -107,11 +107,20 @@ export const URGENCY_COLOR: Readonly<Record<Urgency, string>> = {
  * - `worktree`: each execution runs in a fresh `git worktree` on a dedicated
  *   task branch (`task/<标题>+<taskId>`) under `<workspace>/.dsh-worktrees/`.
  * - `none`: run in the workspace directory as before, zero git interaction.
- * Omitted = the default `worktree`; non-git projects auto-degrade at run
- * time (the execution record carries an `isolationNote` explaining why).
+ * Omitted = {@link DEFAULT_ISOLATION}; since 0.5.0 creation materializes the
+ * board default onto the record (看板设置 → 执行隔离), and non-git projects
+ * still auto-degrade at run time (the execution record carries an
+ * `isolationNote` explaining why).
  */
 export type IsolationMode = 'worktree' | 'none'
 
+/**
+ * Factory-default isolation (0.5.0): 原目录执行. Applies when neither the
+ * task record nor the board setting (`BoardSettings.defaultIsolation`)
+ * says otherwise. Before 0.5.0 the implicit default was 'worktree'.
+ */
+export const DEFAULT_ISOLATION: IsolationMode = 'none'
+
 /** Validate an isolation value. */
 export function asIsolation(raw: string): IsolationMode {
   if (raw !== 'worktree' && raw !== 'none') {
@@ -120,9 +129,39 @@ export function asIsolation(raw: string): IsolationMode {
   return raw
 }
 
-/** Resolve a task's effective isolation (omitted → the worktree default). */
+/** Resolve a task's effective isolation (omitted → the factory default). */
 export function effectiveIsolation(task: Pick<TaskRecord, 'isolation'>): IsolationMode {
-  return task.isolation === undefined ? 'worktree' : task.isolation
+  return task.isolation === undefined ? DEFAULT_ISOLATION : task.isolation
+}
+
+/**
+ * Board-level settings persisted with the ledger (0.5.0). Only fields the
+ * user explicitly set are present; absent fields follow factory defaults.
+ */
+export type BoardSettings = {
+  /** Default code isolation applied when a NEW task is created without an explicit choice. */
+  defaultIsolation?: IsolationMode
+}
+
+/** Validate raw input into sanitized {@link BoardSettings} (unknown fields dropped). */
+export function asBoardSettings(raw: unknown): BoardSettings {
+  if (typeof raw !== 'object' || raw === null) {
+    throw new Error('board settings must be an object')
+  }
+  const e = raw as Record<string, unknown>
+  const out: BoardSettings = {}
+  if (e.defaultIsolation !== undefined) {
+    if (typeof e.defaultIsolation !== 'string') {
+      throw new Error("defaultIsolation must be 'worktree' or 'none'")
+    }
+    out.defaultIsolation = asIsolation(e.defaultIsolation)
+  }
+  return out
+}
+
+/** The effective default isolation for NEW tasks (board setting → factory default). */
+export function defaultIsolationOf(settings?: BoardSettings): IsolationMode {
+  return settings?.defaultIsolation ?? DEFAULT_ISOLATION
 }
 
 /** How a task may run. */
@@ -247,6 +286,7 @@ export function nextCronTime(match: CronMatch, from: number): number | null {
 export type Actor =
   | { kind: 'user' }
   | { kind: 'agent'; sessionId: string }
+  | { kind: 'system' }
 
 /** A progress/report comment on a task. */
 export type CommentRecord = {
@@ -419,6 +459,8 @@ export type TaskLedger = {
   /** Global monotonic revision; every mutation bumps it. */
   revision: number
   tasks: TaskRecord[]
+  /** Board-level settings (0.5.0); absent on ledgers never touched by 设置. */
+  settings?: BoardSettings
 }
 
 /** Current ledger format version. */
@@ -438,6 +480,16 @@ function suffix(): string {
   return Math.random().toString(36).slice(2, 8)
 }
 
+/**
+ * Legal task id charset (R4): `t-<base36>-<base36>` from {@link newTaskId},
+ * and the ONLY shape accepted from the outside (import) or used to build
+ * filesystem paths (worktree dirs). Ids ride into `join(ws, '.dsh-worktrees',
+ * id)` — a lax charset here is an arbitrary-directory delete primitive.
+ */
+export function isValidTaskId(id: string): boolean {
+  return /^[A-Za-z0-9][A-Za-z0-9_-]{0,99}$/.test(id)
+}
+
 /** Mint a task id. */
 export function newTaskId(): string {
   return `t-${Date.now().toString(36)}-${suffix()}`
@@ -740,6 +792,8 @@ export type ImportPlan = {
   overwrite: TaskRecord[]
   /** Invalid entries with a human-readable reason (never imported). */
   invalid: Array<{ id?: string; reason: string }>
+  /** The file's board settings (0.5.0); replace-mode swaps them, merge keeps the live ones. */
+  settings?: BoardSettings
 }
 
 /** One unknown-value read helper: string fields with defaults. */
@@ -768,7 +822,10 @@ export function validateImportedTask(raw: unknown, now: number): { ok: true; tas
   const e = raw as Record<string, unknown>
   const id = typeof e.id === 'string' ? e.id.trim() : ''
   const fail = (reason: string): { ok: false; reason: string } => ({ ok: false, reason })
-  if (id.length === 0 || id.length > 100) return fail('missing/invalid id')
+  // R4①: length alone let traversal-shaped ids (`../../x`, `..\..\x`) into
+  // the ledger; the charset gate is the primary defense for every downstream
+  // filesystem use of a task id.
+  if (!isValidTaskId(id)) return fail('missing/invalid id (must match ^[A-Za-z0-9][A-Za-z0-9_-]{0,99}$)')
   try {
     const execution = normalizeExecution(
       typeof e.execution === 'object' && e.execution !== null ? e.execution as { mode?: string; cron?: string } : {},
@@ -866,6 +923,26 @@ export function validateImportedTask(raw: unknown, now: number): { ok: true; tas
   }
 }
 
+/**
+ * Minimal structural check for ONE ledger record at load time (S11): unlike
+ * {@link validateImportedTask} this REBUILDS NOTHING (cron state, ids and
+ * timestamps must survive a load untouched) — it only rejects entries whose
+ * shape would break downstream consumers, including the R4 id charset.
+ * @param raw - the untyped record.
+ */
+export function isPlausibleTaskRecord(raw: unknown): boolean {
+  if (typeof raw !== 'object' || raw === null) return false
+  const t = raw as Record<string, unknown>
+  return typeof t.id === 'string' && isValidTaskId(t.id)
+    && typeof t.title === 'string' && t.title.length > 0
+    && typeof t.workspaceId === 'string' && t.workspaceId.length > 0
+    && ALL_STATUSES.includes(t.status as TaskStatus)
+    && typeof t.version === 'number' && Number.isFinite(t.version) && t.version >= 1
+    && Array.isArray(t.comments) && Array.isArray(t.executions)
+    && typeof t.execution === 'object' && t.execution !== null
+    && (t.execution as { mode?: unknown }).mode !== undefined
+}
+
 /**
  * Validate a whole imported ledger and classify its tasks against the live
  * one (pure). Duplicate ids INSIDE the file are invalid (first wins, later
@@ -882,7 +959,7 @@ export function validateLedgerImport(raw: unknown, knownIds: ReadonlySet<string>
     throw new Error(`不支持的 schemaVersion ${String(e.schemaVersion)}（当前支持 ${LEDGER_SCHEMA_VERSION}）`)
   }
   if (!Array.isArray(e.tasks)) throw new Error('导入文件的 tasks 不是数组')
-  const plan: ImportPlan = { create: [], overwrite: [], invalid: [] }
+  const plan: ImportPlan = { create: [], overwrite: [], invalid: [], ...(e.settings !== undefined ? { settings: asBoardSettings(e.settings) } : {}) }
   const seen = new Set<string>()
   for (const entry of e.tasks) {
     const id = typeof (entry as { id?: unknown })?.id === 'string' ? (entry as { id: string }).id : undefined

package/src/shared/version.ts

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

package/src/client/board/NewTaskModal.tsx

@@ -1,8 +0,0 @@
-/**
- * Compatibility shim: the composer moved into TaskFormModal (create + edit
- * in one dialog). Kept so existing imports keep working.
- *
- * @module dsh-taskboard/client/board/NewTaskModal
- */
-export { TaskFormModal as NewTaskModal } from './TaskFormModal.tsx'
-export type { CatalogModel } from './TaskFormModal.tsx'