@zhin.js/agent 0.3.1 → 1.0.2

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

@@ -1,35 +1,32 @@
-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 {
+import { type ScheduleJob, type ScheduleJobFile, type JobAction, type JobNotify } from './types.js';
+export type AssistantJobStore = ScheduleJobStore;
+export type AssistantJob = ScheduleJob;
+export interface ScheduleJobStoreOptions {
     dataDir: string;
-    legacyDualWrite?: boolean;
     jobsFile?: string;
+    /** 读盘时合并 `{ channel: im }` 等缺 target 的 notify（与 resolveEffectiveNotify 一致） */
+    defaultNotify?: JobNotify;
 }
-export interface MigrationResult {
-    migrated: number;
-    fromCron: number;
-    fromScheduler: number;
-    backupPaths: string[];
-}
+export declare function getScheduleJobsPath(dataDir: string, jobsFile?: string): string;
+/** @deprecated */
 export declare function getAssistantJobsPath(dataDir: string, jobsFile?: string): string;
-export declare class AssistantJobStore {
+export declare class ScheduleJobStore {
     private dataDir;
     private filePath;
-    private legacyDualWrite;
+    private defaultNotify?;
     private cache;
-    constructor(options: AssistantJobStoreOptions);
+    constructor(options: ScheduleJobStoreOptions);
     getDataDir(): string;
     private emptyStore;
-    read(): Promise<AssistantJobFile>;
+    read(): Promise<ScheduleJobFile>;
     private invalidateCache;
-    write(store: AssistantJobFile): Promise<void>;
-    listJobs(): Promise<AssistantJob[]>;
-    listCronCompatible(): Promise<CronJobRecord[]>;
-    getJob(id: string): Promise<AssistantJob | undefined>;
-    upsertJob(job: AssistantJob): Promise<AssistantJob>;
+    write(store: ScheduleJobFile): Promise<void>;
+    listJobs(): Promise<ScheduleJob[]>;
+    getJob(id: string): Promise<ScheduleJob | undefined>;
+    upsertJob(job: ScheduleJob): Promise<void>;
     removeJob(id: string): Promise<boolean>;
-    findEventJobByEventId(eventId: string): Promise<AssistantJob | undefined>;
+    updateJobState(id: string, patch: Partial<ScheduleJob['state']>): Promise<void>;
+    findEventJobByEventId(eventId: string): Promise<ScheduleJob | undefined>;
     createEventJob(input: {
         id: string;
         label?: string;
@@ -39,17 +36,11 @@ export declare class AssistantJobStore {
         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;
+    }): Promise<ScheduleJob>;
 }
-export declare function createAssistantJobStore(dataDir: string, config?: AssistantConfig): AssistantJobStore;
+export declare function createScheduleJobStoreFromConfig(dataDir: string, options?: {
+    defaultNotify?: JobNotify;
+}): ScheduleJobStore;
+/** @deprecated */
+export declare const AssistantJobStore: typeof ScheduleJobStore;
 //# sourceMappingURL=job-store.d.ts.map

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

@@ -1 +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"}
+{"version":3,"file":"job-store.d.ts","sourceRoot":"","sources":["../../src/assistant/job-store.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAiD,MAAM,YAAY,CAAC;AAMnJ,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;AACjD,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC;AAEvC,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,SAAyB,GAAG,MAAM,CAE9F;AAED,kBAAkB;AAClB,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/E;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAC,CAAY;IAClC,OAAO,CAAC,KAAK,CAAgC;gBAEjC,OAAO,EAAE,uBAAuB;IAM5C,UAAU,IAAI,MAAM;IAIpB,OAAO,CAAC,UAAU;IAIZ,IAAI,IAAI,OAAO,CAAC,eAAe,CAAC;IA0BtC,OAAO,CAAC,eAAe;IAIjB,KAAK,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5C,QAAQ,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAKlC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKpD,SAAS,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAa1C,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWvC,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ/E,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKxE,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,WAAW,CAAC;CAuBzB;AA8BD,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,aAAa,CAAC,EAAE,SAAS,CAAA;CAAE,GACtC,gBAAgB,CAElB;AAED,kBAAkB;AAClB,eAAO,MAAM,iBAAiB,yBAAmB,CAAC"}

package/lib/assistant/job-store.js

@@ -1,32 +1,36 @@
 /**
- * Assistant JobStore — assistant-jobs.json 持久化
+ * Schedule JobStore — schedule-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) {
+import { Logger } from '@zhin.js/logger';
+import { SCHEDULE_JOBS_FILENAME, SCHEDULE_JOBS_VERSION } from './types.js';
+import { parseScheduleJobCreator } from './job-creator.js';
+import { parseScheduleJobExecutionPlan } from './schedule-execution.js';
+import { parseJobNotify, resolveEffectiveNotify } from './notification-router.js';
+const logger = new Logger(null, 'schedule-job-store');
+export function getScheduleJobsPath(dataDir, jobsFile = SCHEDULE_JOBS_FILENAME) {
     return path.join(dataDir, jobsFile);
 }
-export class AssistantJobStore {
+/** @deprecated */
+export function getAssistantJobsPath(dataDir, jobsFile) {
+    return getScheduleJobsPath(dataDir, jobsFile);
+}
+export class ScheduleJobStore {
     dataDir;
     filePath;
-    legacyDualWrite;
+    defaultNotify;
     cache = null;
     constructor(options) {
         this.dataDir = options.dataDir;
-        this.filePath = getAssistantJobsPath(options.dataDir, options.jobsFile);
-        this.legacyDualWrite = options.legacyDualWrite === true;
+        this.filePath = getScheduleJobsPath(options.dataDir, options.jobsFile);
+        this.defaultNotify = options.defaultNotify;
     }
     getDataDir() {
         return this.dataDir;
     }
     emptyStore() {
-        return { version: ASSISTANT_JOBS_VERSION, jobs: [] };
+        return { version: SCHEDULE_JOBS_VERSION, jobs: [] };
     }
     async read() {
         if (this.cache)
@@ -39,8 +43,8 @@ export class AssistantJobStore {
                 return this.cache;
             }
             this.cache = {
-                version: data.version ?? ASSISTANT_JOBS_VERSION,
-                jobs: data.jobs.map(normalizeJob),
+                version: data.version ?? SCHEDULE_JOBS_VERSION,
+                jobs: data.jobs.map((j) => normalizeJob(j, this.defaultNotify)),
             };
             return this.cache;
         }
@@ -60,57 +64,52 @@ export class AssistantJobStore {
         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);
+        return store.jobs;
     }
     async getJob(id) {
-        const jobs = await this.listJobs();
-        return jobs.find((j) => j.id === id);
+        const store = await this.read();
+        return store.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 ?? {},
-        };
+        const now = Date.now();
+        const normalized = { ...job, updatedAt: now };
         if (idx >= 0) {
-            store.jobs[idx] = full;
+            store.jobs[idx] = normalized;
         }
         else {
-            store.jobs.push(full);
+            store.jobs.push({ ...normalized, createdAt: normalized.createdAt || now });
         }
         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;
+        const before = store.jobs.length;
+        store.jobs = store.jobs.filter((j) => j.id !== id);
+        if (store.jobs.length < before) {
+            await this.write(store);
+            return true;
+        }
+        return false;
+    }
+    async updateJobState(id, patch) {
+        const job = await this.getJob(id);
+        if (!job)
+            return;
+        job.state = { ...job.state, ...patch };
+        job.updatedAt = Date.now();
+        await this.upsertJob(job);
     }
     async findEventJobByEventId(eventId) {
         const jobs = await this.listJobs();
-        return jobs.find((j) => j.schedule.kind === 'event'
-            && j.schedule.eventId === eventId);
+        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,
@@ -122,159 +121,45 @@ export class AssistantJobStore {
                 eventType: input.eventType,
             },
             action: input.action,
-            notify,
+            notify: input.notify ?? { channel: 'silent' },
             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)));
-        }
+        await this.upsertJob(job);
+        return job;
     }
 }
