@pikku/kysely 0.13.15 → 0.13.16

package/dist/src/kysely-webhook-service.d.ts

@@ -1,4 +1,5 @@
-import { QueueWebhookService, type SendWebhookInput, type SendWebhookResult, type WebhookAttemptResult, type WebhookDeliveryRecord, type WebhookDeliveryWithAttempts } from '@pikku/core/services';
+import { QueueWebhookService } from '@pikku/core/services';
+import { type SendWebhookInput, type SendWebhookResult, type WebhookAttemptResult, type WebhookDeliveryRecord, type WebhookDeliveryWithAttempts } from '@pikku/core/ecosystem/services';
 import type { QueueService } from '@pikku/core/queue';
 import type { Kysely } from 'kysely';
 import type { KyselyPikkuDB } from './kysely-tables.js';

package/dist/src/kysely-webhook-service.js

@@ -1,4 +1,5 @@
-import { PIKKU_OUTGOING_WEBHOOK_QUEUE_NAME, QueueWebhookService, } from '@pikku/core/services';
+import { QueueWebhookService } from '@pikku/core/services';
+import { PIKKU_OUTGOING_WEBHOOK_QUEUE_NAME, } from '@pikku/core/ecosystem/services';
 import { ensurePikkuSchema } from './schema/index.js';
 import { webhookSchema } from './schema/webhook.schema.js';
 /**

package/dist/src/kysely-workflow-mirror.d.ts

@@ -1,5 +1,5 @@
-import type { SerializedError } from '@pikku/core';
-import type { StepState, WorkflowRunMirror, WorkflowRunWire, WorkflowStatus, WorkflowPlannedStep, WorkflowVersionStatus } from '@pikku/core/workflow';
+import type { SerializedError } from '@pikku/core/ecosystem/types';
+import type { StepState, WorkflowRunMirror, WorkflowRunWire, WorkflowStatus, WorkflowPlannedStep, WorkflowVersionStatus } from '@pikku/core/ecosystem/workflow';
 import type { Kysely } from 'kysely';
 import type { KyselyPikkuDB } from './kysely-tables.js';
 /**

package/dist/src/kysely-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 { Kysely } from 'kysely';
 import type { KyselyPikkuDB } from './kysely-tables.js';
 export declare class KyselyWorkflowRunService implements WorkflowRunService {

package/dist/src/kysely-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 Kysely } from 'kysely';
 import type { KyselyPikkuDB } from './kysely-tables.js';
 export declare class KyselyWorkflowService extends PikkuWorkflowService {

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

@@ -1,4 +1,4 @@
-import { PikkuWorkflowService, } from '@pikku/core/workflow';
+import { PikkuWorkflowService } from '@pikku/core/workflow';
 import { sql } from 'kysely';
 import { KyselyWorkflowRunService } from './kysely-workflow-run-service.js';
 import { parseJson } from './kysely-json.js';

package/dist/src/schema/agent.schema.d.ts

@@ -0,0 +1,12 @@
+import type { PikkuSchema } from './pikku-schema.types.js';
+/**
+ * Threads, messages, tool calls, working memory and agent runs.
+ *
+ * `agentRun` carries `pendingApprovals` even though the two services that used to
+ * create this table disagreed about it: `KyselyAgentStorageService` omitted the
+ * column while `KyselyAgentRunStateService` declared it and read it back through
+ * casts. Whichever service happened to run first decided the shape, and on a
+ * database where the storage service won, resolving an approval failed. One
+ * declaration ends that — the column is here because live code reads it.
+ */
+export declare const agentSchema: PikkuSchema;

package/dist/src/schema/agent.schema.js

