@linxin666/dsh-client-ui-task-board 0.4.5 → 0.4.7

package/src/core/tasks.ts

@@ -37,8 +37,23 @@ export interface ExecutionRecord {
    * Session id of the DSH session that issued the run/rerun action (issue #6
    * audit origin). Client-asserted, not a trust boundary; absent when the run
    * was triggered by cron (source unknown).
+   *
+   * On an EXTERNAL record (issue #1826) this names the agent that completed the
+   * work outside the Host instead, which is what makes the history readable.
    */
   initiatedBy?: string
+  /**
+   * True when this outcome was recorded from outside the Host by
+   * `record-external-outcome` rather than observed from a DSH session
+   * (issue #1826).
+   *
+   * The board never manufactures one of these itself: every Host-side path
+   * (`run`, `settle`, cascade folding, restart recovery) writes an execution
+   * without it, so `external` is the single field separating work this Host ran
+   * from work an outside agent reported. Such a record never carries a
+   * `sessionId` and never claims a verdict the Host observed.
+   */
+  external?: boolean
   /** Freeze instant captured from the card snapshot when the run opened. */
   frozenAt?: number
   /** Freeze source session captured from the card snapshot when the run opened. */
@@ -88,17 +103,74 @@ export function retainRecentExecutions(executions: readonly ExecutionRecord[]):
   return [...settled.slice(Math.max(settled.length - keepSettled, 0)), ...open]
 }
 
+/**
+ * How a rule produces its triggers: a recurring cron rule, or one single
+ * planned instant. The distinction is stored rather than inferred so a
+ * one-shot is never represented as a date-restricted cron expression.
+ */
+export type ScheduleMode = 'cron' | 'once'
+
+/**
+ * Why a due occurrence produced no run, or why a rule stopped on its own.
+ *
+ * These are stable codes, not display text: the board renders them through its
+ * locale dictionary, so the ledger never carries a translated string.
+ */
+export type ScheduleStopReason =
+  /** The single planned instant produced its run. */
+  | 'fired'
+  /** The recurring rule reached its run budget. */
+  | 'limit'
+  /** The plan has no reachable instant any more (an impossible cron). */
+  | 'no-target'
+  /** The instant passed while the board was not running through it. */
+  | 'missed'
+  /** The task already had an open execution, so this occurrence was skipped. */
+  | 'busy'
+  /** An above-default permission was still unconfirmed, so this occurrence was skipped. */
+  | 'permission'
+  /**
+   * A scheduled launch failed before any session existed, so the occurrence
+   * created no execution and its run was refunded rather than spent.
+   */
+  | 'launch-failed'
+
+/** Every stop reason this build understands; the repair and wire gates share it. */
+export const SCHEDULE_STOP_REASONS: readonly ScheduleStopReason[] = [
+  'fired', 'limit', 'no-target', 'missed', 'busy', 'permission', 'launch-failed',
+]
+
 /**
  * A scheduled-run rule attached to a task. The Host scheduler triggers the
  * task when `nextRunAt` is due and persists the rule in the Host ledger.
+ *
+ * A rule is either `cron` (the historical shape: a 5-field expression with an
+ * explicit IANA zone, optionally capped by `maxRuns`) or `once` (one planned
+ * instant, `at`, with an implicit budget of one run). Both modes count the
+ * executions the scheduler actually started in `runCount`; a rule that reaches
+ * its budget stops itself in the ledger (`enabled: false` + `endedReason`)
+ * instead of relying on the execution agent to disable it.
  */
 export interface ScheduleRule {
   /** Whether the schedule is armed. */
   enabled: boolean
-  /** 5-field cron expression: `分 时 日 月 周`. */
-  cron: string
   /**
-   * IANA zone the cron wall clock is read in (issue #1722). Absent means the
+   * Which kind of plan this rule carries. A rule loaded from a ledger written
+   * before the field existed normalizes to `cron` (its `cron` is the plan).
+   */
+  mode: ScheduleMode
+  /**
+   * 5-field cron expression: `分 时 日 月 周`. Present on a `cron` rule and
+   * absent on a `once` rule.
+   */
+  cron?: string
+  /**
+   * The instant a `once` rule executes (ms epoch). Kept after the run so the
+   * detail view can still show the planned time once the rule has ended.
+   */
+  at?: number
+  /**
+   * IANA zone the wall clock is read in (issue #1722). Absent means the
    * Host process zone, which is what a rule written before zones were
    * persisted keeps using; the Host stamps its own zone at ledger migration so
    * a later `TZ` change cannot silently move an existing rule.
@@ -108,6 +180,62 @@ export interface ScheduleRule {
   nextRunAt: number | undefined
   /** Instant of the latest scheduled trigger (ms epoch). */
   lastTriggeredAt: number | undefined
+  /**
+   * Scheduled executions the Host has created under this rule. This is the
+   * run budget's counter: it counts executions that were successfully opened
+   * (whatever their later outcome), never completions, and a manual run never
+   * touches it. A skipped occurrence (busy / permission / missed / no target)
+   * creates no execution and therefore consumes nothing.
+   */
+  runCount: number
+  /**
+   * Maximum scheduled executions for a `cron` rule; absent means unlimited
+   * (the historical behavior). A `once` rule has an implicit budget of one and
+   * stores no `maxRuns`.
+   */
+  maxRuns?: number
+  /** Instant the rule stopped itself (ms epoch); absent while it may still fire. */
+  endedAt?: number
+  /** Why the rule stopped itself; present with `endedAt`. */
+  endedReason?: ScheduleStopReason
+  /** Instant of the latest occurrence that produced no run. */
+  skippedAt?: number
+  /** Why that occurrence produced no run; present with `skippedAt`. */
+  skippedReason?: ScheduleStopReason
+}
+
+/**
+ * The rule's total run budget: one for a one-shot, the stored cap for a
+ * recurring rule, and undefined when the rule is unlimited.
+ * @param rule - the schedule rule.
+ * @returns the budget, or undefined for an uncapped rule.
+ */
+export function scheduleRunBudget(rule: ScheduleRule): number | undefined {
+  if (rule.mode === 'once') return 1
+  return rule.maxRuns
+}
+
+/**
+ * Whether a rule has no runs left. The scheduler refuses to open another
+ * execution for an exhausted rule, which is what makes the budget terminal
+ * regardless of restarts or repeated timer fires.
+ * @param rule - the schedule rule.
+ * @returns true when the run budget is spent.
+ */
+export function scheduleExhausted(rule: ScheduleRule): boolean {
+  const budget = scheduleRunBudget(rule)
+  return budget !== undefined && rule.runCount >= budget
+}
+
+/**
+ * The instant a rule plans to fire next, for display, whatever its mode: the
+ * planned `at` of a one-shot, or the stored `nextRunAt` of a recurring rule.
+ * @param rule - the schedule rule.
+ * @returns the planned instant, or undefined when the rule carries none.
+ */
+export function schedulePlannedAt(rule: ScheduleRule): number | undefined {
+  if (rule.mode === 'once') return rule.at
+  return rule.nextRunAt
 }
 
 /**
@@ -278,6 +406,15 @@ export interface TaskRecord {
    * absent falls back to the host default (agent-default-model).
    */
   model?: string
+  /**
+   * Reasoning effort pinned for that execution route (an adapter-owned id such
+   * as "high"). Absent (or blank) means INHERIT: the session runs at the
+   * model's own default level, exactly as a card written before the field
+   * existed does. The launch sends the value only when the target model's
+   * adapter declares that exact id, so switching a card to a model without
+   * that level never pushes an invalid selection (see core/reasoning-effort.ts).
+   */
+  reasoningEffort?: string
   /**
    * Whether later executions continue in the previous execution's session
    * (issue #1419) instead of minting a fresh conversation per run. Absent or
@@ -300,9 +437,11 @@ export interface TaskRecord {
    * armed with the composed execution prompt as its objective. The session then
    * keeps working automatic continuation rounds until the agent marks the goal
    * complete, and this board settles the execution on the goal's own end
-   * instead of at the first turn end. Absent means ON — the option is checked
-   * by default, so only an explicit `false` runs the task as a single plain
-   * turn. A session whose `/goal` command is refused still runs the prompt.
+   * instead of at the first turn end. Absent means OFF — the option is
+   * unchecked by default, so only an explicit `true` joins the goal run and
+   * every card that never touched it (including every card written before the
+   * field existed) runs one plain turn. A session whose `/goal` command is
+   * refused still runs the prompt.
    */
   goalRun?: boolean
   /**
@@ -405,13 +544,23 @@ export interface NewTaskInput {
   permission?: TaskPermission
   /** Optional pinned model for the execution session; absent = host default. */
   model?: string
+  /** Optional reasoning effort for that model route; empty/absent = the model's own default. */
+  reasoningEffort?: string
+  /**
+   * Opt in to the deployment's new-card defaults: a target this input leaves
+   * out is filled from the configured default (agent preset, permission, model
+   * and the level bound to that model). Absent means the create stores exactly
+   * what it was given, which is what the extension provider's own create path
+   * and the legacy import rely on.
+   */
+  applyCardDefaults?: boolean
   /** Reuse the previous execution's session for later runs (issue #1419). */
   reuseSession?: boolean
   /** Run the subtree as an Agent Team (Team Lead session plus one teammate per direct subtask). */
   teamRun?: boolean
   /**
-   * Start the execution with dsh's built-in `/goal`. Absent/true keeps the
-   * default (goal run); an explicit false requests a single plain turn.
+   * Start the execution with dsh's built-in `/goal`. Absent means the default
+   * (one plain turn); only an explicit true joins the goal run.
    */
   goalRun?: boolean
   /**
@@ -420,12 +569,22 @@ export interface NewTaskInput {
    */
   skipVerification?: boolean
   /**
-   * Optional scheduled-run rule requested at creation time (the new-task
-   * dialog): an enable flag, a 5-field cron expression, and the IANA zone its
-   * wall clock is read in (absent means the Host zone). The create use case
-   * arms it only when enabled and the expression is valid.
+   * Optional scheduling rule requested at creation time (the new-task
+   * dialog): an enable flag, the kind of plan (a recurring 5-field cron
+   * expression, or one planned instant for a one-shot), an optional run cap,
+   * and the IANA zone its wall clock is read in (absent means the Host zone).
+   * The create use case arms it only when enabled and the plan is valid.
    */
-  schedule?: { enabled: boolean; cron: string; timeZone?: string }
+  schedule?: {
+    enabled: boolean
+    mode?: ScheduleMode
+    cron?: string
+    /** Planned instant of a one-shot rule (ms epoch). */
+    at?: number
+    timeZone?: string
+    /** Run cap of a recurring rule; absent means unlimited. */
+    maxRuns?: number
+  }
   /**
    * Optional frozen context snapshot (goal/progress/next, sanitized by the
    * protocol gate) turning the new task into a continuation card.
@@ -559,12 +718,13 @@ export function createTask(input: NewTaskInput, now: number, id: string): TaskRe
     mode: normalizeTargetId(input.mode),
     permission: isTaskPermission(input.permission) ? input.permission : undefined,
     model: normalizeTargetId(input.model),
+    reasoningEffort: normalizeTargetId(input.reasoningEffort),
     reuseSession: input.reuseSession === true ? true : undefined,
     teamRun: input.teamRun === true ? true : undefined,
-    // Default ON: only an explicit false is stored, so a card that never
+    // Default OFF: only an explicit true is stored, so a card that never
     // touched the option (and every card written before the field existed)
-    // keeps starting its runs with /goal.
-    goalRun: input.goalRun === false ? false : undefined,
+    // keeps running one plain turn.
+    goalRun: input.goalRun === true ? true : undefined,
     // Default OFF: only an explicit true is stored, so a card that never
     // touched the option inherits the board-wide acceptance switch exactly as
     // every card written before the field existed does.
@@ -582,35 +742,38 @@ export function withStatus(task: TaskRecord, status: TaskStatus, now: number): T
   return { ...task, status, updatedAt: now }
 }
 
+/** Every field a schedule patch may carry; the rest of the rule is carried over. */
+const SCHEDULE_PATCH_KEYS = [
+  'enabled', 'mode', 'cron', 'at', 'timeZone', 'nextRunAt', 'lastTriggeredAt',
+  'runCount', 'maxRuns', 'endedAt', 'endedReason', 'skippedAt', 'skippedReason',
+] as const satisfies ReadonlyArray<keyof ScheduleRule>
+
 /**
  * Merge a schedule patch into a task's schedule rule (creating it when
  * absent), with a fresh updatedAt. Keys present in the patch overwrite the
  * current value — including explicit `undefined`, which clears a field (used
- * to disarm `nextRunAt`); absent keys keep their current value.
+ * to disarm `nextRunAt` or to drop an ended/skip record); absent keys keep
+ * their current value.
  */
 export function withSchedule(
   task: TaskRecord,
   patch: Partial<ScheduleRule>,
   now: number,
 ): TaskRecord {
-  const current = task.schedule
-  const schedule: ScheduleRule = {
-    enabled: current?.enabled ?? false,
-    cron: current?.cron ?? '',
-    ...(current?.timeZone === undefined ? {} : { timeZone: current.timeZone }),
-    nextRunAt: current?.nextRunAt,
-    lastTriggeredAt: current?.lastTriggeredAt,
-  }
-  if ('enabled' in patch) schedule.enabled = patch.enabled ?? false
-  if ('cron' in patch) schedule.cron = patch.cron ?? ''
-  // An explicit `undefined` drops the stored zone (back to the Host zone);
-  // an absent key keeps it.
-  if ('timeZone' in patch) {
-    if (patch.timeZone === undefined) delete schedule.timeZone
-    else schedule.timeZone = patch.timeZone
+  const schedule: ScheduleRule = task.schedule === undefined
+    ? { enabled: false, mode: 'cron', nextRunAt: undefined, lastTriggeredAt: undefined, runCount: 0 }
+    : { ...task.schedule }
+  const fields = schedule as unknown as Record<string, unknown>
+  const next = patch as unknown as Record<string, unknown>
+  for (const key of SCHEDULE_PATCH_KEYS) {
+    if (!(key in patch)) continue
+    if (next[key] === undefined) delete fields[key]
+    else fields[key] = next[key]
   }
-  if ('nextRunAt' in patch) schedule.nextRunAt = patch.nextRunAt
-  if ('lastTriggeredAt' in patch) schedule.lastTriggeredAt = patch.lastTriggeredAt
+  // The three non-optional fields can never be cleared into an unusable rule.
+  if (schedule.enabled !== true) schedule.enabled = false
+  if (schedule.mode !== 'once') schedule.mode = 'cron'
+  if (!Number.isFinite(schedule.runCount) || schedule.runCount < 0) schedule.runCount = 0
   return { ...task, updatedAt: now, schedule }
 }
 
@@ -654,6 +817,21 @@ export function startExecution(
   }
 }
 
+/**
+ * The column a settled outcome puts a card in. The ONE derivation shared by
+ * every settlement path (issue #1826): a Host-run execution and an outcome an
+ * outside agent reported both land in the same column from the same rule, so
+ * the column never becomes a second, independent piece of state.
+ @param task - the card being settled.
+ @param outcome - the settled outcome.
+ @returns the status the card shows afterwards.
+ */
+export function settledStatus(task: TaskRecord, outcome: ExecutionOutcome): TaskStatus {
+  if (outcome === 'succeeded') return task.schedule?.enabled === true ? 'todo' : 'done'
+  if (outcome === 'failed') return 'failed'
+  return task.status === 'running' ? 'todo' : task.status
+}
+
 /**
  * Settle a running execution: record the outcome and move the task into the
  * matching column. No-op (returns the input task) when the execution is not
@@ -673,11 +851,7 @@ export function settleExecution(
   const settled: ExecutionRecord = { ...execution, endedAt: now, result: outcome, error }
   const executions = [...task.executions]
   executions[index] = settled
-  const status: TaskStatus = outcome === 'succeeded'
-    ? (task.schedule?.enabled ? 'todo' : 'done')
-    : outcome === 'failed' ? 'failed'
-      : task.status === 'running' ? 'todo' : task.status
-  return { ...task, status, updatedAt: now, executions }
+  return { ...task, status: settledStatus(task, outcome), updatedAt: now, executions }
 }
 
 /** A settled-execution summary string for the detail view. */

package/src/core/use-cases/task-create.ts

@@ -6,7 +6,8 @@
  */
 import { isValidCron, isValidTimeZone, nextRunAtMs, resolveHostTimeZone } from '../schedule.ts'
 import { DEFAULT_SUBTASK_DEPTH, normalizeSubtaskDepth, taskDepth } from '../subtask.ts'
-import { createTask, withSchedule, type NewTaskInput, type TaskRecord } from '../tasks.ts'
+import { resolveCardTargets, type CardDefaults } from '../card-defaults.ts'
+import { createTask, isTaskPermission, withSchedule, type NewTaskInput, type TaskRecord } from '../tasks.ts'
 
 /** Result of a create transition: the new task (when accepted) + the next ledger. */
 export interface CreateTaskResult {
@@ -23,16 +24,20 @@ export interface CreateTaskResult {
  * appended ledger, or the unchanged ledger when the title is blank or the
  * requested parent link is refused.
  *
- * A subtask inherits the execution targets its parent already pins (workspace,
- * agent preset, permission, model) unless the form supplied its own; the
- * parent human permission confirmation travels with an inherited permission,
- * so a subtask of an already-confirmed elevated card is runnable at once.
+ * The execution targets resolve through {@link resolveCardTargets}: what the
+ * caller sent wins, then the parent's own pins, then - only when the caller
+ * opted in with `applyCardDefaults` - the deployment's configured new-card
+ * defaults. Without the flag the resolution sees no defaults at all, which is
+ * exactly the inline parent inheritance this path has always applied. The
+ * workspace is not part of that resolution: a subtask still takes the parent's
+ * workspace, and the defaults never name one.
  * @param tasks - current ledger.
  * @param input - raw user input (title/description/prompt + optional schedule/parent).
  * @param now - clock instant (ms epoch).
  * @param id - minted task id.
  * @param maxSubtaskDepth - deployment subtask depth limit.
  * @param hostTimeZone - zone a rule that stores no zone of its own follows.
+ * @param cardDefaults - the deployment's new-card defaults, read live at creation.
  */
 export function applyCreateTask(
   tasks: readonly TaskRecord[],
@@ -41,6 +46,7 @@ export function applyCreateTask(
   id: string,
   maxSubtaskDepth: number = DEFAULT_SUBTASK_DEPTH,
   hostTimeZone: string = resolveHostTimeZone(),
+  cardDefaults?: CardDefaults,
 ): CreateTaskResult {
   if (input.title.trim() === '') return { task: undefined, tasks, error: 'title is required' }
   const limit = normalizeSubtaskDepth(maxSubtaskDepth)
@@ -53,36 +59,62 @@ export function applyCreateTask(
       return { task: undefined, tasks, error: `subtask depth limit (${limit}) exceeded` }
     }
   }
-  // A subtask copies the execution targets its parent pins so the card shows
-  // what it will run with — EXCEPT the permission. A copied permission would
-  // also have to copy the parent's human confirmation to stay runnable, and the
-  // child would keep both after being detached: one confirmed parent would mint
-  // unbounded confirmed elevated roots. The permission is resolved live from the
-  // attached ancestors at launch instead (see core/subtask.ts), so detaching
-  // removes the inheritance by construction.
-  const effective: NewTaskInput = parent === undefined ? input : {
+  // The execution targets resolve through the one shared rule: the caller's own
+  // choice, then the parent's own pins (never its permission, see
+  // core/card-defaults.ts), then the deployment's new-card defaults — and only
+  // when the caller asked for them, so a create that never opts in stores
+  // exactly what it sent, as it always has.
+  const seed = resolveCardTargets(
+    input.applyCardDefaults === true ? cardDefaults : undefined,
+    parent === undefined ? undefined : { kind: 'parent', task: parent },
+    { mode: input.mode, permission: input.permission, model: input.model, reasoningEffort: input.reasoningEffort },
+  )
+  const effective: NewTaskInput = {
     ...input,
-    workspaceId: input.workspaceId ?? parent.workspaceId,
-    mode: input.mode ?? parent.mode,
-    model: input.model ?? parent.model,
+    workspaceId: input.workspaceId ?? parent?.workspaceId,
+    mode: seed.mode,
+    permission: isTaskPermission(seed.permission) ? seed.permission : undefined,
+    model: seed.model,
+    reasoningEffort: seed.reasoningEffort,
   }
   let task = createTask(effective, now, id)
-  // Arm the requested schedule (new-task dialog): only an enabled rule with
-  // a valid cron is applied; blank, invalid, or disabled requests leave the
-  // task unscheduled.
+  // Arm the requested schedule (new-task dialog). The Host wire gate already
+  // rejects a malformed enabled plan; this arm re-checks it so a direct caller
+  // (a test or an embedder) cannot persist an unusable rule either.
   const requested = input.schedule
-  if (requested?.enabled === true && requested.cron.trim() !== '' && isValidCron(requested.cron)) {
-    const cron = requested.cron.trim()
+  if (requested?.enabled === true) {
     const requestedZone = requested.timeZone
     // An unusable zone is refused rather than silently reinterpreted as the
     // Host zone: the caller asked for a specific wall clock.
     if (requestedZone !== undefined && !isValidTimeZone(requestedZone)) {
       return { task: undefined, tasks, error: 'invalid schedule time zone' }
     }
-    const zone = requestedZone ?? hostTimeZone
-    const nextRunAt = nextRunAtMs(cron, now, zone)
-    if (nextRunAt !== undefined) {
-      task = withSchedule(task, { enabled: true, cron, timeZone: requestedZone, nextRunAt }, now)
+    if (requested.mode === 'once') {
+      const at = requested.at
+      if (at === undefined || !Number.isInteger(at) || at <= now) {
+        return { task: undefined, tasks, error: 'invalid schedule instant' }
+      }
+      task = withSchedule(task, {
+        enabled: true,
+        mode: 'once',
+        at,
+        timeZone: requestedZone,
+        nextRunAt: at,
+        runCount: 0,
+      }, now)
+    } else {
+      const cron = (requested.cron ?? '').trim()
+      if (cron !== '' && isValidCron(cron)) {
+        const maxRuns = requested.maxRuns
+        if (maxRuns !== undefined && (!Number.isInteger(maxRuns) || maxRuns < 1)) {
+          return { task: undefined, tasks, error: 'invalid schedule run cap' }
+        }
+        const zone = requestedZone ?? hostTimeZone
+        const nextRunAt = nextRunAtMs(cron, now, zone)
+        if (nextRunAt !== undefined) {
+          task = withSchedule(task, { enabled: true, mode: 'cron', cron, maxRuns, timeZone: requestedZone, nextRunAt, runCount: 0 }, now)
+        }
+      }
     }
   }
   return { task, tasks: [...tasks, task] }