@zhin.js/agent 0.1.29 → 0.1.30

package/lib/assistant/job-store.d.ts

@@ -0,0 +1,55 @@
+import { type CronJobRecord } from '../cron-engine.js';
+import type { AssistantConfig } from './config.js';
+import type { AssistantJob, AssistantJobFile, JobAction, JobNotify } from './types.js';
+export interface AssistantJobStoreOptions {
+    dataDir: string;
+    legacyDualWrite?: boolean;
+    jobsFile?: string;
+}
+export interface MigrationResult {
+    migrated: number;
+    fromCron: number;
+    fromScheduler: number;
+    backupPaths: string[];
+}
+export declare function getAssistantJobsPath(dataDir: string, jobsFile?: string): string;
+export declare class AssistantJobStore {
+    private dataDir;
+    private filePath;
+    private legacyDualWrite;
+    private cache;
+    constructor(options: AssistantJobStoreOptions);
+    getDataDir(): string;
+    private emptyStore;
+    read(): Promise<AssistantJobFile>;
+    private invalidateCache;
+    write(store: AssistantJobFile): Promise<void>;
+    listJobs(): Promise<AssistantJob[]>;
+    listCronCompatible(): Promise<CronJobRecord[]>;
+    getJob(id: string): Promise<AssistantJob | undefined>;
+    upsertJob(job: AssistantJob): Promise<AssistantJob>;
+    removeJob(id: string): Promise<boolean>;
+    findEventJobByEventId(eventId: string): Promise<AssistantJob | undefined>;
+    createEventJob(input: {
+        id: string;
+        label?: string;
+        action: JobAction;
+        notify?: JobNotify;
+        source: string;
+        eventType?: string;
+        eventId?: string;
+        payload?: unknown;
+    }): Promise<AssistantJob>;
+    updateJobState(id: string, patch: Partial<AssistantJob['state']>): Promise<void>;
+    /**
+     * 若 assistant-jobs 不存在或为空，从 legacy 文件导入。
+     */
+    migrateLegacyIfNeeded(): Promise<MigrationResult>;
+    /**
+     * 将 scheduler-jobs.json 中尚未入库的任务合并进 JobStore（assistant.enabled 时全量迁入）。
+     */
+    syncSchedulerJobsFromLegacy(): Promise<number>;
+    private dualWriteLegacyCron;
+}
+export declare function createAssistantJobStore(dataDir: string, config?: AssistantConfig): AssistantJobStore;
+//# sourceMappingURL=job-store.d.ts.map

package/lib/assistant/job-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"job-store.d.ts","sourceRoot":"","sources":["../../src/assistant/job-store.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAOvF,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,SAA0B,GAAG,MAAM,CAEhG;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,KAAK,CAAiC;gBAElC,OAAO,EAAE,wBAAwB;IAM7C,UAAU,IAAI,MAAM;IAIpB,OAAO,CAAC,UAAU;IAIZ,IAAI,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAwBvC,OAAO,CAAC,eAAe;IAIjB,KAAK,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7C,QAAQ,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAKnC,kBAAkB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAK9C,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAKrD,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAiBnD,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASvC,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAQzE,cAAc,CAAC,KAAK,EAAE;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,SAAS,CAAC;QAClB,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,OAAO,CAAC,YAAY,CAAC;IAyBnB,cAAc,CAClB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAShB;;OAEG;IACG,qBAAqB,IAAI,OAAO,CAAC,eAAe,CAAC;IAsDvD;;OAEG;IACG,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;YAoBtC,mBAAmB;CAUlC;AAyCD,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,eAAe,GACvB,iBAAiB,CAMnB"}

package/lib/assistant/job-store.js

