@zhushanwen/pi-scheduler 0.4.2 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-scheduler",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "main": "index.ts",
   "xyz-agent": {
@@ -29,7 +29,7 @@
     "vitest.config.ts"
   ],
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.84.1",
+    "@earendil-works/pi-coding-agent": "^0.84.4",
     "croner": "^9.0.0",
     "typebox": "*"
   },
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@xyz-agent/session-delivery": "0.3.0",
-    "@zhushanwen/pi-extension-logger": "0.3.0"
+    "@zhushanwen/pi-extension-logger": "0.3.1"
   },
   "scripts": {
     "test": "vitest run",

package/src/format.ts

@@ -1,6 +1,11 @@
-import { formatDuration } from './parsing.js'
+import { formatDuration, MS_PER_DAY, MS_PER_HOUR, MS_PER_MINUTE, MS_PER_SECOND } from './parsing.js'
 import type { ScheduleSpec, TaskKind } from './types.js'
 
+/** 相对时间显示的"现在"判定窗口（±5s 内视为 now）。 */
+const NOW_THRESHOLD_MS = 5000
+/** 省略号 "..." 的字符数（truncate 截断预留宽度）。 */
+const ELLIPSIS_LENGTH = 3
+
 /** Format ScheduleSpec to readable string. kind 区分 once/recurring（once 显示 'once in X' 而非误导性的 'every X'）。 */
 export function formatSchedule(spec: ScheduleSpec, kind?: TaskKind): string {
   if (spec.mode === 'interval') {
@@ -25,14 +30,14 @@ export function formatRelativeTime(timestamp: number, now?: number): string {
   const diff = timestamp - currentTime
 
   // 5秒内视为"现在"
-  if (Math.abs(diff) < 5000) return 'now'
+  if (Math.abs(diff) < NOW_THRESHOLD_MS) return 'now'
 
   const absDiff = Math.abs(diff)
   const units: [string, number][] = [
-    ['d', 86_400_000],
-    ['h', 3_600_000],
-    ['m', 60_000],
-    ['s', 1000],
+    ['d', MS_PER_DAY],
+    ['h', MS_PER_HOUR],
+    ['m', MS_PER_MINUTE],
+    ['s', MS_PER_SECOND],
   ]
 
   let formatted = ''
@@ -45,7 +50,7 @@ export function formatRelativeTime(timestamp: number, now?: number): string {
   }
 
   if (!formatted) {
-    formatted = `${Math.round(absDiff / 1000)}s`
+    formatted = `${Math.round(absDiff / MS_PER_SECOND)}s`
   }
 
   return diff > 0 ? `in ${formatted}` : `${formatted} ago`
@@ -56,24 +61,35 @@ export function formatRelativeTime(timestamp: number, now?: number): string {
  */
 export function truncate(text: string, maxLen: number): string {
   if (text.length <= maxLen) return text
-  if (maxLen <= 3) return text.slice(0, maxLen)
-  return text.slice(0, maxLen - 3) + '...'
+  if (maxLen <= ELLIPSIS_LENGTH) return text.slice(0, maxLen)
+  return text.slice(0, maxLen - ELLIPSIS_LENGTH) + '...'
 }
 
+/** 生成任务 ID 的随机字节数（8 位 hex = 4 字节）。 */
+const TASK_ID_RANDOM_BYTES = 4
+const HEX_RADIX = 16
+/** 每字节展开的 hex 字符数（padStart 宽度）。 */
+const HEX_CHARS_PER_BYTE = 2
+
 /**
  * 生成任务 ID：8 位 hex。
  */
 export function generateTaskId(): string {
-  const bytes = new Uint8Array(4)
+  const bytes = new Uint8Array(TASK_ID_RANDOM_BYTES)
   crypto.getRandomValues(bytes)
-  return Array.from(bytes, b => b.toString(16).padStart(2, '0')).join('')
+  return Array.from(bytes, b => b.toString(HEX_RADIX).padStart(HEX_CHARS_PER_BYTE, '0')).join('')
 }
 
+/** autoName 任务名最大长度。 */
+const AUTO_NAME_MAX_LENGTH = 30
+/** 截断后保留的长度（预留省略号宽度）。 */
+const AUTO_NAME_KEEP_LENGTH = AUTO_NAME_MAX_LENGTH - ELLIPSIS_LENGTH
+
 /**
  * 从 prompt 自动生成任务名称：取前 30 字。
  */
 export function autoName(prompt: string): string {
   const trimmed = prompt.trim()
-  if (trimmed.length <= 30) return trimmed
-  return trimmed.slice(0, 27) + '...'
+  if (trimmed.length <= AUTO_NAME_MAX_LENGTH) return trimmed
+  return trimmed.slice(0, AUTO_NAME_KEEP_LENGTH) + '...'
 }

package/src/parsing.ts

@@ -2,13 +2,19 @@ import type { ParseScheduleResult, ScheduleSpec } from './types.js'
 
 // ── Duration 解析 ──
 
+// 时间单位毫秒数（包内共享：format.ts / runtime.ts 复用）
+export const MS_PER_DAY = 86_400_000
+export const MS_PER_HOUR = 3_600_000
+export const MS_PER_MINUTE = 60_000
+export const MS_PER_SECOND = 1000
+
 const DURATION_RE = /^(\d+)\s*(s|sec|seconds?|m|min|minutes?|h|hr|hours?|d|days?)$/i
 
 const DURATION_MULTIPLIERS: Record<string, number> = {
-  s: 1000, sec: 1000, second: 1000, seconds: 1000,
-  m: 60_000, min: 60_000, minute: 60_000, minutes: 60_000,
-  h: 3_600_000, hr: 3_600_000, hour: 3_600_000, hours: 3_600_000,
-  d: 86_400_000, day: 86_400_000, days: 86_400_000,
+  s: MS_PER_SECOND, sec: MS_PER_SECOND, second: MS_PER_SECOND, seconds: MS_PER_SECOND,
+  m: MS_PER_MINUTE, min: MS_PER_MINUTE, minute: MS_PER_MINUTE, minutes: MS_PER_MINUTE,
+  h: MS_PER_HOUR, hr: MS_PER_HOUR, hour: MS_PER_HOUR, hours: MS_PER_HOUR,
+  d: MS_PER_DAY, day: MS_PER_DAY, days: MS_PER_DAY,
 }
 
 /**
@@ -34,10 +40,10 @@ export function formatDuration(ms: number): string {
   if (ms <= 0) return '0s'
 
   const units: [string, number][] = [
-    ['d', 86_400_000],
-    ['h', 3_600_000],
-    ['m', 60_000],
-    ['s', 1000],
+    ['d', MS_PER_DAY],
+    ['h', MS_PER_HOUR],
+    ['m', MS_PER_MINUTE],
+    ['s', MS_PER_SECOND],
   ]
 
   for (const [suffix, divisor] of units) {
@@ -47,11 +53,18 @@ export function formatDuration(ms: number): string {
   }
 
   // 兜底：用秒表示
-  return `${Math.round(ms / 1000)}s`
+  return `${Math.round(ms / MS_PER_SECOND)}s`
 }
 
 // ── Cron 解析 ──
 
+/** cron 标准字段数（分 时 日 月 周）。 */
+const CRON_FIELD_COUNT = 5
+/** 带秒字段的标准 cron 字段数（秒 分 时 日 月 周）。 */
+const CRON_FIELD_COUNT_WITH_SECONDS = 6
+/** computeNextCronRuns / computeNextRuns 默认返回的未来执行时间数。 */
+const DEFAULT_NEXT_RUNS_COUNT = 5
+
 let cronerModule: typeof import('croner') | null | undefined
 
 async function getCroner(): Promise<typeof import('croner') | null> {
@@ -76,12 +89,12 @@ export function normalizeCronExpression(input: string): { expression: string; no
   const parts = trimmed.split(/\s+/)
 
   // 6 字段原样返回
-  if (parts.length === 6) {
+  if (parts.length === CRON_FIELD_COUNT_WITH_SECONDS) {
     return { expression: trimmed }
   }
 
   // 5 字段补秒字段
-  if (parts.length === 5) {
+  if (parts.length === CRON_FIELD_COUNT) {
     return {
       expression: `0 ${trimmed}`,
       note: 'Auto-prepended seconds field (0)',
@@ -121,7 +134,7 @@ export async function computeNextCronRunAt(
 export async function computeNextCronRuns(
   expression: string,
   from?: number,
-  count = 5,
+  count = DEFAULT_NEXT_RUNS_COUNT,
 ): Promise<number[]> {
   const croner = await getCroner()
   if (!croner) return []
@@ -215,7 +228,7 @@ export async function computeNextRunAt(
 export async function computeNextRuns(
   spec: ScheduleSpec,
   from?: number,
-  count = 5,
+  count = DEFAULT_NEXT_RUNS_COUNT,
 ): Promise<number[]> {
   if (spec.mode === 'interval') {
     const start = from ?? Date.now()

package/src/runtime.ts

@@ -5,7 +5,7 @@ import type { DeliveryHandle, DeliveryMessage } from '@xyz-agent/session-deliver
 
 import type { SchedulerBackend } from './backend.js'
 import { autoName, generateTaskId } from './format.js'
-import { computeNextRunAt, parseDuration } from './parsing.js'
+import { computeNextRunAt, MS_PER_DAY, MS_PER_MINUTE, parseDuration } from './parsing.js'
 import type {
   AddOptions,
   ScheduledTask,
@@ -17,11 +17,13 @@ import type {
 const logger = getLogger('scheduler')
 
 const MAX_TASKS = 50
-// 入队防重标记 TTL（合批非首条任务无终态回调，过期后放行重投；10 min >> 合批窗口）
-const QUEUE_DEDUPE_TTL_MS = 10 * 60 * 1000
+// 入队防重标记 TTL 分钟数（合批非首条任务无终态回调，过期后放行重投；10 min >> 合批窗口）
+const QUEUE_DEDUPE_TTL_MINUTES = 10
+const QUEUE_DEDUPE_TTL_MS = QUEUE_DEDUPE_TTL_MINUTES * MS_PER_MINUTE
 const RATE_LIMIT_PER_MINUTE = 6
 const TICK_INTERVAL_MS = 30_000
-const DEFAULT_EXPIRY_MS = 7 * 24 * 60 * 60 * 1000 // 7 days
+const DEFAULT_EXPIRY_DAYS = 7
+const DEFAULT_EXPIRY_MS = DEFAULT_EXPIRY_DAYS * MS_PER_DAY // 7 days
 const HISTORY_LIMIT = 20 // 与 replayFoldEntries 的裁剪上限一致（advance 折叠 / dispatch 累积共用）
 // pi ExtensionRunner 在 session 替换后访问 stale ctx 时抛出的错误文案片段。
 // 兜底通道（防御纵深）：G1 模块级代际检测（isCtxStale）为主判，覆盖同模块环境内的 session
@@ -466,7 +468,7 @@ export class SchedulerRuntime {
   }
 
   private hasDispatchCapacity(now: number): boolean {
-    const oneMinuteAgo = now - 60_000
+    const oneMinuteAgo = now - MS_PER_MINUTE
     this.dispatchTimestamps = this.dispatchTimestamps.filter(t => t > oneMinuteAgo)
     return this.dispatchTimestamps.length < RATE_LIMIT_PER_MINUTE
   }

package/src/widget.ts

@@ -1,6 +1,9 @@
 import { formatRelativeTime, truncate } from './format.js'
 import type { ScheduledTask } from './types.js'
 
+/** widget 中任务名的最大显示宽度（列）。 */
+const WIDGET_NAME_MAX_WIDTH = 20
+
 /**
  * 渲染 TUI status bar widget（string[]，配合 SDK setWidget 第一重载）。
  * 格式：[scheduler] 3 scheduled · check-build in 4m · 1 overdue
@@ -23,7 +26,7 @@ export function renderSchedulerWidget(tasks: ScheduledTask[]): string[] {
 
   if (upcoming.length > 0) {
     const next = upcoming[0]!
-    parts.push(`${truncate(next.name, 20)} ${formatRelativeTime(next.nextRunAt)}`)
+    parts.push(`${truncate(next.name, WIDGET_NAME_MAX_WIDTH)} ${formatRelativeTime(next.nextRunAt)}`)
   }
 
   if (overdue.length > 0) {