@agentium/queue 3.0.2 → 3.1.1

package/dist/index.d.ts

@@ -1,171 +1,7 @@
-import * as _agentium_core from '@agentium/core';
-import { RunOutput, Agent, Workflow, EventBus } from '@agentium/core';
-
-type AgentJobPayload = {
-    type: "agent";
-    agentName: string;
-    input: string;
-    sessionId?: string;
-    userId?: string;
-};
-type WorkflowJobPayload = {
-    type: "workflow";
-    workflowName: string;
-    initialState?: Record<string, unknown>;
-    sessionId?: string;
-};
-type TeamJobPayload = {
-    type: "team";
-    teamName: string;
-    input: string;
-    sessionId?: string;
-    userId?: string;
-};
-type JobPayload = AgentJobPayload | WorkflowJobPayload | TeamJobPayload;
-type ScheduleInfo = {
-    id: string;
-    pattern: string;
-    timezone?: string;
-    next: Date;
-};
-type JobStatus = {
-    jobId: string;
-    state: "waiting" | "active" | "completed" | "failed" | "delayed";
-    progress?: number;
-    result?: RunOutput;
-    error?: string;
-    createdAt: Date;
-    processedAt?: Date;
-    finishedAt?: Date;
-};
-
-interface QueueConfig {
-    connection: {
-        host: string;
-        port: number;
-        password?: string;
-        db?: number;
-        tls?: boolean;
-    } | string;
-    queueName?: string;
-    defaultJobOptions?: Record<string, unknown>;
-}
-declare class AgentQueue {
-    private queue;
-    private queueEvents;
-    private queueName;
-    constructor(config: QueueConfig);
-    enqueueAgentRun(opts: {
-        agentName: string;
-        input: string;
-        sessionId?: string;
-        userId?: string;
-        priority?: number;
-        delay?: number;
-        attempts?: number;
-        backoff?: {
-            type: "exponential" | "fixed";
-            delay: number;
-        };
-        repeat?: {
-            pattern: string;
-            timezone?: string;
-        };
-    }): Promise<{
-        jobId: string;
-    }>;
-    enqueueWorkflow(opts: {
-        workflowName: string;
-        initialState?: Record<string, unknown>;
-        sessionId?: string;
-        priority?: number;
-        delay?: number;
-        attempts?: number;
-        backoff?: {
-            type: "exponential" | "fixed";
-            delay: number;
-        };
-        repeat?: {
-            pattern: string;
-            timezone?: string;
-        };
-    }): Promise<{
-        jobId: string;
-    }>;
-    enqueueTeamRun(opts: {
-        teamName: string;
-        input: string;
-        sessionId?: string;
-        userId?: string;
-        priority?: number;
-        delay?: number;
-        attempts?: number;
-        backoff?: {
-            type: "exponential" | "fixed";
-            delay: number;
-        };
-        repeat?: {
-            pattern: string;
-            timezone?: string;
-        };
-    }): Promise<{
-        jobId: string;
-    }>;
-    getJobStatus(jobId: string): Promise<JobStatus>;
-    cancelJob(jobId: string): Promise<void>;
-    onCompleted(handler: (jobId: string, result: RunOutput) => void): void;
-    onFailed(handler: (jobId: string, error: Error) => void): void;
-    schedule(opts: {
-        id: string;
-        cron: string;
-        timezone?: string;
-        agent?: {
-            name: string;
-            input: string;
-            sessionId?: string;
-            userId?: string;
-        };
-        workflow?: {
-            name: string;
-            initialState?: Record<string, unknown>;
-        };
-        team?: {
-            name: string;
-            input: string;
-            sessionId?: string;
-            userId?: string;
-        };
-    }): Promise<{
-        jobId: string;
-    }>;
-    unschedule(id: string): Promise<void>;
-    listSchedules(): Promise<ScheduleInfo[]>;
-    close(): Promise<void>;
-}
-
-interface WorkerConfig {
-    connection: {
-        host: string;
-        port: number;
-        password?: string;
-        db?: number;
-        tls?: boolean;
-    } | string;
-    queueName?: string;
-    concurrency?: number;
-    attempts?: number;
-    backoffDelay?: number;
-    agentRegistry: Record<string, Agent>;
-    workflowRegistry?: Record<string, Workflow<any>>;
-    teamRegistry?: Record<string, _agentium_core.Team>;
-}
-declare class AgentWorker {
-    private worker;
-    constructor(config: WorkerConfig);
-    start(): void;
-    stop(timeoutMs?: number): Promise<void>;
-}
-
-declare function bridgeEventBusToJob(eventBus: EventBus, job: any, runId: string): () => void;
-
-export { type AgentJobPayload, AgentQueue, AgentWorker, type JobPayload, type JobStatus, type QueueConfig, type ScheduleInfo, type TeamJobPayload, type WorkerConfig, type WorkflowJobPayload, bridgeEventBusToJob };
+export type { QueueConfig } from "./job-producer.js";
+export { AgentQueue } from "./job-producer.js";
+export type { AgentJobPayload, JobPayload, JobStatus, ScheduleInfo, TeamJobPayload, WorkflowJobPayload, } from "./job-types.js";
+export type { WorkerConfig } from "./job-worker.js";
+export { AgentWorker } from "./job-worker.js";
+export { bridgeEventBusToJob } from "./progress.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,YAAY,EACV,eAAe,EACf,UAAU,EACV,SAAS,EACT,YAAY,EACZ,cAAc,EACd,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC"}