@@ -0,0 +1,280 @@
+/**
+ * Assistant JobStore — assistant-jobs.json 持久化
+ */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { formatCompact, Logger } from '@zhin.js/logger';
+import { CRON_JOBS_FILENAME, readCronJobsFile, writeCronJobsFile, } from '../cron-engine.js';
+import { assistantCronJobs, assistantToCronRecord, cronRecordToAssistant, schedulerRecordToAssistant, } from './legacy-convert.js';
+import { ASSISTANT_JOBS_FILENAME, ASSISTANT_JOBS_VERSION } from './types.js';
+const logger = new Logger(null, 'assistant-job-store');
+const SCHEDULER_JOBS_FILENAME = 'scheduler-jobs.json';
+export function getAssistantJobsPath(dataDir, jobsFile = ASSISTANT_JOBS_FILENAME) {
+    return path.join(dataDir, jobsFile);
+}
+export class AssistantJobStore {
+    dataDir;
+    filePath;
+    legacyDualWrite;
+    cache = null;
+    constructor(options) {
+        this.dataDir = options.dataDir;
+        this.filePath = getAssistantJobsPath(options.dataDir, options.jobsFile);
+        this.legacyDualWrite = options.legacyDualWrite === true;
+    }
+    getDataDir() {
+        return this.dataDir;
+    }
+    emptyStore() {
+        return { version: ASSISTANT_JOBS_VERSION, jobs: [] };
+    }
+    async read() {
+        if (this.cache)
+            return this.cache;
+        try {
+            const raw = await fs.promises.readFile(this.filePath, 'utf-8');
+            const data = JSON.parse(raw);
+            if (!data || !Array.isArray(data.jobs)) {
+                this.cache = this.emptyStore();
+                return this.cache;
+            }
+            this.cache = {
+                version: data.version ?? ASSISTANT_JOBS_VERSION,
+                jobs: data.jobs.map(normalizeJob),
+            };
+            return this.cache;
+        }
+        catch (e) {
+            const err = e;
+            if (err?.code === 'ENOENT') {
+                this.cache = this.emptyStore();
+                return this.cache;
+            }
+            throw e;
+        }
+    }
+    invalidateCache() {
+        this.cache = null;
+    }
+    async write(store) {
+        await fs.promises.mkdir(path.dirname(this.filePath), { recursive: true });
+        await fs.promises.writeFile(this.filePath, JSON.stringify(store, null, 2), 'utf-8');
+        this.cache = store;
+        if (this.legacyDualWrite) {
+            await this.dualWriteLegacyCron(store.jobs);
+        }
+    }
+    async listJobs() {
+        const store = await this.read();
+        return [...store.jobs];
+    }
+    async listCronCompatible() {
+        const jobs = await this.listJobs();
+        return assistantCronJobs(jobs);
+    }
+    async getJob(id) {
+        const jobs = await this.listJobs();
+        return jobs.find((j) => j.id === id);
+    }
+    async upsertJob(job) {
+        const store = await this.read();
+        const idx = store.jobs.findIndex((j) => j.id === job.id);
+        const full = {
+            ...job,
+            updatedAt: Date.now(),
+            state: job.state ?? {},
+        };
+        if (idx >= 0) {
+            store.jobs[idx] = full;
+        }
+        else {
+            store.jobs.push(full);
+        }
+        await this.write(store);
+        return full;
+    }
+    async removeJob(id) {
+        const store = await this.read();
+        const next = store.jobs.filter((j) => j.id !== id);
+        if (next.length === store.jobs.length)
+            return false;
+        store.jobs = next;
+        await this.write(store);
+        return true;
+    }
+    async findEventJobByEventId(eventId) {
+        const jobs = await this.listJobs();
+        return jobs.find((j) => j.schedule.kind === 'event'
+            && j.schedule.eventId === eventId);
+    }
+    async createEventJob(input) {
+        const now = Date.now();
+        // 未指定时留 im 空壳，执行时由 TaskExecutor 合并 assistant.defaults.notify
+        const notify = input.notify ?? { channel: 'im' };
+        const job = {
+            id: input.id,
+            label: input.label,
+            enabled: true,
+            schedule: {
+                kind: 'event',
+                eventId: input.eventId,
+                source: input.source,
+                eventType: input.eventType,
+            },
+            action: input.action,
+            notify,
+            createdAt: now,
+            updatedAt: now,
+            state: {},
+            source: 'event',
+            eventPayload: input.payload,
+        };
+        return this.upsertJob(job);
+    }
+    async updateJobState(id, patch) {
+        const store = await this.read();
+        const job = store.jobs.find((j) => j.id === id);
+        if (!job)
+            return;
+        job.state = { ...job.state, ...patch };
+        job.updatedAt = Date.now();
+        await this.write(store);
+    }
+    /**
+     * 若 assistant-jobs 不存在或为空，从 legacy 文件导入。
+     */
+    async migrateLegacyIfNeeded() {
+        const result = {
+            migrated: 0,
+            fromCron: 0,
+            fromScheduler: 0,
+            backupPaths: [],
+        };
+        const existing = await this.read();
+        if (existing.jobs.length > 0)
+            return result;
+        const merged = new Map();
+        const cronJobs = await readCronJobsFile(this.dataDir);
+        if (cronJobs.length > 0) {
+            const backup = await backupFile(this.dataDir, CRON_JOBS_FILENAME);
+            if (backup)
+                result.backupPaths.push(backup);
+            for (const record of cronJobs) {
+                merged.set(record.id, cronRecordToAssistant(record));
+                result.fromCron++;
+            }
+        }
+        const schedulerJobs = await readSchedulerJobsFile(this.dataDir);
+        if (schedulerJobs.length > 0) {
+            const backup = await backupFile(this.dataDir, SCHEDULER_JOBS_FILENAME);
+            if (backup)
+                result.backupPaths.push(backup);
+            for (const record of schedulerJobs) {
+                const converted = schedulerRecordToAssistant(record);
+                if (!converted)
+                    continue;
+                if (!merged.has(converted.id)) {
+                    merged.set(converted.id, converted);
+                    result.fromScheduler++;
+                }
+            }
+        }
+        if (merged.size === 0)
+            return result;
+        const store = {
+            version: ASSISTANT_JOBS_VERSION,
+            jobs: Array.from(merged.values()),
+        };
+        await this.write(store);
+        result.migrated = store.jobs.length;
+        logger.info(formatCompact({
+            op: 'migrate_legacy_jobs',
+            migrated: result.migrated,
+            fromCron: result.fromCron,
+            fromScheduler: result.fromScheduler,
+        }));
+        return result;
+    }
+    /**
+     * 将 scheduler-jobs.json 中尚未入库的任务合并进 JobStore（assistant.enabled 时全量迁入）。
+     */
+    async syncSchedulerJobsFromLegacy() {
+        const schedulerJobs = await readSchedulerJobsFile(this.dataDir);
+        if (schedulerJobs.length === 0)
+            return 0;
+        const store = await this.read();
+        let added = 0;
+        for (const record of schedulerJobs) {
+            const converted = schedulerRecordToAssistant(record);
+            if (!converted)
+                continue;
+            if (store.jobs.some((j) => j.id === converted.id))
+                continue;
+            store.jobs.push(converted);
+            added++;
+        }
+        if (added > 0) {
+            await this.write(store);
+            logger.info(formatCompact({ op: 'sync_scheduler_jobs', added }));
+        }
+        return added;
+    }
+    async dualWriteLegacyCron(jobs) {
+        const cronRecords = jobs
+            .map(assistantToCronRecord)
+            .filter((j) => j != null);
+        try {
+            await writeCronJobsFile(this.dataDir, cronRecords);
+        }
+        catch (e) {
+            logger.warn('双写 cron-jobs.json 失败: ' + (e?.message || String(e)));
+        }
+    }
+}
+function normalizeJob(raw) {
+    if (!raw.notify || typeof raw.notify !== 'object' || !('channel' in raw.notify)) {
+        throw new Error(`assistant-jobs.json: job "${raw.id}" 缺少 notify 字段（破坏性更新：context 已移除）`);
+    }
+    return {
+        ...raw,
+        notify: raw.notify,
+        state: raw.state ?? {},
+        createdAt: raw.createdAt ?? Date.now(),
+        updatedAt: raw.updatedAt ?? raw.createdAt ?? Date.now(),
+    };
+}
+async function backupFile(dataDir, filename) {
+    const src = path.join(dataDir, filename);
+    try {
+        await fs.promises.access(src);
+    }
+    catch {
+        return null;
+    }
+    const backup = `${src}.bak.${Date.now()}`;
+    await fs.promises.copyFile(src, backup);
+    return backup;
+}
+async function readSchedulerJobsFile(dataDir) {
+    const filePath = path.join(dataDir, SCHEDULER_JOBS_FILENAME);
+    try {
+        const raw = await fs.promises.readFile(filePath, 'utf-8');
+        const data = JSON.parse(raw);
+        return Array.isArray(data.jobs) ? data.jobs : [];
+    }
+    catch (e) {
+        const err = e;
+        if (err?.code === 'ENOENT')
+            return [];
+        logger.warn('读取 scheduler-jobs 失败: ' + (err?.message || String(e)));
+        return [];
+    }
+}
+export function createAssistantJobStore(dataDir, config) {
+    return new AssistantJobStore({
+        dataDir,
+        legacyDualWrite: config?.legacyDualWrite,
+        jobsFile: config?.jobsFile,
+    });
+}
+//# sourceMappingURL=job-store.js.map