@@ -0,0 +1,102 @@
+import { sql } from 'kysely';
+/**
+ * Threads, messages, tool calls, working memory and agent runs.
+ *
+ * `agentRun` carries `pendingApprovals` even though the two services that used to
+ * create this table disagreed about it: `KyselyAgentStorageService` omitted the
+ * column while `KyselyAgentRunStateService` declared it and read it back through
+ * casts. Whichever service happened to run first decided the shape, and on a
+ * database where the storage service won, resolving an approval failed. One
+ * declaration ends that — the column is here because live code reads it.
+ */
+export const agentSchema = {
+    name: 'agent',
+    statements: [
+        (db) => db.schema
+            .createTable('agentThreads')
+            .addColumn('id', 'varchar(36)', (col) => col.primaryKey())
+            .addColumn('resourceId', 'varchar(255)', (col) => col.notNull())
+            .addColumn('title', 'text')
+            .addColumn('metadata', 'text')
+            .addColumn('createdAt', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull())
+            .addColumn('updatedAt', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull()),
+        (db) => db.schema
+            .createIndex('idx_agent_threads_resource')
+            .on('agentThreads')
+            .column('resourceId'),
+        (db) => db.schema
+            .createTable('agentMessage')
+            .addColumn('id', 'varchar(36)', (col) => col.primaryKey())
+            .addColumn('threadId', 'varchar(36)', (col) => col.notNull().references('agentThreads.id').onDelete('cascade'))
+            .addColumn('role', 'varchar(50)', (col) => col.notNull())
+            .addColumn('content', 'text')
+            .addColumn('createdAt', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull()),
+        (db) => db.schema
+            .createIndex('idx_agent_message_thread')
+            .on('agentMessage')
+            .columns(['threadId', 'createdAt']),
+        (db) => db.schema
+            .createTable('agentToolCall')
+            .addColumn('id', 'varchar(36)', (col) => col.primaryKey())
+            .addColumn('threadId', 'varchar(36)', (col) => col.notNull().references('agentThreads.id').onDelete('cascade'))
+            .addColumn('messageId', 'varchar(36)', (col) => col.notNull().references('agentMessage.id').onDelete('cascade'))
+            .addColumn('runId', 'varchar(36)')
+            .addColumn('toolName', 'varchar(255)', (col) => col.notNull())
+            .addColumn('args', 'text', (col) => col.notNull())
+            .addColumn('result', 'text')
+            .addColumn('approvalStatus', 'varchar(50)')
+            .addColumn('approvalType', 'varchar(50)')
+            .addColumn('agentRunId', 'varchar(36)')
+            .addColumn('displayToolName', 'varchar(255)')
+            .addColumn('displayArgs', 'text')
+            .addColumn('createdAt', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull()),
+        (db) => db.schema
+            .createIndex('idx_agent_tool_call_thread')
+            .on('agentToolCall')
+            .column('threadId'),
+        (db) => db.schema
+            .createIndex('idx_agent_tool_call_message')
+            .on('agentToolCall')
+            .column('messageId'),
+        (db) => db.schema
+            .createTable('agentWorkingMemory')
+            .addColumn('id', 'varchar(255)', (col) => col.notNull())
+            .addColumn('scope', 'varchar(50)', (col) => col.notNull())
+            .addColumn('data', 'text', (col) => col.notNull())
+            .addColumn('updatedAt', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull())
+            .addPrimaryKeyConstraint('agent_working_memory_pk', ['id', 'scope']),
+        (db) => db.schema
+            .createTable('agentRun')
+            .addColumn('runId', 'varchar(36)', (col) => col.primaryKey())
+            .addColumn('agentName', 'varchar(255)', (col) => col.notNull())
+            .addColumn('threadId', 'varchar(36)', (col) => col.notNull().references('agentThreads.id').onDelete('cascade'))
+            .addColumn('resourceId', 'varchar(255)', (col) => col.notNull())
+            .addColumn('status', 'varchar(50)', (col) => col.notNull().defaultTo('running'))
+            .addColumn('errorMessage', 'text')
+            .addColumn('suspendReason', 'text')
+            .addColumn('missingRpcs', 'text')
+            .addColumn('pendingApprovals', 'text')
+            .addColumn('usageInputTokens', 'integer', (col) => col.notNull().defaultTo(0))
+            .addColumn('usageOutputTokens', 'integer', (col) => col.notNull().defaultTo(0))
+            .addColumn('usageModel', 'varchar(255)', (col) => col.notNull().defaultTo(''))
+            .addColumn('createdAt', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull())
+            .addColumn('updatedAt', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull()),
+        (db) => db.schema
+            .createIndex('idx_agent_run_thread')
+            .on('agentRun')
+            .columns(['threadId', 'createdAt']),
+        (db) => db.schema
+            .createTable('agentRunScore')
+            .addColumn('id', 'varchar(36)', (col) => col.primaryKey())
+            .addColumn('runId', 'varchar(36)', (col) => col.notNull().references('agentRun.runId').onDelete('cascade'))
+            .addColumn('scorerName', 'varchar(255)', (col) => col.notNull())
+            .addColumn('score', 'real', (col) => col.notNull())
+            .addColumn('reason', 'text')
+            .addColumn('metadata', 'text')
+            .addColumn('createdAt', 'timestamp', (col) => col.defaultTo(sql `CURRENT_TIMESTAMP`).notNull()),
+        (db) => db.schema
+            .createIndex('idx_agent_run_score_run')
+            .on('agentRunScore')
+            .columns(['runId', 'createdAt']),
+    ],
+};

