@pikku/mongodb 0.12.17 → 0.12.18

package/CHANGELOG.md

@@ -1,5 +1,77 @@
 # @pikku/mongodb
 
+## 0.12.18
+
+### Patch Changes
+
+- 7406bfe: Rename the agent runtime from `AI*` to `Agent*` (#596)
+
+  `AI` described the model provider, not the thing being named. Every symbol that
+  belongs to the agent runtime now says `Agent`; the symbols that genuinely wrap a
+  model provider — `AIEmbeddingService`, `AIProviderOptions`, `AIEmbedParams`,
+  `AITranscriptionParams`, `AIGenerateImageParams` and their siblings, and the
+  `@pikku/ai-vercel` / `@pikku/ai-deepinfra` / `@pikku/ai-voice` packages — keep
+  their names.
+
+  **Wiring**
+  - `pikkuAIAgent` → `pikkuAgent`, `pikkuAIScorer` → `pikkuAgentScorer`,
+    `pikkuAIJudge` → `pikkuAgentJudge`
+  - `CoreAIAgent` → `CoreAgent`, `AIAgentInput` → `AgentInput`, `AIAgentStep` →
+    `AgentStep`, `AIMessage` → `AgentMessage`, and the rest of the agent types
+  - `AIAgentRunnerService` → `AgentRunnerService`, `AIStorageService` →
+    `AgentStorageService`, `AIRunStateService` → `AgentRunStateService`
+
+  **Entry points**
+
+  `@pikku/core/agent` → `@pikku/core/agent`, `@pikku/core/agent-scorer` →
+  `@pikku/core/agent-scorer`.
+
+  **Queues**
+
+  The scorer queues are now `agent-score-fast` and `agent-score-slow`. Drain the
+  old `ai-score-fast` / `ai-score-slow` queues before deploying — jobs still
+  sitting on them when the new workers start will never be picked up.
+
+  **Scaffolds**
+
+  The agent scaffold pikku wrote for your project — `<scaffold>/agent/agent.gen.ts`
+  and its schemas file — imports `@pikku/core/ai-agent`, which no longer exists. A
+  scaffold is normally written once and then left alone, so `pikku all` would find
+  it present and leave the broken import in place. It now deletes an agent scaffold
+  importing either removed entry point and regenerates it in the same run. Anything
+  you added to that file goes with it, so move local edits out first.
+
+  **Database**
+
+  The agent tables are renamed: `ai_threads`, `ai_message`, `ai_tool_call`,
+  `ai_working_memory`, `ai_run` and `ai_run_score` become `agent_threads`,
+  `agent_message`, `agent_tool_call`, `agent_working_memory`, `agent_run` and
+  `agent_run_score`, along with their indexes and the `ai_working_memory_pk`
+  constraint. The same rename applies to the MongoDB collections.
+
+  `ensurePikkuSchema` creates tables it cannot find, so an existing database will
+  get empty `agent_*` tables and leave the old data stranded in `ai_*`. Rename
+  them before the first boot on the new version:
+
+  ```sql
+  ALTER TABLE ai_threads        RENAME TO agent_threads;
+  ALTER TABLE ai_message        RENAME TO agent_message;
+  ALTER TABLE ai_tool_call      RENAME TO agent_tool_call;
+  ALTER TABLE ai_working_memory RENAME TO agent_working_memory;
+  ALTER TABLE ai_run            RENAME TO agent_run;
+  ALTER TABLE ai_run_score      RENAME TO agent_run_score;
+  ```
+
+- 6794681: Publish the ecosystem surface as per-area sub-barrels under `@pikku/core/ecosystem/*`, and point generated code, the CLI, the inspector and the runtime adapters at them.
+
+  348 names that only generated code, the toolchain or a runtime adapter ever imports now have a second home on `@pikku/core/ecosystem/<area>` — one sub-barrel per area, matching how core already publishes its entrypoints, so no single barrel grows without bound and a consumer only pulls in the area it uses.
+
+  This step is additive: every name is still exported from the entrypoint it was published from before, so nothing downstream breaks. Removing them from the app-facing barrels is a later change, and needs a release carrying `./ecosystem/*` first.
+
+- Updated dependencies [7406bfe]
+- Updated dependencies [6794681]
+  - @pikku/core@0.12.84
+
 ## 0.12.17
 
 ### Patch Changes

package/dist/src/index.d.ts

@@ -4,9 +4,9 @@ export { MongoDBEventHubStore } from './mongodb-eventhub-store.js';
 export { MongoDBWorkflowService } from './mongodb-workflow-service.js';
 export { MongoDBWorkflowRunService } from './mongodb-workflow-run-service.js';
 export { MongoDBDeploymentService } from './mongodb-deployment-service.js';
-export { MongoDBAIStorageService } from './mongodb-ai-storage-service.js';
+export { MongoDBAgentStorageService } from './mongodb-agent-storage-service.js';
 export { MongoDBAgentRunService } from './mongodb-agent-run-service.js';
 export { MongoDBSecretService } from './mongodb-secret-service.js';
-export type { WorkflowRunService } from '@pikku/core/workflow';
-export type { AgentRunService, AgentRunRow } from '@pikku/core/ai-agent';
+export type { WorkflowRunService } from '@pikku/core/ecosystem/workflow';
+export type { AgentRunService, AgentRunRow, } from '@pikku/core/ecosystem/agent';
 export { MongoDBSessionStore } from './mongodb-session-store.js';

package/dist/src/index.js

@@ -4,7 +4,7 @@ export { MongoDBEventHubStore } from './mongodb-eventhub-store.js';
 export { MongoDBWorkflowService } from './mongodb-workflow-service.js';
 export { MongoDBWorkflowRunService } from './mongodb-workflow-run-service.js';
 export { MongoDBDeploymentService } from './mongodb-deployment-service.js';
-export { MongoDBAIStorageService } from './mongodb-ai-storage-service.js';
+export { MongoDBAgentStorageService } from './mongodb-agent-storage-service.js';
 export { MongoDBAgentRunService } from './mongodb-agent-run-service.js';
 export { MongoDBSecretService } from './mongodb-secret-service.js';
 export { MongoDBSessionStore } from './mongodb-session-store.js';

package/dist/src/mongodb-agent-run-service.d.ts

@@ -1,4 +1,5 @@
-import type { AIThread, AIMessage, AgentRunRow, AgentRunService } from '@pikku/core/ai-agent';
+import type { AgentThread, AgentMessage } from '@pikku/core/agent';
+import type { AgentRunRow, AgentRunService } from '@pikku/core/ecosystem/agent';
 import type { Db } from 'mongodb';
 export declare class MongoDBAgentRunService implements AgentRunService {
     private threads;
@@ -12,9 +13,9 @@ export declare class MongoDBAgentRunService implements AgentRunService {
         owners?: string[];
         limit?: number;
         offset?: number;
-    }): Promise<AIThread[]>;
-    getThread(threadId: string): Promise<AIThread | null>;
-    getThreadMessages(threadId: string): Promise<AIMessage[]>;
+    }): Promise<AgentThread[]>;
+    getThread(threadId: string): Promise<AgentThread | null>;
+    getThreadMessages(threadId: string): Promise<AgentMessage[]>;
     getThreadRuns(threadId: string): Promise<AgentRunRow[]>;
     deleteThread(threadId: string): Promise<boolean>;
     getDistinctAgentNames(): Promise<string[]>;

