@zhin.js/core 1.1.0 → 1.1.2

package/src/scheduler/scheduler.ts

@@ -1,372 +0,0 @@
-/**
- * Unified scheduler — at / every / cron + heartbeat
- *
- * 持久化到 data/scheduler-jobs.json，支持单次 at、间隔 every、cron 表达式，
- * 以及可选的 HEARTBEAT.md 周期检查。
- */
-
-import * as fs from 'fs';
-import * as path from 'path';
-import { randomUUID } from 'crypto';
-import { Cron as Croner } from 'croner';
-import type {
-  Schedule,
-  JobPayload,
-  ScheduledJob,
-  JobStore,
-  JobCallback,
-  AddJobOptions,
-  IScheduler,
-} from './types.js';
-import { Logger } from '@zhin.js/logger';
-
-const logger = new Logger(null, 'scheduler');
-
-const DEFAULT_HEARTBEAT_INTERVAL_MS = 30 * 60 * 1000;
-
-const HEARTBEAT_PROMPT = `Read HEARTBEAT.md in your workspace (if it exists).
-Follow any instructions or tasks listed there.
-If nothing needs attention, reply with just: HEARTBEAT_OK`;
-
-function nowMs(): number {
-  return Date.now();
-}
-
-function computeNextRun(schedule: Schedule, currentMs: number): number | undefined {
-  if (schedule.kind === 'at') {
-    return schedule.atMs != null && schedule.atMs > currentMs ? schedule.atMs : undefined;
-  }
-  if (schedule.kind === 'every') {
-    if (schedule.everyMs == null || schedule.everyMs <= 0) return undefined;
-    return currentMs + schedule.everyMs;
-  }
-  if (schedule.kind === 'cron' && schedule.expr) {
-    try {
-      const job = new Croner(schedule.expr, { paused: true, timezone: schedule.tz });
-      const next = job.nextRun();
-      job.stop();
-      return next ? next.getTime() : undefined;
-    } catch {
-      return undefined;
-    }
-  }
-  return undefined;
-}
-
-function createStore(): JobStore {
-  return { version: 1, jobs: [] };
-}
-
-function isHeartbeatEmpty(content: string | null): boolean {
-  if (!content) return true;
-  const skipPatterns = new Set(['- [ ]', '* [ ]', '- [x]', '* [x]']);
-  for (const line of content.split('\n')) {
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith('#') || trimmed.startsWith('<!--') || skipPatterns.has(trimmed)) continue;
-    return false;
-  }
-  return true;
-}
-
-export interface SchedulerOptions {
-  storePath: string;
-  workspace: string;
-  onJob?: JobCallback;
-  heartbeatEnabled?: boolean;
-  heartbeatIntervalMs?: number;
-}
-
-export class Scheduler implements IScheduler {
-  private storePath: string;
-  private workspace: string;
-  private onJob: JobCallback | null = null;
-  private store: JobStore | null = null;
-  private timerTimeout: ReturnType<typeof setTimeout> | null = null;
-  private _running = false;
-  private heartbeatEnabled: boolean;
-  private heartbeatIntervalMs: number;
-  private heartbeatJobId: string | null = null;
-
-  constructor(options: SchedulerOptions) {
-    this.storePath = options.storePath;
-    this.workspace = options.workspace;
-    this.onJob = options.onJob ?? null;
-    this.heartbeatEnabled = options.heartbeatEnabled ?? true;
-    this.heartbeatIntervalMs = options.heartbeatIntervalMs ?? DEFAULT_HEARTBEAT_INTERVAL_MS;
-  }
-
-  private loadStore(): JobStore {
-    if (this.store) return this.store;
-    if (fs.existsSync(this.storePath)) {
-      try {
-        const data = JSON.parse(fs.readFileSync(this.storePath, 'utf-8'));
-        const jobs: ScheduledJob[] = (data.jobs || []).map((j: any) => ({
-          id: j.id,
-          name: j.name,
-          enabled: j.enabled ?? true,
-          schedule: {
-            kind: j.schedule?.kind ?? 'cron',
-            atMs: j.schedule?.atMs,
-            everyMs: j.schedule?.everyMs,
-            expr: j.schedule?.expr,
-            tz: j.schedule?.tz,
-          },
-          payload: {
-            kind: j.payload?.kind ?? 'agent_turn',
-            message: j.payload?.message ?? '',
-            deliver: j.payload?.deliver ?? false,
-            channel: j.payload?.channel,
-            to: j.payload?.to,
-          },
-          state: {
-            nextRunAtMs: j.state?.nextRunAtMs,
-            lastRunAtMs: j.state?.lastRunAtMs,
-            lastStatus: j.state?.lastStatus,
-            lastError: j.state?.lastError,
-          },
-          createdAtMs: j.createdAtMs ?? 0,
-          updatedAtMs: j.updatedAtMs ?? 0,
-          deleteAfterRun: j.deleteAfterRun ?? false,
-        }));
-        this.store = { version: data.version ?? 1, jobs };
-      } catch (e) {
-        logger.warn('Failed to load scheduler store', e);
-        this.store = createStore();
-      }
-    } else {
-      this.store = createStore();
-    }
-    return this.store;
-  }
-
-  private saveStore(): void {
-    if (!this.store) return;
-    const dir = path.dirname(this.storePath);
-    if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-    const persistJobs = this.store.jobs.filter(j => j.id !== this.heartbeatJobId);
-    const data = {
-      version: this.store.version,
-      jobs: persistJobs.map(j => ({
-        id: j.id,
-        name: j.name,
-        enabled: j.enabled,
-        schedule: j.schedule,
-        payload: j.payload,
-        state: j.state,
-        createdAtMs: j.createdAtMs,
-        updatedAtMs: j.updatedAtMs,
-        deleteAfterRun: j.deleteAfterRun,
-      })),
-    };
-    fs.writeFileSync(this.storePath, JSON.stringify(data, null, 2));
-  }
-
-  async start(): Promise<void> {
-    this._running = true;
-    this.loadStore();
-    if (this.heartbeatEnabled) this.addHeartbeatJob();
-    this.recomputeNextRuns();
-    this.saveStore();
-    this.armTimer();
-    logger.info({ jobs: this.store?.jobs.length ?? 0 }, 'Scheduler started');
-  }
-
-  stop(): void {
-    this._running = false;
-    if (this.timerTimeout) {
-      clearTimeout(this.timerTimeout);
-      this.timerTimeout = null;
-    }
-  }
-
-  private addHeartbeatJob(): void {
-    if (!this.store) return;
-    const existing = this.store.jobs.find(j => j.payload.kind === 'heartbeat');
-    if (existing) {
-      this.heartbeatJobId = existing.id;
-      return;
-    }
-    const now = nowMs();
-    const job: ScheduledJob = {
-      id: `heartbeat-${randomUUID().slice(0, 8)}`,
-      name: 'Heartbeat',
-      enabled: true,
-      schedule: { kind: 'every', everyMs: this.heartbeatIntervalMs },
-      payload: { kind: 'heartbeat', message: HEARTBEAT_PROMPT, deliver: false },
-      state: { nextRunAtMs: now + this.heartbeatIntervalMs },
-      createdAtMs: now,
-      updatedAtMs: now,
-      deleteAfterRun: false,
-    };
-    this.heartbeatJobId = job.id;
-    this.store.jobs.push(job);
-    logger.debug({ intervalMs: this.heartbeatIntervalMs }, 'Heartbeat job added');
-  }
-
-  private recomputeNextRuns(): void {
-    if (!this.store) return;
-    const now = nowMs();
-    for (const job of this.store.jobs) {
-      if (job.enabled) job.state.nextRunAtMs = computeNextRun(job.schedule, now);
-    }
-  }
-
-  private getNextWakeMs(): number | undefined {
-    if (!this.store) return undefined;
-    const times = this.store.jobs
-      .filter(j => j.enabled && j.state.nextRunAtMs != null)
-      .map(j => j.state.nextRunAtMs!);
-    return times.length > 0 ? Math.min(...times) : undefined;
-  }
-
-  private armTimer(): void {
-    if (this.timerTimeout) {
-      clearTimeout(this.timerTimeout);
-      this.timerTimeout = null;
-    }
-    const nextWake = this.getNextWakeMs();
-    if (nextWake == null || !this._running) return;
-    const delayMs = Math.max(0, nextWake - nowMs());
-    this.timerTimeout = setTimeout(async () => {
-      if (this._running) await this.onTimer();
-    }, delayMs);
-  }
-
-  private async onTimer(): Promise<void> {
-    if (!this.store) return;
-    const now = nowMs();
-    const dueJobs = this.store.jobs.filter(
-      j => j.enabled && j.state.nextRunAtMs != null && now >= j.state.nextRunAtMs!
-    );
-    for (const job of dueJobs) await this.executeJob(job);
-    this.saveStore();
-    this.armTimer();
-  }
-
-  private async executeJob(job: ScheduledJob): Promise<void> {
-    const startMs = nowMs();
-    if (job.payload.kind === 'heartbeat') {
-      const shouldRun = this.checkHeartbeatFile();
-      if (!shouldRun) {
-        job.state.lastStatus = 'skipped';
-        job.state.lastRunAtMs = startMs;
-        job.updatedAtMs = nowMs();
-        job.state.nextRunAtMs = computeNextRun(job.schedule, nowMs());
-        return;
-      }
-    }
-    logger.info({ jobId: job.id, name: job.name }, 'Scheduler: executing job');
-    try {
-      if (this.onJob) await this.onJob(job);
-      job.state.lastStatus = 'ok';
-      job.state.lastError = undefined;
-      logger.info({ jobId: job.id, name: job.name }, 'Scheduler: job completed');
-    } catch (error) {
-      job.state.lastStatus = 'error';
-      job.state.lastError = String(error);
-      logger.error({ jobId: job.id, name: job.name, lastError: String(error) }, 'Scheduler: job failed');
-    }
-    job.state.lastRunAtMs = startMs;
-    job.updatedAtMs = nowMs();
-    if (job.schedule.kind === 'at') {
-      if (job.deleteAfterRun && this.store) {
-        this.store.jobs = this.store.jobs.filter(j => j.id !== job.id);
-      } else {
-        job.enabled = false;
-        job.state.nextRunAtMs = undefined;
-      }
-    } else {
-      job.state.nextRunAtMs = computeNextRun(job.schedule, nowMs());
-    }
-  }
-
-  private checkHeartbeatFile(): boolean {
-    const heartbeatPath = path.join(this.workspace, 'HEARTBEAT.md');
-    if (!fs.existsSync(heartbeatPath)) return false;
-    try {
-      const content = fs.readFileSync(heartbeatPath, 'utf-8');
-      return !isHeartbeatEmpty(content);
-    } catch {
-      return false;
-    }
-  }
-
-  listJobs(): ScheduledJob[] {
-    const store = this.loadStore();
-    return store.jobs
-      .filter(j => j.id !== this.heartbeatJobId)
-      .sort((a, b) => (a.state.nextRunAtMs ?? Infinity) - (b.state.nextRunAtMs ?? Infinity));
-  }
-
-  addJob(options: AddJobOptions): ScheduledJob {
-    const store = this.loadStore();
-    const now = nowMs();
-    const job: ScheduledJob = {
-      id: randomUUID().slice(0, 8),
-      name: options.name,
-      enabled: options.enabled ?? true,
-      schedule: options.schedule,
-      payload: options.payload,
-      state: { nextRunAtMs: computeNextRun(options.schedule, now) },
-      createdAtMs: now,
-      updatedAtMs: now,
-      deleteAfterRun: options.deleteAfterRun ?? false,
-    };
-    store.jobs.push(job);
-    this.saveStore();
-    this.armTimer();
-    logger.info({ jobId: job.id, name: job.name }, 'Scheduler: added job');
-    return job;
-  }
-
-  removeJob(jobId: string): boolean {
-    const store = this.loadStore();
-    const before = store.jobs.length;
-    store.jobs = store.jobs.filter(j => j.id !== jobId);
-    const removed = store.jobs.length < before;
-    if (removed) {
-      this.saveStore();
-      this.armTimer();
-      logger.info({ jobId }, 'Scheduler: removed job');
-    }
-    return removed;
-  }
-
-  enableJob(jobId: string, enabled: boolean = true): boolean {
-    const store = this.loadStore();
-    const job = store.jobs.find(j => j.id === jobId);
-    if (!job) return false;
-    job.enabled = enabled;
-    job.updatedAtMs = nowMs();
-    job.state.nextRunAtMs = enabled ? computeNextRun(job.schedule, nowMs()) : undefined;
-    this.saveStore();
-    this.armTimer();
-    return true;
-  }
-
-  async runJob(jobId: string): Promise<void> {
-    const store = this.loadStore();
-    const job = store.jobs.find(j => j.id === jobId);
-    if (job) {
-      await this.executeJob(job);
-      this.saveStore();
-      this.armTimer();
-    }
-  }
-
-  status(): { running: boolean; jobCount: number; nextWakeAt?: number } {
-    const store = this.loadStore();
-    return {
-      running: this._running,
-      jobCount: store.jobs.filter(j => j.id !== this.heartbeatJobId).length,
-      nextWakeAt: this.getNextWakeMs(),
-    };
-  }
-
-  async triggerHeartbeat(): Promise<void> {
-    if (this.heartbeatJobId && this.store) {
-      const job = this.store.jobs.find(j => j.id === this.heartbeatJobId);
-      if (job && this.onJob) await this.onJob(job);
-    }
-  }
-}

