@zhushanwen/pi-scheduler 0.1.0 → 0.2.0

package/src/types.ts

@@ -1,7 +1,5 @@
 // ── 调度规格 ──
 
-export type ScheduleMode = 'cron' | 'interval'
-
 export type ScheduleSpec =
   | { mode: 'cron'; cronExpression: string }
   | { mode: 'interval'; intervalMs: number }
@@ -9,7 +7,7 @@ export type ScheduleSpec =
 // ── 任务 ──
 
 export type TaskKind = 'once' | 'recurring'
-export type TaskStatus = 'pending' | 'running' | 'success' | 'failed'
+export type TaskStatus = 'success' | 'failed'
 
 export interface ScheduledTask {
   id: string                        // 8 位 hex，自动生成
@@ -25,8 +23,10 @@ export interface ScheduledTask {
   runCount: number
   lastRunAt?: number
   lastStatus?: TaskStatus
+  lastError?: string                // 最近一次失败原因（cron 失效 / appendEntry 失败）
   history: ExecutionRecord[]        // 最近 20 条
-  pending?: boolean                 // 标记到期待 dispatch
+  ownerSessionFile?: string         // append-only owner：记录任务创建时所属的 session JSONL，fork 重放时按此过滤非 owner 任务（gap1）
+  pending?: boolean                 // 运行时标记：到期待 dispatch（非持久化语义，勿与 TaskStatus 混淆）
 }
 
 export interface ExecutionRecord {
@@ -35,6 +35,45 @@ export interface ExecutionRecord {
   snippet?: string                  // agent 回复前 100 字
 }
 
+// ── CustomEntry event sourcing（append-only 任务存储）──
+
+/**
+ * upsert op 携带的全量任务快照（不含 ownerSessionFile / pending）。
+ * ownerSessionFile 放在 op 顶层（见 SchedulerEntryOp.upsert），
+ * pending 是运行时标记不持久化。其余字段与 ScheduledTask 对齐。
+ */
+export interface TaskSnapshot {
+  id: string
+  name: string
+  prompt: string
+  kind: TaskKind
+  schedule: ScheduleSpec
+  enabled: boolean
+  force: boolean
+  createdAt: number
+  nextRunAt: number
+  expiresAt?: number
+  runCount: number
+  lastRunAt?: number
+  lastStatus?: TaskStatus
+  lastError?: string
+  history: ExecutionRecord[]
+}
+
+/**
+ * pi.appendEntry('pi-scheduler:task', SchedulerEntryOp) 写入 session JSONL 的 op 联合类型。
+ *
+ * advance.status 固定为 'success'（CL8）：对齐现有 TaskStatus='success'|'failed'，
+ * 而非继承的 DM-SCHEDULER-OP 词表 'ok'。唯一 emit 值——按 CL7，advance 仅在 dispatch
+ * 成功（nextRunAt 实际推进）时 append，失败 dispatch 不 append（transient 失败重试语义）。
+ * fold 的 `task.lastStatus = entry.status` 直接赋值合法（'success' 属 TaskStatus）。
+ */
+export type SchedulerEntryOp =
+  | { op: 'upsert'; taskId: string; ownerSessionFile: string; task: TaskSnapshot }
+  | { op: 'advance'; taskId: string; nextRunAt: number; at: number; status: 'success' }
+  | { op: 'toggle'; taskId: string; enabled: boolean; nextRunAt?: number }
+  | { op: 'delete'; taskId: string }
+
 // ── 持久化 ──
 
 export interface SchedulerStore {
@@ -46,7 +85,6 @@ export interface SchedulerStore {
 
 export interface ParseScheduleResult {
   spec: ScheduleSpec
-  note?: string
 }
 
 // ── 添加选项 ──

package/src/__tests__/store.test.ts

@@ -1,161 +0,0 @@
-import * as fs from 'node:fs'
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { createStore, getStorePath } from '../store.js'
-import type { SchedulerStore } from '../types.js'
-
-// Mock fs 模块
-vi.mock('node:fs', () => ({
-  existsSync: vi.fn(),
-  readFileSync: vi.fn(),
-  writeFileSync: vi.fn(),
-  mkdirSync: vi.fn(),
-}))
-
-describe('getStorePath', () => {
-  it('returns path under ~/.pi/agent/scheduler/', () => {
-    const p = getStorePath('/Users/test/project')
-    expect(p).toContain('.pi')
-    expect(p).toContain('agent')
-    expect(p).toContain('scheduler')
-    expect(p).toContain('scheduler.json')
-  })
-
-  it('generates different paths for different cwds', () => {
-    const p1 = getStorePath('/Users/test/project1')
-    const p2 = getStorePath('/Users/test/project2')
-    expect(p1).not.toBe(p2)
-  })
-})
-
-describe('createStore', () => {
-  const mockCwd = '/test/project'
-  let store: ReturnType<typeof createStore>
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    store = createStore(mockCwd)
-  })
-
-  afterEach(() => {
-    vi.restoreAllMocks()
-  })
-
-  describe('load', () => {
-    it('returns empty store when file does not exist', () => {
-      vi.mocked(fs.existsSync).mockReturnValue(false)
-      const result = store.load()
-      expect(result).toEqual({ version: 1, tasks: [] })
-    })
-
-    it('parses valid JSON file', () => {
-      const mockStore: SchedulerStore = {
-        version: 1,
-        tasks: [{
-          id: 'abc12345',
-          name: 'test',
-          prompt: 'test prompt',
-          kind: 'recurring',
-          schedule: { mode: 'interval', intervalMs: 60000 },
-          enabled: true,
-          force: false,
-          createdAt: Date.now(),
-          nextRunAt: Date.now() + 60000,
-          runCount: 0,
-          history: [],
-        }],
-      }
-      vi.mocked(fs.existsSync).mockReturnValue(true)
-      vi.mocked(fs.readFileSync).mockReturnValue(JSON.stringify(mockStore))
-      const result = store.load()
-      expect(result.tasks).toHaveLength(1)
-      expect(result.tasks[0]!.id).toBe('abc12345')
-    })
-
-    it('returns empty store on corrupted JSON', () => {
-      vi.mocked(fs.existsSync).mockReturnValue(true)
-      vi.mocked(fs.readFileSync).mockReturnValue('invalid json{{{')
-      const result = store.load()
-      expect(result).toEqual({ version: 1, tasks: [] })
-    })
-  })
-
-  describe('persistSync', () => {
-    it('writes store to file', () => {
-      const mockStore: SchedulerStore = { version: 1, tasks: [] }
-      store.persistSync(mockStore)
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('scheduler.json'),
-        expect.any(String),
-        'utf-8',
-      )
-    })
-
-    it('removes expired tasks', () => {
-      const now = Date.now()
-      const mockStore: SchedulerStore = {
-        version: 1,
-        tasks: [
-          {
-            id: 'expired',
-            name: 'expired task',
-            prompt: 'test',
-            kind: 'recurring',
-            schedule: { mode: 'interval', intervalMs: 60000 },
-            enabled: true,
-            force: false,
-            createdAt: now - 100000,
-            nextRunAt: now - 50000,
-            expiresAt: now - 10000,
-            runCount: 0,
-            history: [],
-          },
-          {
-            id: 'active',
-            name: 'active task',
-            prompt: 'test',
-            kind: 'recurring',
-            schedule: { mode: 'interval', intervalMs: 60000 },
-            enabled: true,
-            force: false,
-            createdAt: now,
-            nextRunAt: now + 60000,
-            runCount: 0,
-            history: [],
-          },
-        ],
-      }
-      store.persistSync(mockStore)
-      const written = JSON.parse(vi.mocked(fs.writeFileSync).mock.calls[0]![1] as string)
-      expect(written.tasks).toHaveLength(1)
-      expect(written.tasks[0].id).toBe('active')
-    })
-
-    it('trims history to 20 entries', () => {
-      const history = Array.from({ length: 25 }, (_, i) => ({
-        at: i * 1000,
-        status: 'success' as const,
-      }))
-      const mockStore: SchedulerStore = {
-        version: 1,
-        tasks: [{
-          id: 'task1',
-          name: 'task',
-          prompt: 'test',
-          kind: 'recurring',
-          schedule: { mode: 'interval', intervalMs: 60000 },
-          enabled: true,
-          force: false,
-          createdAt: 0,
-          nextRunAt: 60000,
-          runCount: 25,
-          history,
-        }],
-      }
-      store.persistSync(mockStore)
-      const written = JSON.parse(vi.mocked(fs.writeFileSync).mock.calls[0]![1] as string)
-      expect(written.tasks[0].history).toHaveLength(20)
-    })
-  })
-})

package/src/store.ts

@@ -1,117 +0,0 @@
-import * as fs from 'node:fs'
-import * as os from 'node:os'
-import * as path from 'node:path'
-
-import type { ScheduledTask, SchedulerStore } from './types.js'
-
-const HISTORY_LIMIT = 20
-const DEBOUNCE_MS = 2000
-
-/**
- * 获取 store 文件路径：~/.pi/agent/scheduler/<root>/<segments>/scheduler.json
- * workspace 路径隔离，不同 cwd 存不同文件。
- */
-export function getStorePath(cwd: string): string {
-  const home = os.homedir()
-  const resolved = path.resolve(cwd)
-  const parsed = path.parse(resolved)
-  const segments = resolved.slice(parsed.root.length)
-    .split(path.sep).filter(Boolean)
-  const root = parsed.root
-    .replaceAll(/[^a-zA-Z0-9]+/g, '-')
-    .replaceAll(/^-+|-+$/g, '')
-    .toLowerCase() || 'root'
-  return path.join(home, '.pi', 'agent', 'scheduler', root, ...segments, 'scheduler.json')
-}
-
-/**
- * GC：裁剪 history > 20 条 + 移除过期任务
- */
-function gc(store: SchedulerStore): SchedulerStore {
-  const now = Date.now()
-  const tasks = store.tasks
-    .filter(t => !t.expiresAt || t.expiresAt > now)
-    .map(t => ({
-      ...t,
-      history: t.history.slice(-HISTORY_LIMIT),
-    }))
-  return { ...store, tasks }
-}
-
-/**
- * 创建 store 实例。
- * load: 读取 JSON + 解析 + 降级
- * persist: debounced 写入 + GC
- * persistSync: 同步写入（session_shutdown 用）
- */
-export function createStore(cwd: string) {
-  const storePath = getStorePath(cwd)
-  let debounceTimer: ReturnType<typeof setTimeout> | null = null
-
-  function ensureDir(): void {
-    const dir = path.dirname(storePath)
-    if (!fs.existsSync(dir)) {
-      fs.mkdirSync(dir, { recursive: true })
-    }
-  }
-
-  function load(): SchedulerStore {
-    try {
-      if (!fs.existsSync(storePath)) {
-        return { version: 1, tasks: [] }
-      }
-      const content = fs.readFileSync(storePath, 'utf-8')
-      const data = JSON.parse(content) as Partial<SchedulerStore>
-      // 版本迁移：缺失字段给默认值
-      return {
-        version: data.version ?? 1,
-        tasks: (data.tasks ?? []).map((t: Partial<ScheduledTask>) => ({
-          id: t.id ?? '',
-          name: t.name ?? '',
-          prompt: t.prompt ?? '',
-          kind: t.kind ?? 'recurring' as const,
-          schedule: t.schedule ?? { mode: 'interval' as const, intervalMs: 60000 },
-          createdAt: t.createdAt ?? 0,
-          nextRunAt: t.nextRunAt ?? 0,
-          runCount: t.runCount ?? 0,
-          enabled: t.enabled ?? true,
-          force: t.force ?? false,
-          history: t.history ?? [],
-          expiresAt: t.expiresAt,
-          lastRunAt: t.lastRunAt,
-          lastStatus: t.lastStatus,
-        })),
-      }
-    } catch {
-      // 文件损坏降级
-      console.warn(`[scheduler] Failed to load store from ${storePath}, using empty store`)
-      return { version: 1, tasks: [] }
-    }
-  }
-
-  function writeSync(store: SchedulerStore): void {
-    ensureDir()
-    const cleaned = gc(store)
-    fs.writeFileSync(storePath, JSON.stringify(cleaned, null, 2), 'utf-8')
-  }
-
-  function persist(store: SchedulerStore): void {
-    if (debounceTimer) {
-      clearTimeout(debounceTimer)
-    }
-    debounceTimer = setTimeout(() => {
-      writeSync(store)
-      debounceTimer = null
-    }, DEBOUNCE_MS)
-  }
-
-  function persistSync(store: SchedulerStore): void {
-    if (debounceTimer) {
-      clearTimeout(debounceTimer)
-      debounceTimer = null
-    }
-    writeSync(store)
-  }
-
-  return { load, persist, persistSync, storePath }
-}