package/lib/assistant/job-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"job-store.js","sourceRoot":"","sources":["../../src/assistant/job-store.ts"],"names":[],"mappings":"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"}

package/lib/assistant/job-worker.d.ts

@@ -0,0 +1,20 @@
+import type { TaskExecutionResult, TaskExecutor } from '../task-executor.js';
+import type { AssistantQueueConfig } from './config.js';
+import type { JobNotify } from './types.js';
+export interface JobWorkerOptions {
+    executor: TaskExecutor;
+    queue?: AssistantQueueConfig;
+    assistantEnabled?: boolean;
+}
+export declare class JobWorker {
+    private executor;
+    private queueCfg;
+    constructor(options: JobWorkerOptions);
+    run(jobId: string, prompt: string, options?: {
+        notify?: JobNotify;
+        label?: string;
+    }): Promise<TaskExecutionResult>;
+    private executeDirect;
+    stop(): void;
+}
+//# sourceMappingURL=job-worker.d.ts.map

package/lib/assistant/job-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"job-worker.d.ts","sourceRoot":"","sources":["../../src/assistant/job-worker.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAI5C,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,oBAAoB,CAAC;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,QAAQ,CAAiD;gBAErD,OAAO,EAAE,gBAAgB;IAa/B,GAAG,CACP,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;QACR,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GACA,OAAO,CAAC,mBAAmB,CAAC;YAiCjB,aAAa;IAoB3B,IAAI,IAAI,IAAI;CAKb"}