package/dist/{index.d.cts → job-producer.d.ts}

@@ -1,45 +1,6 @@
-import * as _agentium_core from '@agentium/core';
-import { RunOutput, Agent, Workflow, EventBus } from '@agentium/core';
-
-type AgentJobPayload = {
-    type: "agent";
-    agentName: string;
-    input: string;
-    sessionId?: string;
-    userId?: string;
-};
-type WorkflowJobPayload = {
-    type: "workflow";
-    workflowName: string;
-    initialState?: Record<string, unknown>;
-    sessionId?: string;
-};
-type TeamJobPayload = {
-    type: "team";
-    teamName: string;
-    input: string;
-    sessionId?: string;
-    userId?: string;
-};
-type JobPayload = AgentJobPayload | WorkflowJobPayload | TeamJobPayload;
-type ScheduleInfo = {
-    id: string;
-    pattern: string;
-    timezone?: string;
-    next: Date;
-};
-type JobStatus = {
-    jobId: string;
-    state: "waiting" | "active" | "completed" | "failed" | "delayed";
-    progress?: number;
-    result?: RunOutput;
-    error?: string;
-    createdAt: Date;
-    processedAt?: Date;
-    finishedAt?: Date;
-};
-
-interface QueueConfig {
+import type { RunOutput } from "@agentium/core";
+import type { JobStatus, ScheduleInfo } from "./job-types.js";
+export interface QueueConfig {
     connection: {
         host: string;
         port: number;
@@ -50,7 +11,7 @@ interface QueueConfig {
     queueName?: string;
     defaultJobOptions?: Record<string, unknown>;
 }
-declare class AgentQueue {
+export declare class AgentQueue {
     private queue;
     private queueEvents;
     private queueName;
@@ -142,30 +103,4 @@ declare class AgentQueue {
     listSchedules(): Promise<ScheduleInfo[]>;
     close(): Promise<void>;
 }
-
-interface WorkerConfig {
-    connection: {
-        host: string;
-        port: number;
-        password?: string;
-        db?: number;
-        tls?: boolean;
-    } | string;
-    queueName?: string;
-    concurrency?: number;
-    attempts?: number;
-    backoffDelay?: number;
-    agentRegistry: Record<string, Agent>;
-    workflowRegistry?: Record<string, Workflow<any>>;
-    teamRegistry?: Record<string, _agentium_core.Team>;
-}
-declare class AgentWorker {
-    private worker;
-    constructor(config: WorkerConfig);
-    start(): void;
-    stop(timeoutMs?: number): Promise<void>;
-}
-
-declare function bridgeEventBusToJob(eventBus: EventBus, job: any, runId: string): () => void;
-
-export { type AgentJobPayload, AgentQueue, AgentWorker, type JobPayload, type JobStatus, type QueueConfig, type ScheduleInfo, type TeamJobPayload, type WorkerConfig, type WorkflowJobPayload, bridgeEventBusToJob };
+//# sourceMappingURL=job-producer.d.ts.map

package/dist/job-producer.d.ts.map

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

package/dist/job-types.d.ts

@@ -0,0 +1,39 @@
+import type { RunOutput } from "@agentium/core";
+export type AgentJobPayload = {
+    type: "agent";
+    agentName: string;
+    input: string;
+    sessionId?: string;
+    userId?: string;
+};
+export type WorkflowJobPayload = {
+    type: "workflow";
+    workflowName: string;
+    initialState?: Record<string, unknown>;
+    sessionId?: string;
+};
+export type TeamJobPayload = {
+    type: "team";
+    teamName: string;
+    input: string;
+    sessionId?: string;
+    userId?: string;
+};
+export type JobPayload = AgentJobPayload | WorkflowJobPayload | TeamJobPayload;
+export type ScheduleInfo = {
+    id: string;
+    pattern: string;
+    timezone?: string;
+    next: Date;
+};
+export type JobStatus = {
+    jobId: string;
+    state: "waiting" | "active" | "completed" | "failed" | "delayed";
+    progress?: number;
+    result?: RunOutput;
+    error?: string;
+    createdAt: Date;
+    processedAt?: Date;
+    finishedAt?: Date;
+};
+//# sourceMappingURL=job-types.d.ts.map

package/dist/job-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"job-types.d.ts","sourceRoot":"","sources":["../src/job-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,UAAU,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,eAAe,GAAG,kBAAkB,GAAG,cAAc,CAAC;AAE/E,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,IAAI,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,SAAS,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;IACjE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,IAAI,CAAC;IAChB,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,UAAU,CAAC,EAAE,IAAI,CAAC;CACnB,CAAC"}

package/dist/job-worker.d.ts

@@ -0,0 +1,24 @@
+import type { Agent, Workflow } from "@agentium/core";
+export interface WorkerConfig {
+    connection: {
+        host: string;
+        port: number;
+        password?: string;
+        db?: number;
+        tls?: boolean;
+    } | string;
+    queueName?: string;
+    concurrency?: number;
+    attempts?: number;
+    backoffDelay?: number;
+    agentRegistry: Record<string, Agent>;
+    workflowRegistry?: Record<string, Workflow<any>>;
+    teamRegistry?: Record<string, import("@agentium/core").Team>;
+}
+export declare class AgentWorker {
+    private worker;
+    constructor(config: WorkerConfig);
+    start(): void;
+    stop(timeoutMs?: number): Promise<void>;
+}
+//# sourceMappingURL=job-worker.d.ts.map

package/dist/job-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"job-worker.d.ts","sourceRoot":"","sources":["../src/job-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGtD,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,CAAC;IACnG,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,gBAAgB,EAAE,IAAI,CAAC,CAAC;CAC9D;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAM;gBAER,MAAM,EAAE,YAAY;IAmFhC,KAAK,IAAI,IAAI;IAIP,IAAI,CAAC,SAAS,SAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ7C"}

package/dist/progress.d.ts

@@ -0,0 +1,3 @@
+import type { EventBus } from "@agentium/core";
+export declare function bridgeEventBusToJob(eventBus: EventBus, job: any, runId: string): () => void;
+//# sourceMappingURL=progress.d.ts.map

package/dist/progress.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../src/progress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,IAAI,CAqB3F"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentium/queue",
-  "version": "3.0.2",
+  "version": "3.1.1",
   "description": "Background job processing for Agentium agents using BullMQ",
   "license": "MIT",
   "publishConfig": {
@@ -35,8 +35,8 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --format esm,cjs --dts --shims --clean",
-    "dev": "tsup src/index.ts --format esm,cjs --dts --shims --watch",
+    "build": "tsup src/index.ts --format esm,cjs --shims --clean && tsc -p tsconfig.build.json --emitDeclarationOnly --declaration --pretty false",
+    "dev": "tsup src/index.ts --format esm,cjs --shims --watch",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
@@ -45,7 +45,7 @@
     "typescript": "^5.6.0"
   },
   "peerDependencies": {
-    "@agentium/core": "^3.0.2",
+    "@agentium/core": "^3.1.1",
     "bullmq": "^5.0.0",
     "ioredis": "^5.0.0"
   },