-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 已移除）`);
+function normalizeJob(raw, defaultNotify) {
+    const notify = parseJobNotify(resolveEffectiveNotify(raw.notify, defaultNotify));
+    const schedule = raw.schedule;
+    const action = raw.action;
+    if (!schedule || !action) {
+        throw new Error(`schedule-jobs.json: job "${String(raw.id)}" 缺少 schedule 或 action`);
     }
     return {
-        ...raw,
-        notify: raw.notify,
+        id: String(raw.id),
+        label: raw.label != null ? String(raw.label) : undefined,
+        enabled: raw.enabled !== false,
+        schedule,
+        action,
+        notify,
+        notifyOnFailure: raw.notifyOnFailure === true ? true : undefined,
+        createdAt: Number(raw.createdAt) || Date.now(),
+        updatedAt: Number(raw.updatedAt) || Date.now(),
         state: raw.state ?? {},
-        createdAt: raw.createdAt ?? Date.now(),
-        updatedAt: raw.updatedAt ?? raw.createdAt ?? Date.now(),
+        source: raw.source,
+        createdBy: parseScheduleJobCreator(raw.createdBy),
+        executionPlan: parseScheduleJobExecutionPlan(raw.executionPlan),
+        activityFeedback: raw.activityFeedback === true ? true : undefined,
+        eventPayload: raw.eventPayload,
     };
 }
-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,
-    });
+export function createScheduleJobStoreFromConfig(dataDir, options) {
+    return new ScheduleJobStore({ dataDir, defaultNotify: options?.defaultNotify });
 }
+/** @deprecated */
+export const AssistantJobStore = ScheduleJobStore;
 //# sourceMappingURL=job-store.js.map

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

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

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

@@ -0,0 +1,2 @@
+export declare function jobPrompt(job: import('./types.js').ScheduleJob): string;
+//# sourceMappingURL=job-utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"job-utils.d.ts","sourceRoot":"","sources":["../../src/assistant/job-utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,YAAY,EAAE,WAAW,GAAG,MAAM,CAKvE"}

package/lib/assistant/job-utils.js

@@ -0,0 +1,7 @@
+export function jobPrompt(job) {
+    if (job.action.kind === 'heartbeat' || job.action.kind === 'agent') {
+        return job.executionPlan?.prompt?.trim() || job.action.prompt;
+    }
+    return '';
+}
+//# sourceMappingURL=job-utils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"job-utils.js","sourceRoot":"","sources":["../../src/assistant/job-utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,SAAS,CAAC,GAAqC;IAC7D,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACnE,OAAO,GAAG,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;IAChE,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}

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

@@ -1,6 +1,6 @@
 import type { TaskExecutionResult, TaskExecutor } from '../task-executor.js';
-import type { AssistantQueueConfig } from './config.js';
-import type { JobNotify } from './types.js';
+import { type AssistantQueueConfig } from './config.js';
+import type { JobNotify, ScheduleJobCreator, ScheduleJobExecutionPlan } from './types.js';
 export interface JobWorkerOptions {
     executor: TaskExecutor;
     queue?: AssistantQueueConfig;
@@ -13,6 +13,10 @@ export declare class JobWorker {
     run(jobId: string, prompt: string, options?: {
         notify?: JobNotify;
         label?: string;
+        createdBy?: ScheduleJobCreator;
+        executionPlan?: ScheduleJobExecutionPlan;
+        activityFeedback?: boolean;
+        scheduleJobId?: string;
     }): Promise<TaskExecutionResult>;
     private executeDirect;
     stop(): void;

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

@@ -1 +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"}
+{"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,EAAE,KAAK,oBAAoB,EAA+B,MAAM,aAAa,CAAC;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAG1F,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;QACf,SAAS,CAAC,EAAE,kBAAkB,CAAC;QAC/B,aAAa,CAAC,EAAE,wBAAwB,CAAC;QACzC,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,GACA,OAAO,CAAC,mBAAmB,CAAC;YAqCjB,aAAa;IA4B3B,IAAI,IAAI,IAAI;CAKb"}

package/lib/assistant/job-worker.js

@@ -38,6 +38,10 @@ export class JobWorker {
                         prompt,
                         notify: options?.notify,
                         timeContext: true,
+                        createdBy: options?.createdBy,
+                        executionPlan: options?.executionPlan,
+                        activityFeedback: options?.activityFeedback,
+                        scheduleJobId: options?.scheduleJobId,
                     });
                     if (!result.success) {
                         throw new Error(result.error || 'job failed');
@@ -57,6 +61,10 @@ export class JobWorker {
             prompt,
             notify: options?.notify,
             timeContext: true,
+            createdBy: options?.createdBy,
+            executionPlan: options?.executionPlan,
+            activityFeedback: options?.activityFeedback,
+            scheduleJobId: options?.scheduleJobId,
         });
         const label = options?.label;
         if (!result.success) {

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

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

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

@@ -1,7 +1,7 @@
 /**
  * NotificationRouter — 按 JobNotify.channel 分发任务结果（M3）
  */
-import type { SendOptions } from '@zhin.js/core';
+import { type SendOptions } from '@zhin.js/core';
 import type { JobNotify } from './types.js';
 export type ImJobNotify = Extract<JobNotify, {
     channel: 'im';
@@ -10,6 +10,8 @@ export interface NotificationRouterDeps {
     resolveAdapter: (platform: string) => {
         sendMessage: (opts: SendOptions) => Promise<string>;
     } | undefined;
+    /** 优先经 sendProactive 出站；未注入时回退 resolveAdapter.sendMessage */
+    sendIm?: (notify: ImJobNotify, content: string) => Promise<void>;
     /** M4 注入 HA REST；M3 未配置时仅记日志 */
     callHaService?: (service: string, target?: string, data?: unknown) => Promise<void>;
 }
@@ -23,9 +25,10 @@ export interface DeliverResult {
     delivered: boolean;
     channel: JobNotify['channel'];
 }
-export declare function mergeImNotify(notify: ImJobNotify, defaults?: JobNotify): ImJobNotify;
+/** 解析并校验 notify（须为 canonical JobNotify + IMDeliveryTarget） */
+export declare function parseJobNotify(notify: unknown): JobNotify;
 export declare function resolveEffectiveNotify(notify: JobNotify | undefined, defaults: JobNotify | undefined): JobNotify;
-export declare function notifyToSendOptions(notify: ImJobNotify, content: string): SendOptions;
+export declare function imNotifyToSendOptions(notify: ImJobNotify, content: string): SendOptions;
 export declare function createNotificationRouter(deps: NotificationRouterDeps): {
     deliver: (params: DeliverParams) => Promise<DeliverResult>;
     resolveEffectiveNotify: typeof resolveEffectiveNotify;

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

@@ -1 +1 @@
-{"version":3,"file":"notification-router.d.ts","sourceRoot":"","sources":["../../src/assistant/notification-router.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,eAAe,CAAC;AAI9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAI5C,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC;AAEhE,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK;QAAE,WAAW,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,SAAS,CAAC;IAC1G,gCAAgC;IAChC,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC/B;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,WAAW,CAUpF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,GAAG,SAAS,EAC7B,QAAQ,EAAE,SAAS,GAAG,SAAS,GAC9B,SAAS,CASX;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,WAAW,CAYrF;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,sBAAsB;sBAqBpC,aAAa,KAAG,OAAO,CAAC,aAAa,CAAC;;EAiCtE;AAED,MAAM,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"notification-router.d.ts","sourceRoot":"","sources":["../../src/assistant/notification-router.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,WAAW,EAAiC,MAAM,eAAe,CAAC;AAEhF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAG5C,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC;AAEhE,MAAM,WAAW,sBAAsB;IACrC,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK;QAAE,WAAW,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,SAAS,CAAC;IAC1G,6DAA6D;IAC7D,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,gCAAgC;IAChC,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC/B;AAkBD,8DAA8D;AAC9D,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CASzD;AA2BD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,GAAG,SAAS,EAC7B,QAAQ,EAAE,SAAS,GAAG,SAAS,GAC9B,SAAS,CAkBX;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,GAAG,WAAW,CAEvF;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,sBAAsB;sBA0BpC,aAAa,KAAG,OAAO,CAAC,aAAa,CAAC;;EAiCtE;AAED,MAAM,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC"}