package/lib/assistant/job-worker.js

@@ -0,0 +1,73 @@
+/**
+ * JobWorker — 执行 Agent 任务（TaskQueue：重试 / 并发 / 死信）
+ */
+import { Logger } from '@zhin.js/core';
+import { getTaskQueue, initTaskQueue } from '../orchestrator/task-queue.js';
+import { resolveAssistantQueueConfig } from './config.js';
+const logger = new Logger(null, 'assistant-job-worker');
+export class JobWorker {
+    executor;
+    queueCfg;
+    constructor(options) {
+        this.executor = options.executor;
+        this.queueCfg = resolveAssistantQueueConfig(options.queue, options.assistantEnabled === true);
+        if (this.queueCfg.enabled) {
+            initTaskQueue({
+                maxConcurrency: this.queueCfg.maxConcurrency,
+                defaultMaxRetries: this.queueCfg.maxRetries,
+                defaultTimeout: this.queueCfg.defaultTimeoutMs,
+                enableDAG: false,
+            });
+        }
+    }
+    async run(jobId, prompt, options) {
+        if (!this.queueCfg.enabled) {
+            return this.executeDirect(jobId, prompt, options);
+        }
+        const label = options?.label || jobId;
+        try {
+            return await getTaskQueue().enqueueAndWait({
+                name: label,
+                description: jobId,
+                priority: 'medium',
+                maxRetries: this.queueCfg.maxRetries,
+                timeout: this.queueCfg.defaultTimeoutMs,
+                metadata: { assistantJobId: jobId },
+                execute: async () => {
+                    const result = await this.executor.executeTask({
+                        prompt,
+                        notify: options?.notify,
+                        timeContext: true,
+                    });
+                    if (!result.success) {
+                        throw new Error(result.error || 'job failed');
+                    }
+                    return result;
+                },
+            });
+        }
+        catch (e) {
+            const error = e?.message || String(e);
+            logger.warn(`Job ${label} dead-letter: ${error}`);
+            return { success: false, error, responseText: '', durationMs: 0 };
+        }
+    }
+    async executeDirect(jobId, prompt, options) {
+        const result = await this.executor.executeTask({
+            prompt,
+            notify: options?.notify,
+            timeContext: true,
+        });
+        const label = options?.label;
+        if (!result.success) {
+            logger.warn(`Job ${label || jobId} failed: ${result.error || 'unknown'}`);
+        }
+        return result;
+    }
+    stop() {
+        if (this.queueCfg.enabled) {
+            getTaskQueue().stop();
+        }
+    }
+}
+//# sourceMappingURL=job-worker.js.map