package/dist/src/mongodb-agent-run-service.js

@@ -7,10 +7,10 @@ export class MongoDBAgentRunService {
     toolCalls;
     runs;
     constructor(db) {
-        this.threads = db.collection('ai_threads');
-        this.messages = db.collection('ai_message');
-        this.toolCalls = db.collection('ai_tool_call');
-        this.runs = db.collection('ai_run');
+        this.threads = db.collection('agent_threads');
+        this.messages = db.collection('agent_message');
+        this.toolCalls = db.collection('agent_tool_call');
+        this.runs = db.collection('agent_run');
     }
     async listThreads(options) {
         const { agentName, resourceId, owners, limit = 50, offset = 0, } = options ?? {};

package/dist/src/mongodb-agent-storage-service.d.ts

@@ -0,0 +1,45 @@
+import type { AgentStorageService, AgentRunStateService, CreateRunInput, SaveScoreInput } from '@pikku/core/services';
+import type { AgentThread, AgentMessage, AgentRunState } from '@pikku/core/agent';
+import type { AgentRunScore } from '@pikku/core/agent-scorer';
+import type { Db } from 'mongodb';
+export declare class MongoDBAgentStorageService implements AgentStorageService, AgentRunStateService {
+    private db;
+    private initialized;
+    private threads;
+    private agentMessages;
+    private toolCalls;
+    private workingMemory;
+    private agentRuns;
+    private agentRunScores;
+    constructor(db: Db);
+    init(): Promise<void>;
+    createThread(resourceId: string, options?: {
+        threadId?: string;
+        title?: string;
+        metadata?: Record<string, unknown>;
+    }): Promise<AgentThread>;
+    getThread(threadId: string): Promise<AgentThread>;
+    getThreads(resourceId: string): Promise<AgentThread[]>;
+    deleteThread(threadId: string): Promise<void>;
+    getMessages(threadId: string, options?: {
+        lastN?: number;
+        cursor?: string;
+    }): Promise<AgentMessage[]>;
+    saveMessages(threadId: string, messages: AgentMessage[]): Promise<void>;
+    getWorkingMemory(id: string, scope: 'resource' | 'thread'): Promise<Record<string, unknown> | null>;
+    saveWorkingMemory(id: string, scope: 'resource' | 'thread', data: Record<string, unknown>): Promise<void>;
+    createRun(run: CreateRunInput): Promise<string>;
+    updateRun(runId: string, updates: Partial<AgentRunState>): Promise<void>;
+    getRun(runId: string): Promise<AgentRunState | null>;
+    getRunsByThread(threadId: string): Promise<AgentRunState[]>;
+    private setApprovals;
+    private mapRunRow;
+    findRunByToolCallId(toolCallId: string): Promise<{
+        run: AgentRunState;
+        approval: NonNullable<AgentRunState['pendingApprovals']>[number];
+    } | null>;
+    resolveApproval(toolCallId: string, status: 'approved' | 'denied'): Promise<boolean>;
+    saveScore(score: SaveScoreInput): Promise<void>;
+    getScores(runId: string): Promise<AgentRunScore[]>;
+    close(): Promise<void>;
+}

package/dist/src/mongodb-agent-storage-service.js

@@ -0,0 +1,440 @@
+export class MongoDBAgentStorageService {
+    db;
+    initialized = false;
+    threads;
+    agentMessages;
+    toolCalls;
+    workingMemory;
+    agentRuns;
+    agentRunScores;
+    constructor(db) {
+        this.db = db;
+    }
+    async init() {
+        if (this.initialized)
+            return;
+        this.threads = this.db.collection('agent_threads');
+        this.agentMessages = this.db.collection('agent_message');
+        this.toolCalls = this.db.collection('agent_tool_call');
+        this.workingMemory = this.db.collection('agent_working_memory');
+        this.agentRuns = this.db.collection('agent_run');
+        this.agentRunScores =
+            this.db.collection('agent_run_score');
+        await this.threads.createIndex({ resourceId: 1 });
+        await this.agentMessages.createIndex({ threadId: 1, createdAt: 1 });
+        await this.toolCalls.createIndex({ threadId: 1 });
+        await this.toolCalls.createIndex({ messageId: 1 });
+        await this.workingMemory.createIndex({ id: 1, scope: 1 }, { unique: true });
+        await this.agentRuns.createIndex({ threadId: 1, createdAt: 1 });
+        await this.agentRunScores.createIndex({ runId: 1, createdAt: 1 });
+        this.initialized = true;
+    }
+    async createThread(resourceId, options) {
+        const id = options?.threadId ?? crypto.randomUUID();
+        const now = new Date();
+        await this.threads.insertOne({
+            _id: id,
+            resourceId,
+            title: options?.title ?? null,
+            metadata: options?.metadata ?? null,
+            createdAt: now,
+            updatedAt: now,
+        });
+        return {
+            id,
+            resourceId,
+            title: options?.title,
+            metadata: options?.metadata,
+            createdAt: now,
+            updatedAt: now,
+        };
+    }
+    async getThread(threadId) {
+        const row = await this.threads.findOne({ _id: threadId });
+        if (!row) {
+            throw new Error(`Thread not found: ${threadId}`);
+        }
+        return {
+            id: row._id,
+            resourceId: row.resourceId,
+            title: row.title ?? undefined,
+            metadata: row.metadata ?? undefined,
+            createdAt: new Date(row.createdAt),
+            updatedAt: new Date(row.updatedAt),
+        };
+    }
+    async getThreads(resourceId) {
+        const result = await this.threads
+            .find({ resourceId })
+            .sort({ updatedAt: -1 })
+            .toArray();
+        return result.map((row) => ({
+            id: row._id,
+            resourceId: row.resourceId,
+            title: row.title ?? undefined,
+            metadata: row.metadata ?? undefined,
+            createdAt: new Date(row.createdAt),
+            updatedAt: new Date(row.updatedAt),
+        }));
+    }
+    async deleteThread(threadId) {
+        await this.toolCalls.deleteMany({ threadId });
+        await this.agentMessages.deleteMany({ threadId });
+        await this.agentRuns.deleteMany({ threadId });
+        await this.threads.deleteOne({ _id: threadId });
+    }
+    async getMessages(threadId, options) {
+        let filter = { threadId };
+        if (options?.cursor) {
+            const cursorRow = await this.agentMessages.findOne({
+                _id: options.cursor,
+            });
+            if (cursorRow) {
+                filter.createdAt = { $lt: cursorRow.createdAt };
+            }
+        }
+        let msgResult;
+        if (options?.cursor || options?.lastN) {
+            const innerResult = await this.agentMessages
+                .find(filter)
+                .sort({ createdAt: -1 })
+                .limit(options?.lastN ?? 50)
+                .toArray();
+            innerResult.reverse();
+            msgResult = innerResult;
+        }
+        else {
+            msgResult = await this.agentMessages
+                .find(filter)
+                .sort({ createdAt: 1 })
+                .toArray();
+        }
+        const tcResult = await this.toolCalls
+            .find({ threadId })
+            .sort({ createdAt: 1 })
+            .toArray();
+        const tcByMessage = new Map();
+        for (const tc of tcResult) {
+            const msgId = tc.messageId;
+            if (!tcByMessage.has(msgId))
+                tcByMessage.set(msgId, []);
+            tcByMessage.get(msgId).push(tc);
+        }
+        const messages = [];
+        for (const row of msgResult) {
+            let parsedContent = row.content ?? undefined;
+            if (typeof row.content === 'string') {
+                try {
+                    const parsed = JSON.parse(row.content);
+                    if (Array.isArray(parsed)) {
+                        parsedContent = parsed;
+                    }
+                    else if (typeof parsed === 'string') {
+                        parsedContent = parsed;
+                    }
+                }
+                catch {
+                    // Not JSON, use raw string
+                }
+            }
+            const msg = {
+                id: row._id,
+                role: row.role,
+                content: parsedContent,
+                createdAt: new Date(row.createdAt),
+            };
+            const tcs = tcByMessage.get(msg.id);
+            if (tcs?.length) {
+                msg.toolCalls = tcs.map((tc) => ({
+                    id: tc._id,
+                    name: tc.toolName,
+                    args: tc.args,
+                }));
+                const completed = tcs.filter((tc) => tc.result != null);
+                if (completed.length) {
+                    messages.push(msg);
+                    messages.push({
+                        id: `tool-results-${msg.id}`,
+                        role: 'tool',
+                        toolResults: completed.map((tc) => ({
+                            id: tc._id,
+                            name: tc.toolName,
+                            result: tc.result,
+                        })),
+                        createdAt: msg.createdAt,
+                    });
+                    continue;
+                }
+            }
+            messages.push(msg);
+        }
+        return messages;
+    }
+    async saveMessages(threadId, messages) {
+        if (messages.length === 0)
+            return;
+        const toolMessages = messages.filter((m) => m.role === 'tool');
+        const nonToolMessages = messages.filter((m) => m.role !== 'tool');
+        if (nonToolMessages.length > 0) {
+            await this.agentMessages.insertMany(nonToolMessages.map((msg) => ({
+                _id: msg.id,
+                threadId,
+                role: msg.role,
+                content: msg.content != null ? JSON.stringify(msg.content) : null,
+                createdAt: msg.createdAt ?? new Date(),
+            })));
+        }
+        const toolCallDocs = nonToolMessages.flatMap((msg) => msg.toolCalls?.map((tc) => ({ ...tc, messageId: msg.id })) ?? []);
+        if (toolCallDocs.length > 0) {
+            await this.toolCalls.insertMany(toolCallDocs.map((tc) => ({
+                _id: tc.id,
+                threadId,
+                messageId: tc.messageId,
+                runId: null,
+                toolName: tc.name,
+                args: tc.args,
+                result: null,
+                approvalStatus: null,
+                approvalType: null,
+                agentRunId: null,
+                displayToolName: null,
+                displayArgs: null,
+                createdAt: new Date(),
+            })));
+        }
+        for (const toolMsg of toolMessages) {
+            if (!toolMsg.toolResults)
+                continue;
+            for (const tr of toolMsg.toolResults) {
+                await this.toolCalls.updateOne({ _id: tr.id }, { $set: { result: tr.result } });
+            }
+        }
+        await this.threads.updateOne({ _id: threadId }, { $set: { updatedAt: new Date() } });
+    }
+    async getWorkingMemory(id, scope) {
+        const row = await this.workingMemory.findOne({ id, scope });
+        if (!row)
+            return null;
+        return row.data;
+    }
+    async saveWorkingMemory(id, scope, data) {
+        await this.workingMemory.updateOne({ id, scope }, {
+            $set: {
+                data,
+                updatedAt: new Date(),
+            },
+            $setOnInsert: {
+                id,
+                scope,
+            },
+        }, { upsert: true });
+    }
+    async createRun(run) {
+        const runId = crypto.randomUUID();
+        await this.agentRuns.insertOne({
+            _id: runId,
+            agentName: run.agentName,
+            threadId: run.threadId,
+            resourceId: run.resourceId,
+            status: run.status,
+            errorMessage: run.errorMessage ?? null,
+            suspendReason: run.suspendReason ?? null,
+            missingRpcs: run.missingRpcs ?? null,
+            usageInputTokens: run.usage.inputTokens,
+            usageOutputTokens: run.usage.outputTokens,
+            usageModel: run.usage.model,
+            createdAt: run.createdAt,
+            updatedAt: run.updatedAt,
+        });
+        if (run.pendingApprovals?.length) {
+            await this.setApprovals(runId, run.pendingApprovals);
+        }
+        return runId;
+    }
+    async updateRun(runId, updates) {
+        const setValues = { updatedAt: new Date() };
+        if (updates.status !== undefined) {
+            setValues.status = updates.status;
+        }
+        if (updates.errorMessage !== undefined) {
+            setValues.errorMessage = updates.errorMessage;
+        }
+        if (updates.suspendReason !== undefined) {
+            setValues.suspendReason = updates.suspendReason;
+        }
+        if (updates.missingRpcs !== undefined) {
+            setValues.missingRpcs = updates.missingRpcs;
+        }
+        if (updates.usage !== undefined) {
+            setValues.usageInputTokens = updates.usage.inputTokens;
+            setValues.usageOutputTokens = updates.usage.outputTokens;
+            setValues.usageModel = updates.usage.model;
+        }
+        await this.agentRuns.updateOne({ _id: runId }, { $set: setValues });
+        if (updates.pendingApprovals !== undefined) {
+            await this.toolCalls.updateMany({ runId, approvalStatus: { $ne: null } }, {
+                $set: {
+                    approvalStatus: null,
+                    runId: null,
+                    approvalType: null,
+                    agentRunId: null,
+                    displayToolName: null,
+                    displayArgs: null,
+                },
+            });
+            if (updates.pendingApprovals.length) {
+                await this.setApprovals(runId, updates.pendingApprovals);
+            }
+        }
+    }
+    async getRun(runId) {
+        const row = await this.agentRuns.findOne({ _id: runId });
+        if (!row)
+            return null;
+        const approvals = await this.toolCalls
+            .find({ runId, approvalStatus: 'pending' })
+            .toArray();
+        return this.mapRunRow(row, approvals);
+    }
+    async getRunsByThread(threadId) {
+        const result = await this.agentRuns
+            .find({ threadId })
+            .sort({ createdAt: -1 })
+            .toArray();
+        const runs = [];
+        for (const row of result) {
+            const approvals = await this.toolCalls
+                .find({ runId: row._id, approvalStatus: 'pending' })
+                .toArray();
+            runs.push(this.mapRunRow(row, approvals));
+        }
+        return runs;
+    }
+    async setApprovals(runId, approvals) {
+        for (const a of approvals) {
+            if (a.type === 'agent-call') {
+                await this.toolCalls.updateOne({ _id: a.toolCallId }, {
+                    $set: {
+                        approvalStatus: 'pending',
+                        runId,
+                        approvalType: 'agent-call',
+                        agentRunId: a.agentRunId,
+                        displayToolName: a.displayToolName,
+                        displayArgs: a.displayArgs,
+                    },
+                });
+            }
+            else {
+                await this.toolCalls.updateOne({ _id: a.toolCallId }, {
+                    $set: {
+                        approvalStatus: 'pending',
+                        runId,
+                        approvalType: 'tool-call',
+                    },
+                });
+            }
+        }
+    }
+    mapRunRow(row, approvalRows) {
+        const pendingApprovals = approvalRows?.length
+            ? approvalRows.map((a) => {
+                if (a.approvalType === 'agent-call') {
+                    return {
+                        type: 'agent-call',
+                        toolCallId: a._id,
+                        agentName: a.toolName,
+                        agentRunId: a.agentRunId,
+                        displayToolName: a.displayToolName,
+                        displayArgs: a.displayArgs,
+                    };
+                }
+                return {
+                    type: 'tool-call',
+                    toolCallId: a._id,
+                    toolName: a.toolName,
+                    args: a.args,
+                };
+            })
+            : undefined;
+        return {
+            runId: row._id,
+            agentName: row.agentName,
+            threadId: row.threadId,
+            resourceId: row.resourceId,
+            status: row.status,
+            errorMessage: row.errorMessage ?? undefined,
+            suspendReason: row.suspendReason,
+            missingRpcs: row.missingRpcs ?? undefined,
+            pendingApprovals,
+            usage: {
+                inputTokens: Number(row.usageInputTokens),
+                outputTokens: Number(row.usageOutputTokens),
+                model: row.usageModel,
+            },
+            createdAt: new Date(row.createdAt),
+            updatedAt: new Date(row.updatedAt),
+        };
+    }
+    async findRunByToolCallId(toolCallId) {
+        const tc = await this.toolCalls.findOne({
+            _id: toolCallId,
+            approvalStatus: 'pending',
+        });
+        if (!tc || !tc.runId)
+            return null;
+        const run = await this.getRun(tc.runId);
+        if (!run)
+            return null;
+        let approval;
+        if (tc.approvalType === 'agent-call') {
+            approval = {
+                type: 'agent-call',
+                toolCallId: tc._id,
+                agentName: tc.toolName,
+                agentRunId: tc.agentRunId,
+                displayToolName: tc.displayToolName,
+                displayArgs: tc.displayArgs,
+            };
+        }
+        else {
+            approval = {
+                type: 'tool-call',
+                toolCallId: tc._id,
+                toolName: tc.toolName,
+                args: tc.args,
+            };
+        }
+        return { run, approval };
+    }
+    async resolveApproval(toolCallId, status) {
+        // Only the caller that moves the tool call off 'pending' has claimed it.
+        const result = await this.toolCalls.updateOne({ _id: toolCallId, approvalStatus: 'pending' }, { $set: { approvalStatus: status } });
+        return result.modifiedCount > 0;
+    }
+    async saveScore(score) {
+        await this.agentRunScores.insertOne({
+            _id: crypto.randomUUID(),
+            runId: score.runId,
+            scorerName: score.scorerName,
+            score: score.score,
+            reason: score.reason ?? null,
+            metadata: score.metadata ?? null,
+            createdAt: new Date(),
+        });
+    }
+    async getScores(runId) {
+        const rows = await this.agentRunScores
+            .find({ runId })
+            .sort({ createdAt: 1 })
+            .toArray();
+        return rows.map((row) => ({
+            runId: row.runId,
+            scorerName: row.scorerName,
+            score: row.score,
+            reason: row.reason ?? undefined,
+            metadata: row.metadata ?? undefined,
+            createdAt: row.createdAt,
+        }));
+    }
+    async close() { }
+}

package/dist/src/mongodb-deployment-service.d.ts

@@ -1,4 +1,4 @@
-import type { DeploymentService, DeploymentServiceConfig, DeploymentConfig } from '@pikku/core/services';
+import type { DeploymentService, DeploymentServiceConfig, DeploymentConfig } from '@pikku/core/ecosystem/services';
 import type { JWTService, SecretService } from '@pikku/core/services';
 import type { Db } from 'mongodb';
 export declare class MongoDBDeploymentService implements DeploymentService {

package/dist/src/mongodb-deployment-service.js

@@ -1,5 +1,5 @@
-import { buildRemoteHeaders } from '@pikku/core/remote';
-import { getAllFunctionNames } from '@pikku/core/function';
+import { buildRemoteHeaders } from '@pikku/core/ecosystem/remote';
+import { getAllFunctionNames } from '@pikku/core/ecosystem/function';
 export class MongoDBDeploymentService {
     db;
     jwt;

package/dist/src/mongodb-eventhub-store.d.ts

@@ -1,4 +1,4 @@
-import { EventHubStore } from '@pikku/core/channel';
+import { EventHubStore } from '@pikku/core/ecosystem/channel';
 import type { Db } from 'mongodb';
 export declare class MongoDBEventHubStore extends EventHubStore {
     private db;

package/dist/src/mongodb-eventhub-store.js

@@ -1,4 +1,4 @@
-import { EventHubStore } from '@pikku/core/channel';
+import { EventHubStore } from '@pikku/core/ecosystem/channel';
 export class MongoDBEventHubStore extends EventHubStore {
     db;
     initialized = false;

package/dist/src/mongodb-workflow-run-service.d.ts

@@ -1,4 +1,4 @@
-import type { WorkflowRun, StepState, WorkflowRunService } from '@pikku/core/workflow';
+import type { WorkflowRun, StepState, WorkflowRunService } from '@pikku/core/ecosystem/workflow';
 import type { Db } from 'mongodb';
 export declare class MongoDBWorkflowRunService implements WorkflowRunService {
     private runs;

package/dist/src/mongodb-workflow-service.d.ts

@@ -1,5 +1,6 @@
-import type { SerializedError } from '@pikku/core';
-import { PikkuWorkflowService, type WorkflowPlannedStep, type WorkflowQueueOptions, type WorkflowRun, type WorkflowRunWire, type StepState, type StepStatus, type WorkflowStatus, type WorkflowVersionStatus } from '@pikku/core/workflow';
+import type { SerializedError } from '@pikku/core/ecosystem/types';
+import { PikkuWorkflowService } from '@pikku/core/workflow';
+import type { WorkflowPlannedStep, WorkflowQueueOptions, WorkflowRun, WorkflowRunWire, StepState, StepStatus, WorkflowStatus, WorkflowVersionStatus } from '@pikku/core/ecosystem/workflow';
 import type { Db } from 'mongodb';
 export declare class MongoDBWorkflowService extends PikkuWorkflowService {
     private initialized;

package/dist/src/mongodb-workflow-service.js

@@ -1,4 +1,4 @@
-import { PikkuWorkflowService, } from '@pikku/core/workflow';
+import { PikkuWorkflowService } from '@pikku/core/workflow';
 import { MongoDBWorkflowRunService } from './mongodb-workflow-run-service.js';
 export class MongoDBWorkflowService extends PikkuWorkflowService {
     initialized = false;

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/mongodb-agent-run-service.ts","../src/mongodb-ai-storage-service.ts","../src/mongodb-channel-store.ts","../src/mongodb-deployment-service.ts","../src/mongodb-eventhub-store.ts","../src/mongodb-secret-service.ts","../src/mongodb-session-store.ts","../src/mongodb-workflow-run-service.ts","../src/mongodb-workflow-service.ts","../src/pikku-mongodb.ts"],"version":"6.0.3"}
+{"root":["../src/index.ts","../src/mongodb-agent-run-service.ts","../src/mongodb-agent-storage-service.ts","../src/mongodb-channel-store.ts","../src/mongodb-deployment-service.ts","../src/mongodb-eventhub-store.ts","../src/mongodb-secret-service.ts","../src/mongodb-session-store.ts","../src/mongodb-workflow-run-service.ts","../src/mongodb-workflow-service.ts","../src/pikku-mongodb.ts"],"version":"6.0.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/mongodb",
-  "version": "0.12.17",
+  "version": "0.12.18",
   "description": "MongoDB services for Pikku — workflow state, agent runs, secrets and channel stores",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "prepublishOnly": "yarn build"
   },
   "peerDependencies": {
-    "@pikku/core": "^0.12.82"
+    "@pikku/core": "^0.12.84"
   },
   "dependencies": {
     "mongodb": "^6.12.0"

package/src/index.ts

@@ -5,10 +5,13 @@ export { MongoDBEventHubStore } from './mongodb-eventhub-store.js'
 export { MongoDBWorkflowService } from './mongodb-workflow-service.js'
 export { MongoDBWorkflowRunService } from './mongodb-workflow-run-service.js'
 export { MongoDBDeploymentService } from './mongodb-deployment-service.js'
-export { MongoDBAIStorageService } from './mongodb-ai-storage-service.js'
+export { MongoDBAgentStorageService } from './mongodb-agent-storage-service.js'
 export { MongoDBAgentRunService } from './mongodb-agent-run-service.js'
 export { MongoDBSecretService } from './mongodb-secret-service.js'
 
-export type { WorkflowRunService } from '@pikku/core/workflow'
-export type { AgentRunService, AgentRunRow } from '@pikku/core/ai-agent'
+export type { WorkflowRunService } from '@pikku/core/ecosystem/workflow'
+export type {
+  AgentRunService,
+  AgentRunRow,
+} from '@pikku/core/ecosystem/agent'
 export { MongoDBSessionStore } from './mongodb-session-store.js'

package/src/mongodb-agent-run-service.ts

@@ -1,9 +1,8 @@
+import type { AgentThread, AgentMessage } from '@pikku/core/agent'
 import type {
-  AIThread,
-  AIMessage,
   AgentRunRow,
   AgentRunService,
-} from '@pikku/core/ai-agent'
+} from '@pikku/core/ecosystem/agent'
 import type { Db, Collection } from 'mongodb'
 
 // Owner ids are untrusted input to the regex, so metacharacters must not be
@@ -11,7 +10,7 @@ import type { Db, Collection } from 'mongodb'
 const escapeRegExp = (value: string) =>
   value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 
-interface AIThreadDoc {
+interface AgentThreadDoc {
   _id: string
   resourceId: string
   title: string | null
@@ -20,7 +19,7 @@ interface AIThreadDoc {
   updatedAt: Date
 }
 
-interface AIMessageDoc {
+interface AgentMessageDoc {
   _id: string
   threadId: string
   role: string
@@ -28,7 +27,7 @@ interface AIMessageDoc {
   createdAt: Date
 }
 
-interface AIToolCallDoc {
+interface AgentToolCallDoc {
   _id: string
   threadId: string
   messageId: string
@@ -44,7 +43,7 @@ interface AIToolCallDoc {
   createdAt: Date
 }
 
-interface AIRunDoc {
+interface AgentRunDoc {
   _id: string
   agentName: string
   threadId: string
@@ -61,16 +60,16 @@ interface AIRunDoc {
 }
 
 export class MongoDBAgentRunService implements AgentRunService {
-  private threads: Collection<AIThreadDoc>
-  private messages: Collection<AIMessageDoc>
-  private toolCalls: Collection<AIToolCallDoc>
-  private runs: Collection<AIRunDoc>
+  private threads: Collection<AgentThreadDoc>
+  private messages: Collection<AgentMessageDoc>
+  private toolCalls: Collection<AgentToolCallDoc>
+  private runs: Collection<AgentRunDoc>
 
   constructor(db: Db) {
-    this.threads = db.collection<AIThreadDoc>('ai_threads')
-    this.messages = db.collection<AIMessageDoc>('ai_message')
-    this.toolCalls = db.collection<AIToolCallDoc>('ai_tool_call')
-    this.runs = db.collection<AIRunDoc>('ai_run')
+    this.threads = db.collection<AgentThreadDoc>('agent_threads')
+    this.messages = db.collection<AgentMessageDoc>('agent_message')
+    this.toolCalls = db.collection<AgentToolCallDoc>('agent_tool_call')
+    this.runs = db.collection<AgentRunDoc>('agent_run')
   }
 
   async listThreads(options?: {
@@ -79,7 +78,7 @@ export class MongoDBAgentRunService implements AgentRunService {
     owners?: string[]
     limit?: number
     offset?: number
-  }): Promise<AIThread[]> {
+  }): Promise<AgentThread[]> {
     const {
       agentName,
       resourceId,
@@ -122,13 +121,13 @@ export class MongoDBAgentRunService implements AgentRunService {
     return result.map((row) => this.mapThreadRow(row))
   }
 
-  async getThread(threadId: string): Promise<AIThread | null> {
+  async getThread(threadId: string): Promise<AgentThread | null> {
     const row = await this.threads.findOne({ _id: threadId })
     if (!row) return null
     return this.mapThreadRow(row)
   }
 
-  async getThreadMessages(threadId: string): Promise<AIMessage[]> {
+  async getThreadMessages(threadId: string): Promise<AgentMessage[]> {
     const [msgResult, tcResult] = await Promise.all([
       this.messages.find({ threadId }).sort({ createdAt: 1 }).toArray(),
       this.toolCalls.find({ threadId }).sort({ createdAt: 1 }).toArray(),
@@ -141,11 +140,11 @@ export class MongoDBAgentRunService implements AgentRunService {
       tcByMessage.get(msgId)!.push(tc)
     }
 
-    const messages: AIMessage[] = []
+    const messages: AgentMessage[] = []
     for (const row of msgResult) {
-      const msg: AIMessage = {
+      const msg: AgentMessage = {
         id: row._id,
-        role: row.role as AIMessage['role'],
+        role: row.role as AgentMessage['role'],
         content: row.content ?? undefined,
         createdAt: new Date(row.createdAt),
       }
@@ -203,7 +202,7 @@ export class MongoDBAgentRunService implements AgentRunService {
     return result.sort()
   }
 
-  private mapThreadRow(row: AIThreadDoc): AIThread {
+  private mapThreadRow(row: AgentThreadDoc): AgentThread {
     return {
       id: row._id,
       resourceId: row.resourceId,
@@ -214,7 +213,7 @@ export class MongoDBAgentRunService implements AgentRunService {
     }
   }
 
-  private mapRunRow(row: AIRunDoc): AgentRunRow {
+  private mapRunRow(row: AgentRunDoc): AgentRunRow {
     return {
       runId: row._id,
       agentName: row.agentName,

package/src/{mongodb-ai-storage-service.ts → mongodb-agent-storage-service.ts}

@@ -1,14 +1,18 @@
 import type {
-  AIStorageService,
-  AIRunStateService,
+  AgentStorageService,
+  AgentRunStateService,
   CreateRunInput,
   SaveScoreInput,
 } from '@pikku/core/services'
-import type { AIThread, AIMessage, AgentRunState } from '@pikku/core/ai-agent'
-import type { AIRunScore } from '@pikku/core/ai-scorer'
+import type {
+  AgentThread,
+  AgentMessage,
+  AgentRunState,
+} from '@pikku/core/agent'
+import type { AgentRunScore } from '@pikku/core/agent-scorer'
 import type { Db, Collection } from 'mongodb'
 
-interface AIThreadDoc {
+interface AgentThreadDoc {
   _id: string
   resourceId: string
   title: string | null
@@ -17,7 +21,7 @@ interface AIThreadDoc {
   updatedAt: Date
 }
 
-interface AIMessageDoc {
+interface AgentMessageDoc {
   _id: string
   threadId: string
   role: string
@@ -25,7 +29,7 @@ interface AIMessageDoc {
   createdAt: Date
 }
 
-interface AIToolCallDoc {
+interface AgentToolCallDoc {
   _id: string
   threadId: string
   messageId: string
@@ -41,14 +45,14 @@ interface AIToolCallDoc {
   createdAt: Date
 }
 
-interface AIWorkingMemoryDoc {
+interface AgentWorkingMemoryDoc {
   id: string
   scope: string
   data: any
   updatedAt: Date
 }
 
-interface AIRunScoreDoc {
+interface AgentRunScoreDoc {
   _id: string
   runId: string
   scorerName: string
@@ -58,7 +62,7 @@ interface AIRunScoreDoc {
   createdAt: Date
 }
 
-interface AIRunDoc {
+interface AgentRunDoc {
   _id: string
   agentName: string
   threadId: string
@@ -74,42 +78,44 @@ interface AIRunDoc {
   updatedAt: Date
 }
 
-export class MongoDBAIStorageService
-  implements AIStorageService, AIRunStateService
+export class MongoDBAgentStorageService
+  implements AgentStorageService, AgentRunStateService
 {
   private initialized = false
-  private threads!: Collection<AIThreadDoc>
-  private aiMessages!: Collection<AIMessageDoc>
-  private toolCalls!: Collection<AIToolCallDoc>
-  private workingMemory!: Collection<AIWorkingMemoryDoc>
-  private aiRuns!: Collection<AIRunDoc>
-  private aiRunScores!: Collection<AIRunScoreDoc>
+  private threads!: Collection<AgentThreadDoc>
+  private agentMessages!: Collection<AgentMessageDoc>
+  private toolCalls!: Collection<AgentToolCallDoc>
+  private workingMemory!: Collection<AgentWorkingMemoryDoc>
+  private agentRuns!: Collection<AgentRunDoc>
+  private agentRunScores!: Collection<AgentRunScoreDoc>
 
   constructor(private db: Db) {}
 
   public async init(): Promise<void> {
     if (this.initialized) return
 
-    this.threads = this.db.collection<AIThreadDoc>('ai_threads')
-    this.aiMessages = this.db.collection<AIMessageDoc>('ai_message')
-    this.toolCalls = this.db.collection<AIToolCallDoc>('ai_tool_call')
-    this.workingMemory =
-      this.db.collection<AIWorkingMemoryDoc>('ai_working_memory')
-    this.aiRuns = this.db.collection<AIRunDoc>('ai_run')
-    this.aiRunScores = this.db.collection<AIRunScoreDoc>('ai_run_score')
+    this.threads = this.db.collection<AgentThreadDoc>('agent_threads')
+    this.agentMessages = this.db.collection<AgentMessageDoc>('agent_message')
+    this.toolCalls = this.db.collection<AgentToolCallDoc>('agent_tool_call')
+    this.workingMemory = this.db.collection<AgentWorkingMemoryDoc>(
+      'agent_working_memory'
+    )
+    this.agentRuns = this.db.collection<AgentRunDoc>('agent_run')
+    this.agentRunScores =
+      this.db.collection<AgentRunScoreDoc>('agent_run_score')
 
     await this.threads.createIndex({ resourceId: 1 })
 
-    await this.aiMessages.createIndex({ threadId: 1, createdAt: 1 })
+    await this.agentMessages.createIndex({ threadId: 1, createdAt: 1 })
 
     await this.toolCalls.createIndex({ threadId: 1 })
     await this.toolCalls.createIndex({ messageId: 1 })
 
     await this.workingMemory.createIndex({ id: 1, scope: 1 }, { unique: true })
 
-    await this.aiRuns.createIndex({ threadId: 1, createdAt: 1 })
+    await this.agentRuns.createIndex({ threadId: 1, createdAt: 1 })
 
-    await this.aiRunScores.createIndex({ runId: 1, createdAt: 1 })
+    await this.agentRunScores.createIndex({ runId: 1, createdAt: 1 })
 
     this.initialized = true
   }
@@ -121,7 +127,7 @@ export class MongoDBAIStorageService
       title?: string
       metadata?: Record<string, unknown>
     }
-  ): Promise<AIThread> {
+  ): Promise<AgentThread> {
     const id = options?.threadId ?? crypto.randomUUID()
     const now = new Date()
 
@@ -144,7 +150,7 @@ export class MongoDBAIStorageService
     }
   }
 
-  async getThread(threadId: string): Promise<AIThread> {
+  async getThread(threadId: string): Promise<AgentThread> {
     const row = await this.threads.findOne({ _id: threadId })
 
     if (!row) {
@@ -161,7 +167,7 @@ export class MongoDBAIStorageService
     }
   }
 
-  async getThreads(resourceId: string): Promise<AIThread[]> {
+  async getThreads(resourceId: string): Promise<AgentThread[]> {
     const result = await this.threads
       .find({ resourceId })
       .sort({ updatedAt: -1 })
@@ -179,19 +185,21 @@ export class MongoDBAIStorageService
 
   async deleteThread(threadId: string): Promise<void> {
     await this.toolCalls.deleteMany({ threadId })
-    await this.aiMessages.deleteMany({ threadId })
-    await this.aiRuns.deleteMany({ threadId })
+    await this.agentMessages.deleteMany({ threadId })
+    await this.agentRuns.deleteMany({ threadId })
     await this.threads.deleteOne({ _id: threadId })
   }
 
   async getMessages(
     threadId: string,
     options?: { lastN?: number; cursor?: string }
-  ): Promise<AIMessage[]> {
+  ): Promise<AgentMessage[]> {
     let filter: Record<string, any> = { threadId }
 
     if (options?.cursor) {
-      const cursorRow = await this.aiMessages.findOne({ _id: options.cursor })
+      const cursorRow = await this.agentMessages.findOne({
+        _id: options.cursor,
+      })
       if (cursorRow) {
         filter.createdAt = { $lt: cursorRow.createdAt }
       }
@@ -199,7 +207,7 @@ export class MongoDBAIStorageService
 
     let msgResult
     if (options?.cursor || options?.lastN) {
-      const innerResult = await this.aiMessages
+      const innerResult = await this.agentMessages
         .find(filter)
         .sort({ createdAt: -1 })
         .limit(options?.lastN ?? 50)
@@ -207,7 +215,7 @@ export class MongoDBAIStorageService
       innerResult.reverse()
       msgResult = innerResult
     } else {
-      msgResult = await this.aiMessages
+      msgResult = await this.agentMessages
         .find(filter)
         .sort({ createdAt: 1 })
         .toArray()
@@ -225,9 +233,9 @@ export class MongoDBAIStorageService
       tcByMessage.get(msgId)!.push(tc)
     }
 
-    const messages: AIMessage[] = []
+    const messages: AgentMessage[] = []
     for (const row of msgResult) {
-      let parsedContent: AIMessage['content'] = row.content ?? undefined
+      let parsedContent: AgentMessage['content'] = row.content ?? undefined
       if (typeof row.content === 'string') {
         try {
           const parsed = JSON.parse(row.content)
@@ -241,9 +249,9 @@ export class MongoDBAIStorageService
         }
       }
 
-      const msg: AIMessage = {
+      const msg: AgentMessage = {
         id: row._id,
-        role: row.role as AIMessage['role'],
+        role: row.role as AgentMessage['role'],
         content: parsedContent,
         createdAt: new Date(row.createdAt),
       }
@@ -279,14 +287,17 @@ export class MongoDBAIStorageService
     return messages
   }
 
-  async saveMessages(threadId: string, messages: AIMessage[]): Promise<void> {
+  async saveMessages(
+    threadId: string,
+    messages: AgentMessage[]
+  ): Promise<void> {
     if (messages.length === 0) return
 
     const toolMessages = messages.filter((m) => m.role === 'tool')
     const nonToolMessages = messages.filter((m) => m.role !== 'tool')
 
     if (nonToolMessages.length > 0) {
-      await this.aiMessages.insertMany(
+      await this.agentMessages.insertMany(
         nonToolMessages.map((msg) => ({
           _id: msg.id,
           threadId,
@@ -369,7 +380,7 @@ export class MongoDBAIStorageService
   async createRun(run: CreateRunInput): Promise<string> {
     const runId = crypto.randomUUID()
 
-    await this.aiRuns.insertOne({
+    await this.agentRuns.insertOne({
       _id: runId,
       agentName: run.agentName,
       threadId: run.threadId,
@@ -416,7 +427,7 @@ export class MongoDBAIStorageService
       setValues.usageModel = updates.usage.model
     }
 
-    await this.aiRuns.updateOne({ _id: runId }, { $set: setValues })
+    await this.agentRuns.updateOne({ _id: runId }, { $set: setValues })
 
     if (updates.pendingApprovals !== undefined) {
       await this.toolCalls.updateMany(
@@ -440,7 +451,7 @@ export class MongoDBAIStorageService
   }
 
   async getRun(runId: string): Promise<AgentRunState | null> {
-    const row = await this.aiRuns.findOne({ _id: runId })
+    const row = await this.agentRuns.findOne({ _id: runId })
     if (!row) return null
 
     const approvals = await this.toolCalls
@@ -451,7 +462,7 @@ export class MongoDBAIStorageService
   }
 
   async getRunsByThread(threadId: string): Promise<AgentRunState[]> {
-    const result = await this.aiRuns
+    const result = await this.agentRuns
       .find({ threadId })
       .sort({ createdAt: -1 })
       .toArray()
@@ -591,7 +602,7 @@ export class MongoDBAIStorageService
   }
 
   async saveScore(score: SaveScoreInput): Promise<void> {
-    await this.aiRunScores.insertOne({
+    await this.agentRunScores.insertOne({
       _id: crypto.randomUUID(),
       runId: score.runId,
       scorerName: score.scorerName,
@@ -602,8 +613,8 @@ export class MongoDBAIStorageService
     })
   }
 
-  async getScores(runId: string): Promise<AIRunScore[]> {
-    const rows = await this.aiRunScores
+  async getScores(runId: string): Promise<AgentRunScore[]> {
+    const rows = await this.agentRunScores
       .find({ runId })
       .sort({ createdAt: 1 })
       .toArray()

package/src/mongodb-deployment-service.ts

@@ -1,11 +1,11 @@
-import { buildRemoteHeaders } from '@pikku/core/remote'
+import { buildRemoteHeaders } from '@pikku/core/ecosystem/remote'
 import type {
   DeploymentService,
   DeploymentServiceConfig,
   DeploymentConfig,
-} from '@pikku/core/services'
+} from '@pikku/core/ecosystem/services'
 import type { JWTService, SecretService } from '@pikku/core/services'
-import { getAllFunctionNames } from '@pikku/core/function'
+import { getAllFunctionNames } from '@pikku/core/ecosystem/function'
 import type { Db, Collection } from 'mongodb'
 
 interface DeploymentDoc {

package/src/mongodb-eventhub-store.ts

@@ -1,4 +1,4 @@
-import { EventHubStore } from '@pikku/core/channel'
+import { EventHubStore } from '@pikku/core/ecosystem/channel'
 import type { Db, Collection } from 'mongodb'
 
 interface ChannelSubscriptionDoc {

package/src/mongodb-services.test.ts

@@ -2,14 +2,14 @@ import { describe, test, before, after } from 'node:test'
 import assert from 'node:assert/strict'
 import { MongoClient, type Db } from 'mongodb'
 import { MongoMemoryServer } from 'mongodb-memory-server'
-import { defineServiceTests } from '@pikku/core/testing'
+import { defineServiceTests } from '@pikku/core/ecosystem/testing'
 
 import { MongoDBChannelStore } from './mongodb-channel-store.js'
 import { MongoDBEventHubStore } from './mongodb-eventhub-store.js'
 import { MongoDBWorkflowService } from './mongodb-workflow-service.js'
 import { MongoDBWorkflowRunService } from './mongodb-workflow-run-service.js'
 import { MongoDBDeploymentService } from './mongodb-deployment-service.js'
-import { MongoDBAIStorageService } from './mongodb-ai-storage-service.js'
+import { MongoDBAgentStorageService } from './mongodb-agent-storage-service.js'
 import { MongoDBAgentRunService } from './mongodb-agent-run-service.js'
 import { MongoDBSecretService } from './mongodb-secret-service.js'
 import { MongoDBSessionStore } from './mongodb-session-store.js'
@@ -42,8 +42,8 @@ function registerTests(name: string, getDb: () => Db) {
         await s.init()
         return s
       },
-      aiStorageService: async () => {
-        const s = new MongoDBAIStorageService(getDb())
+      agentStorageService: async () => {
+        const s = new MongoDBAgentStorageService(getDb())
         await s.init()
         return s
       },

package/src/mongodb-workflow-run-service.ts

@@ -4,7 +4,7 @@ import type {
   StepState,
   WorkflowStatus,
   WorkflowRunService,
-} from '@pikku/core/workflow'
+} from '@pikku/core/ecosystem/workflow'
 import type { Db, Collection } from 'mongodb'
 
 interface WorkflowRunDoc {

package/src/mongodb-workflow-service.ts

@@ -1,15 +1,6 @@
-import type { SerializedError } from '@pikku/core'
-import {
-  PikkuWorkflowService,
-  type WorkflowPlannedStep,
-  type WorkflowQueueOptions,
-  type WorkflowRun,
-  type WorkflowRunWire,
-  type StepState,
-  type StepStatus,
-  type WorkflowStatus,
-  type WorkflowVersionStatus,
-} from '@pikku/core/workflow'
+import type { SerializedError } from '@pikku/core/ecosystem/types'
+import { PikkuWorkflowService } from '@pikku/core/workflow'
+import type { WorkflowPlannedStep, WorkflowQueueOptions, WorkflowRun, WorkflowRunWire, StepState, StepStatus, WorkflowStatus, WorkflowVersionStatus } from '@pikku/core/ecosystem/workflow'
 import type { Db, Collection } from 'mongodb'
 import { MongoDBWorkflowRunService } from './mongodb-workflow-run-service.js'