package/src/scheduler/types.ts

@@ -1,74 +0,0 @@
-/**
- * Scheduler types
- *
- * 支持三种调度：at（单次指定时间）、every（固定间隔）、cron（表达式）
- * Payload 支持 agent_turn（到点执行 prompt）、heartbeat（读 HEARTBEAT.md）、system_event
- */
-
-export interface Schedule {
-  kind: 'at' | 'every' | 'cron';
-  /** 单次执行时间戳（kind=at） */
-  atMs?: number;
-  /** 间隔毫秒（kind=every） */
-  everyMs?: number;
-  /** Cron 表达式（kind=cron） */
-  expr?: string;
-  /** 时区（kind=cron 可选） */
-  tz?: string;
-}
-
-export interface JobPayload {
-  kind: 'system_event' | 'agent_turn' | 'heartbeat';
-  /** 触发时发给 AI 的 prompt（agent_turn）或 heartbeat 说明 */
-  message: string;
-  /** 是否投递到指定 channel/user */
-  deliver: boolean;
-  channel?: string;
-  to?: string;
-}
-
-export interface JobState {
-  nextRunAtMs?: number;
-  lastRunAtMs?: number;
-  lastStatus?: 'ok' | 'error' | 'skipped';
-  lastError?: string;
-}
-
-export interface ScheduledJob {
-  id: string;
-  name: string;
-  enabled: boolean;
-  schedule: Schedule;
-  payload: JobPayload;
-  state: JobState;
-  createdAtMs: number;
-  updatedAtMs: number;
-  /** 单次任务执行后是否删除 */
-  deleteAfterRun: boolean;
-}
-
-export interface JobStore {
-  version: number;
-  jobs: ScheduledJob[];
-}
-
-export type JobCallback = (job: ScheduledJob) => Promise<void>;
-
-export interface AddJobOptions {
-  name: string;
-  schedule: Schedule;
-  payload: JobPayload;
-  enabled?: boolean;
-  deleteAfterRun?: boolean;
-}
-
-export interface IScheduler {
-  start(): Promise<void>;
-  stop(): void;
-  addJob(options: AddJobOptions): ScheduledJob;
-  removeJob(jobId: string): boolean;
-  enableJob(jobId: string, enabled: boolean): boolean;
-  runJob(jobId: string): Promise<void>;
-  listJobs(): ScheduledJob[];
-  status(): { running: boolean; jobCount: number; nextWakeAt?: number };
-}