package/dist/src/schema/index.js

@@ -1,6 +1,6 @@
 import { CamelCasePlugin } from 'kysely';
 import { schemaContext, } from './pikku-schema.types.js';
-import { aiSchema } from './ai.schema.js';
+import { agentSchema } from './agent.schema.js';
 import { channelSchema } from './channel.schema.js';
 import { credentialSchema } from './credential.schema.js';
 import { deploymentSchema } from './deployment.schema.js';
@@ -31,7 +31,7 @@ export const pikkuSchemas = [
     deploymentSchema,
     webhookSchema,
     workflowSchema,
-    aiSchema,
+    agentSchema,
     scopeSchema,
 ];
 /**
@@ -39,8 +39,8 @@ export const pikkuSchemas = [
  *
  * The plugin is applied here rather than trusted to the caller. Declarations
  * name tables and columns the way the rest of the codebase queries them
- * (`aiThreads.resourceId`), and it is `CamelCasePlugin` that turns those into
- * the physical `ai_threads.resource_id`. Without it the same declaration
+ * (`agentThreads.resourceId`), and it is `CamelCasePlugin` that turns those into
+ * the physical `agent_threads.resource_id`. Without it the same declaration
  * silently creates quoted camelCase tables that nothing can read.
  */
 const bind = (db) => db.withPlugin(new CamelCasePlugin());

package/dist/src/serialize-plugin.d.ts

@@ -69,7 +69,3 @@ export declare class SerializePlugin extends BaseSerializePlugin {
      */
     constructor(options?: SerializePluginOptions);
 }
-/**
- * @deprecated use {@link SerializePlugin} instead
- */
-export declare const SqliteSerializePlugin: typeof SerializePlugin;

package/dist/src/serialize-plugin.js

@@ -171,7 +171,3 @@ export class SerializePlugin extends BaseSerializePlugin {
         super(serializer, deserializer, skipNodeKind);
     }
 }