package/lib/assistant/job-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"job-worker.js","sourceRoot":"","sources":["../../src/assistant/job-worker.ts"],"names":[],"mappings":"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"}

package/lib/assistant/legacy-convert.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Legacy cron-jobs / scheduler-jobs ↔ AssistantJob 转换
+ */
+import type { CronJobRecord } from '../cron-engine.js';
+import type { AssistantJob, JobNotify } from './types.js';
+export declare function cronRecordToAssistant(record: CronJobRecord): AssistantJob;
+export declare function assistantToCronRecord(job: AssistantJob): CronJobRecord | null;
+export interface LegacySchedulerJob {
+    id: string;
+    name: string;
+    enabled: boolean;
+    schedule: {
+        kind: 'at' | 'every' | 'cron';
+        atMs?: number;
+        everyMs?: number;
+        expr?: string;
+        tz?: string;
+    };
+    payload: {
+        kind: string;
+        message: string;
+        deliver?: boolean;
+        channel?: string;
+        to?: string;
+    };
+    state?: {
+        nextRunAtMs?: number;
+        lastRunAtMs?: number;
+        lastStatus?: string;
+        lastError?: string;
+    };
+    createdAtMs: number;
+    updatedAtMs: number;
+    deleteAfterRun?: boolean;
+}
+export declare function schedulerRecordToAssistant(record: LegacySchedulerJob): AssistantJob | null;
+export declare function assistantCronJobs(jobs: AssistantJob[]): CronJobRecord[];
+export declare function isCronSchedulable(job: AssistantJob): boolean;
+export declare function jobPrompt(job: AssistantJob): string;
+/** 从 ToolContext 构建 im notify（cron_add 等） */
+export declare function toolContextToImNotify(ctx: {
+    platform?: string;
+    botId?: string;
+    senderId?: string;
+    sceneId?: string;
+    scope?: string;
+}): JobNotify;
+//# sourceMappingURL=legacy-convert.d.ts.map

package/lib/assistant/legacy-convert.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy-convert.d.ts","sourceRoot":"","sources":["../../src/assistant/legacy-convert.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAa,SAAS,EAAe,MAAM,YAAY,CAAC;AAIlF,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,YAAY,CAkBzE;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,YAAY,GAAG,aAAa,GAAG,IAAI,CAc7E;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,GAAG,OAAO,GAAG,MAAM,CAAC;QAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;KACb,CAAC;IACF,OAAO,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,EAAE,CAAC,EAAE,MAAM,CAAC;KACb,CAAC;IACF,KAAK,CAAC,EAAE;QACN,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAgBD,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,GAAG,IAAI,CA4B1F;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,aAAa,EAAE,CAIvE;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAE5D;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAGnD;AAED,6CAA6C;AAC7C,wBAAgB,qBAAqB,CAAC,GAAG,EAAE;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,SAAS,CAYZ"}

package/lib/assistant/legacy-convert.js