package/src/tool-zod.ts

@@ -1,115 +0,0 @@
-/**
- * Zod 工具适配层（可选）
- *
- * 使用 Zod 定义工具参数时可获得类型推断与校验。需安装 zod：
- *   pnpm add zod
- *
- * 用法：
- *   import { createToolFromZod } from '@zhin.js/core/tool-zod';
- *   import { z } from 'zod';
- *   const tool = createToolFromZod('my_tool', '描述', z.object({ id: z.string() }), async (args) => { ... });
- *   plugin.addTool(tool);
- */
-
-import type { Tool, ToolContext, ToolParametersSchema } from './types.js';
-
-type MaybePromise<T> = T | Promise<T>;
-
-function zodFieldToJsonSchema(z: any): Record<string, unknown> {
-  if (!z || !z._def) return { type: 'string' };
-  const def = z._def;
-  const typeName = def.typeName;
-
-  if (typeName === 'ZodOptional' || typeName === 'ZodDefault') {
-    const inner = def.innerType ?? def.type;
-    return zodFieldToJsonSchema(inner);
-  }
-  if (typeName === 'ZodString') {
-    const out: Record<string, unknown> = { type: 'string' };
-    if (def.description) out.description = def.description;
-    return out;
-  }
-  if (typeName === 'ZodNumber') {
-    const out: Record<string, unknown> = { type: 'number' };
-    if (def.description) out.description = def.description;
-    return out;
-  }
-  if (typeName === 'ZodBoolean') {
-    const out: Record<string, unknown> = { type: 'boolean' };
-    if (def.description) out.description = def.description;
-    return out;
-  }
-  if (typeName === 'ZodEnum') {
-    return { type: 'string', enum: def.values };
-  }
-  if (typeName === 'ZodArray') {
-    return { type: 'array', items: zodFieldToJsonSchema(def.type ?? def.element) };
-  }
-  return { type: 'string' };
-}
-
-function zodToJsonSchema(schema: any): ToolParametersSchema {
-  const result: ToolParametersSchema = {
-    type: 'object',
-    properties: {} as ToolParametersSchema['properties'],
-    required: [],
-  };
-  if (!schema || !schema.shape) return result;
-  const shape = schema.shape;
-  const properties = result.properties as Record<string, any>;
-  const required: string[] = [];
-  for (const [key, value] of Object.entries(shape)) {
-    const zodValue = value as any;
-    properties[key] = zodFieldToJsonSchema(zodValue);
-    const typeName = zodValue?._def?.typeName;
-    if (typeName !== 'ZodOptional' && typeName !== 'ZodDefault') {
-      required.push(key);
-    }
-  }
-  result.required = required.length > 0 ? required : undefined;
-  return result;
-}
-
-export interface CreateToolFromZodOptions {
-  tags?: string[];
-  keywords?: string[];
-  source?: string;
-  hidden?: boolean;
-  kind?: string;
-}
-
-/**
- * 从 Zod 模式创建 Tool，便于类型安全与校验。
- * 需要安装 zod：pnpm add zod。传入的 schema 应为 z.object({ ... })。
- */
-export function createToolFromZod<T extends Record<string, any>>(
-  name: string,
-  description: string,
-  schema: any,
-  execute: (args: T, context?: ToolContext) => MaybePromise<any>,
-  options?: CreateToolFromZodOptions
-): Tool {
-  if (!schema?.safeParse) {
-    throw new Error('createToolFromZod: schema must be a Zod object schema (e.g. z.object({ ... })). Install zod: pnpm add zod');
-  }
-  const parameters = zodToJsonSchema(schema);
-  return {
-    name,
-    description,
-    parameters,
-    execute: async (args: Record<string, any>, context?: ToolContext) => {
-      const parsed = schema.safeParse(args);
-      if (!parsed.success) {
-        const msg = parsed.error.errors?.map((e: any) => `${e.path?.join('.') ?? 'root'}: ${e.message}`).join('; ') ?? 'Invalid arguments';
-        return `Error: ${msg}`;
-      }
-      return execute(parsed.data as T, context);
-    },
-    tags: options?.tags,
-    keywords: options?.keywords,
-    source: options?.source,
-    hidden: options?.hidden,
-    kind: options?.kind,
-  };
-}
-