-/**
- * @deprecated use {@link SerializePlugin} instead
- */
-export const SqliteSerializePlugin = SerializePlugin;

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/create-audited-kysely.ts","../src/index.ts","../src/kysely-ai-agent-run-service.ts","../src/kysely-ai-run-scores.ts","../src/kysely-ai-run-state-service.ts","../src/kysely-ai-storage-service.ts","../src/kysely-audit-service.ts","../src/kysely-channel-store.ts","../src/kysely-credential-service.ts","../src/kysely-deployment-service.ts","../src/kysely-eventhub-store.ts","../src/kysely-json.ts","../src/kysely-scope-service.ts","../src/kysely-secret-service.ts","../src/kysely-session-store.ts","../src/kysely-tables.ts","../src/kysely-virtual-user-run-store.ts","../src/kysely-webhook-service.ts","../src/kysely-workflow-mirror.ts","../src/kysely-workflow-run-service.ts","../src/kysely-workflow-service.ts","../src/serialize-plugin.ts","../src/schema/ai.schema.ts","../src/schema/audit.schema.ts","../src/schema/channel.schema.ts","../src/schema/credential.schema.ts","../src/schema/deployment.schema.ts","../src/schema/index.ts","../src/schema/pikku-schema.types.ts","../src/schema/scope.schema.ts","../src/schema/secret.schema.ts","../src/schema/session.schema.ts","../src/schema/virtual-user.schema.ts","../src/schema/webhook.schema.ts","../src/schema/workflow.schema.ts","../bin/pikku-kysely-pure.ts"],"version":"6.0.3"}
+{"root":["../src/create-audited-kysely.ts","../src/index.ts","../src/kysely-agent-run-scores.ts","../src/kysely-agent-run-service.ts","../src/kysely-agent-run-state-service.ts","../src/kysely-agent-storage-service.ts","../src/kysely-audit-service.ts","../src/kysely-channel-store.ts","../src/kysely-credential-service.ts","../src/kysely-deployment-service.ts","../src/kysely-eventhub-store.ts","../src/kysely-json.ts","../src/kysely-scope-service.ts","../src/kysely-secret-service.ts","../src/kysely-session-store.ts","../src/kysely-tables.ts","../src/kysely-virtual-user-run-store.ts","../src/kysely-webhook-service.ts","../src/kysely-workflow-mirror.ts","../src/kysely-workflow-run-service.ts","../src/kysely-workflow-service.ts","../src/serialize-plugin.ts","../src/schema/agent.schema.ts","../src/schema/audit.schema.ts","../src/schema/channel.schema.ts","../src/schema/credential.schema.ts","../src/schema/deployment.schema.ts","../src/schema/index.ts","../src/schema/pikku-schema.types.ts","../src/schema/scope.schema.ts","../src/schema/secret.schema.ts","../src/schema/session.schema.ts","../src/schema/virtual-user.schema.ts","../src/schema/webhook.schema.ts","../src/schema/workflow.schema.ts","../bin/pikku-kysely-pure.ts"],"version":"6.0.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/kysely",
-  "version": "0.13.15",
+  "version": "0.13.16",
   "description": "Kysely-backed Pikku services — workflow state, secrets, sessions, scopes and audit",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "prepublishOnly": "yarn build"
   },
   "peerDependencies": {
-    "@pikku/core": "^0.12.82"
+    "@pikku/core": "^0.12.84"
   },
   "dependencies": {
     "kysely": "^0.29.0"

package/src/index.ts

@@ -4,9 +4,9 @@ export { KyselyWorkflowService } from './kysely-workflow-service.js'
 export { KyselyWorkflowRunService } from './kysely-workflow-run-service.js'
 export { KyselyWorkflowMirror } from './kysely-workflow-mirror.js'
 export { KyselyDeploymentService } from './kysely-deployment-service.js'
-export { KyselyAIStorageService } from './kysely-ai-storage-service.js'
-export { KyselyAgentRunService } from './kysely-ai-agent-run-service.js'
-export { KyselyAIRunStateService } from './kysely-ai-run-state-service.js'
+export { KyselyAgentStorageService } from './kysely-agent-storage-service.js'
+export { KyselyAgentRunService } from './kysely-agent-run-service.js'
+export { KyselyAgentRunStateService } from './kysely-agent-run-state-service.js'
 export { KyselySecretService } from './kysely-secret-service.js'
 export { KyselyCredentialService } from './kysely-credential-service.js'
 export { KyselySessionStore } from './kysely-session-store.js'
@@ -21,7 +21,6 @@ export { KyselyVirtualUserRunStore } from './kysely-virtual-user-run-store.js'
 
 export {
   SerializePlugin,
-  SqliteSerializePlugin,
   BaseSerializePlugin,
   type Serializer,
   type Deserializer,
@@ -41,9 +40,12 @@ export {
 } from './schema/index.js'
 
 export type { KyselyPikkuDB } from './kysely-tables.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 type {
   VirtualUserRunStore,
   VirtualUserRunRecord,
-} from '@pikku/core/virtual-user'
+} from '@pikku/core/ecosystem/virtual-user'

package/src/{kysely-ai-run-scores.ts → kysely-agent-run-scores.ts}

@@ -1,11 +1,11 @@
 import type { Kysely } from 'kysely'
 import type { KyselyPikkuDB } from './kysely-tables.js'
 import type { SaveScoreInput } from '@pikku/core/services'