@@ -0,0 +1,108 @@
+const HEARTBEAT_PAYLOAD_KIND = 'heartbeat';
+export function cronRecordToAssistant(record) {
+    const now = Date.now();
+    return {
+        id: record.id,
+        label: record.label,
+        enabled: record.enabled,
+        schedule: { kind: 'cron', expr: record.cronExpression },
+        action: { kind: 'agent', prompt: record.prompt },
+        notify: record.notify,
+        createdAt: record.createdAt,
+        updatedAt: record.createdAt,
+        state: {
+            lastExecutedAt: record.lastExecutedAt,
+            lastStatus: record.lastStatus,
+            lastError: record.lastError,
+        },
+        source: 'cron',
+    };
+}
+export function assistantToCronRecord(job) {
+    if (job.schedule.kind !== 'cron' || job.action.kind !== 'agent')
+        return null;
+    return {
+        id: job.id,
+        cronExpression: job.schedule.expr,
+        prompt: job.action.prompt,
+        label: job.label,
+        enabled: job.enabled,
+        notify: job.notify,
+        createdAt: job.createdAt,
+        lastExecutedAt: job.state.lastExecutedAt,
+        lastStatus: job.state.lastStatus === 'skipped' ? undefined : job.state.lastStatus,
+        lastError: job.state.lastError,
+    };
+}
+function schedulerScheduleToJobSchedule(s) {
+    if (s.kind === 'cron' && s.expr)
+        return { kind: 'cron', expr: s.expr, tz: s.tz };
+    if (s.kind === 'every' && s.everyMs != null && s.everyMs > 0)
+        return { kind: 'every', everyMs: s.everyMs };
+    if (s.kind === 'at' && s.atMs != null)
+        return { kind: 'at', atMs: s.atMs, deleteAfterRun: true };
+    return null;
+}
+function schedulerPayloadToAction(payload) {
+    if (payload.kind === HEARTBEAT_PAYLOAD_KIND) {
+        return { kind: 'heartbeat', prompt: payload.message };
+    }
+    return { kind: 'agent', prompt: payload.message };
+}
+export function schedulerRecordToAssistant(record) {
+    const schedule = schedulerScheduleToJobSchedule(record.schedule);
+    if (!schedule)
+        return null;
+    const notify = record.payload.deliver && record.payload.channel
+        ? {
+            channel: 'im',
+            platform: record.payload.channel,
+            sceneId: record.payload.to,
+        }
+        : { channel: 'silent' };
+    return {
+        id: record.id.startsWith('assistant-') ? record.id : `assistant-${record.id}`,
+        label: record.name,
+        enabled: record.enabled,
+        schedule,
+        action: schedulerPayloadToAction(record.payload),
+        notify,
+        createdAt: record.createdAtMs,
+        updatedAt: record.updatedAtMs,
+        state: {
+            nextRunAtMs: record.state?.nextRunAtMs,
+            lastExecutedAt: record.state?.lastRunAtMs,
+            lastStatus: record.state?.lastStatus,
+            lastError: record.state?.lastError,
+        },
+        source: 'scheduler',
+    };
+}
+export function assistantCronJobs(jobs) {
+    return jobs
+        .map(assistantToCronRecord)
+        .filter((j) => j != null);
+}
+export function isCronSchedulable(job) {
+    return job.schedule.kind === 'cron' && job.enabled;
+}
+export function jobPrompt(job) {
+    if (job.action.kind === 'heartbeat')
+        return job.action.prompt;
+    return job.action.prompt;
+}
+/** 从 ToolContext 构建 im notify（cron_add 等） */
+export function toolContextToImNotify(ctx) {
+    if (!ctx.platform && !ctx.botId && !ctx.sceneId) {
+        return { channel: 'silent' };
+    }
+    return {
+        channel: 'im',
+        platform: ctx.platform,
+        botId: ctx.botId,
+        senderId: ctx.senderId,
+        sceneId: ctx.sceneId,
+        scope: ctx.scope,
+    };
+}
+//# sourceMappingURL=legacy-convert.js.map

package/lib/assistant/legacy-convert.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy-convert.js","sourceRoot":"","sources":["../../src/assistant/legacy-convert.ts"],"names":[],"mappings":"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"}

package/lib/assistant/notification-router.d.ts

@@ -0,0 +1,34 @@
+/**
+ * NotificationRouter — 按 JobNotify.channel 分发任务结果（M3）
+ */
+import type { SendOptions } from '@zhin.js/core';
+import type { JobNotify } from './types.js';
+export type ImJobNotify = Extract<JobNotify, {
+    channel: 'im';
+}>;
+export interface NotificationRouterDeps {
+    resolveAdapter: (platform: string) => {
+        sendMessage: (opts: SendOptions) => Promise<string>;
+    } | undefined;
+    /** M4 注入 HA REST；M3 未配置时仅记日志 */
+    callHaService?: (service: string, target?: string, data?: unknown) => Promise<void>;
+}
+export interface DeliverParams {
+    notify: JobNotify;
+    content: string;
+    jobId?: string;
+    label?: string;
+}
+export interface DeliverResult {
+    delivered: boolean;
+    channel: JobNotify['channel'];
+}
+export declare function mergeImNotify(notify: ImJobNotify, defaults?: JobNotify): ImJobNotify;
+export declare function resolveEffectiveNotify(notify: JobNotify | undefined, defaults: JobNotify | undefined): JobNotify;
+export declare function notifyToSendOptions(notify: ImJobNotify, content: string): SendOptions;
+export declare function createNotificationRouter(deps: NotificationRouterDeps): {
+    deliver: (params: DeliverParams) => Promise<DeliverResult>;
+    resolveEffectiveNotify: typeof resolveEffectiveNotify;
+};
+export type NotificationRouter = ReturnType<typeof createNotificationRouter>;
+//# sourceMappingURL=notification-router.d.ts.map