package/src/types-generator.ts

@@ -1,78 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import { getLogger } from '@zhin.js/logger';
-
-const logger = getLogger('TypesGenerator');
-
-/**
- * 更新 tsconfig.json 的类型声明
- * @param cwd 项目根目录
- */
-export async function generateEnvTypes(cwd: string): Promise<void> {
-    try {
-        // 基础类型集合
-        const types = new Set(['@types/node']);
-        
-        // 检查 package.json 中的依赖
-        const pkgPath = path.join(cwd, 'package.json');
-        if (fs.existsSync(pkgPath)) {
-            const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-            const allDeps = {
-                ...(pkg.dependencies || {}),
-                ...(pkg.devDependencies || {})
-            };
-
-            // 检查所有 @zhin.js/ 开头的包
-            for (const [name] of Object.entries(allDeps)) {
-                if (name.startsWith('@zhin.js/') || name === 'zhin.js') {
-                    try {
-                        const depPkgPath = path.join(cwd, 'node_modules', name, 'package.json');
-                        if (fs.existsSync(depPkgPath)) {
-                            const depPkg = JSON.parse(fs.readFileSync(depPkgPath, 'utf-8'));
-                            if (depPkg.types || depPkg.typings) {
-                                types.add(name);
-                            }
-                        }
-                    } catch (err) {
-                        // 如果读取失败，跳过这个包
-                        continue;
-                    }
-                }
-            }
-        }
-
-        // 更新或创建 tsconfig.json
-        const tsconfigPath = path.join(cwd, 'tsconfig.json');
-        let tsconfig:Record<string,any> = {};
-
-        // 读取现有的 tsconfig.json
-        if (fs.existsSync(tsconfigPath)) {
-            try {
-                tsconfig = JSON.parse(fs.readFileSync(tsconfigPath, 'utf-8'));
-            } catch (err) {
-                // console.error 已替换为注释
-                logger.warn('⚠️ Failed to parse tsconfig.json, creating new one');
-            }
-        }
-
-        // 确保 compilerOptions 存在
-        if (!tsconfig.compilerOptions) {
-            tsconfig.compilerOptions = {};
-        }
-
-        // 合并现有的 types
-        const existingTypes = tsconfig.compilerOptions.types || [];
-        const allTypes = new Set([...existingTypes, ...types]);
-
-        // 更新 types 字段
-        tsconfig.compilerOptions.types = Array.from(allTypes);
-
-        // 写入文件
-        fs.writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2), 'utf-8');
-        logger.info('✅ Updated TypeScript types configuration');
-    } catch (error) {
-        logger.warn('⚠️ Failed to update TypeScript types', { 
-            error: error instanceof Error ? error.message : String(error) 
-        });
-    }
-}