-import type { AIRunScore } from '@pikku/core/ai-scorer'
+import type { AgentRunScore } from '@pikku/core/agent-scorer'
 import { parseJson } from './kysely-json.js'
 
 /**
- * Shared by the two Kysely services that implement `AIRunStateService` — they
+ * Shared by the two Kysely services that implement `AgentRunStateService` — they
  * differ in how they store approvals, not in how they store grades.
  */
 export const saveRunScore = async (
@@ -13,7 +13,7 @@ export const saveRunScore = async (
   score: SaveScoreInput
 ): Promise<void> => {
   await db
-    .insertInto('aiRunScore')
+    .insertInto('agentRunScore')
     .values({
       id: crypto.randomUUID(),
       runId: score.runId,
@@ -28,9 +28,9 @@ export const saveRunScore = async (
 export const getRunScores = async (
   db: Kysely<KyselyPikkuDB>,
   runId: string
-): Promise<AIRunScore[]> => {
+): Promise<AgentRunScore[]> => {
   const rows = await db
-    .selectFrom('aiRunScore')
+    .selectFrom('agentRunScore')
     .selectAll()
     .where('runId', '=', runId)
     .orderBy('createdAt', 'asc')

package/src/{kysely-ai-agent-run-service.ts → kysely-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 { Kysely } from 'kysely'
 import { sql } from 'kysely'
 import type { KyselyPikkuDB } from './kysely-tables.js'
@@ -23,7 +22,7 @@ export class KyselyAgentRunService implements AgentRunService {
     owners?: string[]
     limit?: number
     offset?: number
-  }): Promise<AIThread[]> {
+  }): Promise<AgentThread[]> {
     const {
       agentName,
       resourceId,
@@ -37,7 +36,7 @@ export class KyselyAgentRunService implements AgentRunService {
     if (owners && owners.length === 0) return []
 
     let query = this.db
-      .selectFrom('aiThreads as t')
+      .selectFrom('agentThreads as t')
       .select([
         't.id',
         't.resourceId',
@@ -52,7 +51,7 @@ export class KyselyAgentRunService implements AgentRunService {
         't.id',
         'in',
         this.db
-          .selectFrom('aiRun')
+          .selectFrom('agentRun')
           .select('threadId')
           .where('agentName', '=', agentName)
           .distinct()
@@ -87,9 +86,9 @@ export class KyselyAgentRunService 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.db
-      .selectFrom('aiThreads')
+      .selectFrom('agentThreads')
       .select([
         'id',
         'resourceId',
@@ -105,16 +104,16 @@ export class KyselyAgentRunService implements AgentRunService {
     return this.mapThreadRow(row)
   }
 
-  async getThreadMessages(threadId: string): Promise<AIMessage[]> {
+  async getThreadMessages(threadId: string): Promise<AgentMessage[]> {
     const [msgResult, tcResult] = await Promise.all([
       this.db
-        .selectFrom('aiMessage')
+        .selectFrom('agentMessage')
         .select(['id', 'role', 'content', 'createdAt'])
         .where('threadId', '=', threadId)
         .orderBy('createdAt', 'asc')
         .execute(),
       this.db
-        .selectFrom('aiToolCall')
+        .selectFrom('agentToolCall')
         .select(['id', 'messageId', 'toolName', 'args', 'result'])
         .where('threadId', '=', threadId)
         .orderBy('createdAt', 'asc')
@@ -128,11 +127,11 @@ export class KyselyAgentRunService 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 as unknown as string),
       }
@@ -170,7 +169,7 @@ export class KyselyAgentRunService implements AgentRunService {
 
   async getThreadRuns(threadId: string): Promise<AgentRunRow[]> {
     const result = await this.db
-      .selectFrom('aiRun')
+      .selectFrom('agentRun')
       .select([
         'runId',
         'agentName',
@@ -195,7 +194,7 @@ export class KyselyAgentRunService implements AgentRunService {
 
   async deleteThread(threadId: string): Promise<boolean> {
     const result = await this.db
-      .deleteFrom('aiThreads')
+      .deleteFrom('agentThreads')
       .where('id', '=', threadId)
       .executeTakeFirst()
 
@@ -204,7 +203,7 @@ export class KyselyAgentRunService implements AgentRunService {
 
   async getDistinctAgentNames(): Promise<string[]> {
     const result = await this.db
-      .selectFrom('aiRun')
+      .selectFrom('agentRun')
       .select('agentName')
       .distinct()
       .orderBy('agentName')
@@ -213,7 +212,7 @@ export class KyselyAgentRunService implements AgentRunService {
     return result.map((row) => row.agentName)
   }
 
-  private mapThreadRow(row: any): AIThread {
+  private mapThreadRow(row: any): AgentThread {
     return {
       id: row.id as string,
       resourceId: row.resourceId as string,

package/src/{kysely-ai-run-state-service.ts → kysely-agent-run-state-service.ts}

@@ -2,31 +2,32 @@ import { sql } from 'kysely'
 import type { Kysely } from 'kysely'
 import type { KyselyPikkuDB } from './kysely-tables.js'
 import type {
-  AIRunStateService,
+  AgentRunStateService,
   CreateRunInput,
   SaveScoreInput,
 } from '@pikku/core/services'
-import type { AgentRunState, PendingApproval } from '@pikku/core/ai-agent'
-import type { AIRunScore } from '@pikku/core/ai-scorer'
+import type { AgentRunState } from '@pikku/core/agent'
+import type { PendingApproval } from '@pikku/core/ecosystem/agent'
+import type { AgentRunScore } from '@pikku/core/agent-scorer'
 import { ensurePikkuSchema } from './schema/index.js'
-import { aiSchema } from './schema/ai.schema.js'
-import { getRunScores, saveRunScore } from './kysely-ai-run-scores.js'
+import { agentSchema } from './schema/agent.schema.js'
+import { getRunScores, saveRunScore } from './kysely-agent-run-scores.js'
 
-export class KyselyAIRunStateService implements AIRunStateService {
+export class KyselyAgentRunStateService implements AgentRunStateService {
   private initialized = false
 
   constructor(private db: Kysely<KyselyPikkuDB>) {}
 
   async init(): Promise<void> {
     if (this.initialized) return
-    await ensurePikkuSchema(this.db, aiSchema)
+    await ensurePikkuSchema(this.db, agentSchema)
     this.initialized = true
   }
 
   async createRun(run: CreateRunInput): Promise<string> {
     const runId = `run-${crypto.randomUUID()}`
     await this.db
-      .insertInto('aiRun')
+      .insertInto('agentRun')
       .values({
         runId,
         agentName: run.agentName,
@@ -67,7 +68,7 @@ export class KyselyAIRunStateService implements AIRunStateService {
     }
 
     await this.db
-      .updateTable('aiRun')
+      .updateTable('agentRun')
       .set(values)
       .where('runId', '=', runId)
       .execute()
@@ -75,7 +76,7 @@ export class KyselyAIRunStateService implements AIRunStateService {
 
   async getRun(runId: string): Promise<AgentRunState | null> {
     const row = await this.db
-      .selectFrom('aiRun')
+      .selectFrom('agentRun')
       .selectAll()
       .where('runId', '=', runId)
       .executeTakeFirst()
@@ -84,7 +85,7 @@ export class KyselyAIRunStateService implements AIRunStateService {
 
   async getRunsByThread(threadId: string): Promise<AgentRunState[]> {
     const rows = await this.db
-      .selectFrom('aiRun')
+      .selectFrom('agentRun')
       .selectAll()
       .where('threadId', '=', threadId)
       .orderBy('createdAt', 'desc')
@@ -97,7 +98,7 @@ export class KyselyAIRunStateService implements AIRunStateService {
     status: 'approved' | 'denied'
   ): Promise<boolean> {
     const rows = await this.db
-      .selectFrom('aiRun')
+      .selectFrom('agentRun')
       .select(['runId', 'pendingApprovals'])
       .where('status', '=', 'suspended')
       .execute()
@@ -126,7 +127,7 @@ export class KyselyAIRunStateService implements AIRunStateService {
         // Compare-and-swap on the list we read: a concurrent approver that got
         // there first has already rewritten it, and this update matches no row.
         const result = await this.db
-          .updateTable('aiRun')
+          .updateTable('agentRun')
           .set(updates as any)
           .where('runId', '=', row.runId)
           .where('status', '=', 'suspended')
@@ -142,7 +143,7 @@ export class KyselyAIRunStateService implements AIRunStateService {
     toolCallId: string
   ): Promise<{ run: AgentRunState; approval: PendingApproval } | null> {
     const rows = await this.db
-      .selectFrom('aiRun')
+      .selectFrom('agentRun')
       .selectAll()
       .where('status', '=', 'suspended')
       .execute()
@@ -170,7 +171,7 @@ export class KyselyAIRunStateService implements AIRunStateService {
     await saveRunScore(this.db, score)
   }
 
-  async getScores(runId: string): Promise<AIRunScore[]> {
+  async getScores(runId: string): Promise<AgentRunScore[]> {
     return getRunScores(this.db, runId)
   }