@pikku/kysely 0.13.13 → 0.13.16

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}

@@ -1,26 +1,33 @@
 import { sql } from 'kysely'
 import type { Kysely } from 'kysely'
 import type { KyselyPikkuDB } from './kysely-tables.js'
-import type { AIRunStateService, CreateRunInput } from '@pikku/core/services'
-import type { AgentRunState, PendingApproval } from '@pikku/core/ai-agent'
+import type {
+  AgentRunStateService,
+  CreateRunInput,
+  SaveScoreInput,
+} from '@pikku/core/services'
+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 { 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,
@@ -61,7 +68,7 @@ export class KyselyAIRunStateService implements AIRunStateService {
     }
 
     await this.db
-      .updateTable('aiRun')
+      .updateTable('agentRun')
       .set(values)
       .where('runId', '=', runId)
       .execute()
@@ -69,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()
@@ -78,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')
@@ -91,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()
@@ -120,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')
@@ -136,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()
@@ -160,6 +167,14 @@ export class KyselyAIRunStateService implements AIRunStateService {
     return null
   }
 
+  async saveScore(score: SaveScoreInput): Promise<void> {
+    await saveRunScore(this.db, score)
+  }
+
+  async getScores(runId: string): Promise<AgentRunScore[]> {
+    return getRunScores(this.db, runId)
+  }
+
   private toRunState(row: any): AgentRunState {
     return {
       runId: row.runId,

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

@@ -1,17 +1,24 @@
 import type {
-  AIStorageService,
-  AIRunStateService,
+  AgentStorageService,
+  AgentRunStateService,
   CreateRunInput,
+  SaveScoreInput,
 } from '@pikku/core/services'
-import type { AIThread, AIMessage, AgentRunState } from '@pikku/core/ai-agent'
+import type {
+  AgentThread,
+  AgentMessage,
+  AgentRunState,
+} from '@pikku/core/agent'
+import type { AgentRunScore } from '@pikku/core/agent-scorer'
 import type { Kysely } from 'kysely'
 import type { KyselyPikkuDB } from './kysely-tables.js'
 import { parseJson } from './kysely-json.js'
+import { getRunScores, saveRunScore } from './kysely-agent-run-scores.js'
 import { ensurePikkuSchema } from './schema/index.js'
-import { aiSchema } from './schema/ai.schema.js'
+import { agentSchema } from './schema/agent.schema.js'
 
-export class KyselyAIStorageService
-  implements AIStorageService, AIRunStateService
+export class KyselyAgentStorageService
+  implements AgentStorageService, AgentRunStateService
 {
   private initialized = false
 
@@ -19,7 +26,7 @@ export class KyselyAIStorageService
 
   public async init(): Promise<void> {
     if (this.initialized) return
-    await ensurePikkuSchema(this.db, aiSchema)
+    await ensurePikkuSchema(this.db, agentSchema)
     this.initialized = true
   }
 
@@ -30,12 +37,12 @@ export class KyselyAIStorageService
       title?: string
       metadata?: Record<string, unknown>
     }
-  ): Promise<AIThread> {
+  ): Promise<AgentThread> {
     const id = options?.threadId ?? crypto.randomUUID()
     const now = new Date()
 
     await this.db
-      .insertInto('aiThreads')
+      .insertInto('agentThreads')
       .values({
         id,
         resourceId: resourceId,
@@ -56,9 +63,9 @@ export class KyselyAIStorageService
     }
   }
 
-  async getThread(threadId: string): Promise<AIThread> {
+  async getThread(threadId: string): Promise<AgentThread> {
     const row = await this.db
-      .selectFrom('aiThreads')
+      .selectFrom('agentThreads')
       .select([
         'id',
         'resourceId',
@@ -84,9 +91,9 @@ export class KyselyAIStorageService
     }
   }
 
-  async getThreads(resourceId: string): Promise<AIThread[]> {
+  async getThreads(resourceId: string): Promise<AgentThread[]> {
     const result = await this.db
-      .selectFrom('aiThreads')
+      .selectFrom('agentThreads')
       .select([
         'id',
         'resourceId',
@@ -110,21 +117,24 @@ export class KyselyAIStorageService
   }
 
   async deleteThread(threadId: string): Promise<void> {
-    await this.db.deleteFrom('aiThreads').where('id', '=', threadId).execute()
+    await this.db
+      .deleteFrom('agentThreads')
+      .where('id', '=', threadId)
+      .execute()
   }
 
   async getMessages(
     threadId: string,
     options?: { lastN?: number; cursor?: string }
-  ): Promise<AIMessage[]> {
+  ): Promise<AgentMessage[]> {
     let msgQuery = this.db
-      .selectFrom('aiMessage')
+      .selectFrom('agentMessage')
       .select(['id', 'role', 'content', 'createdAt'])
       .where('threadId', '=', threadId)
 
     if (options?.cursor) {
       const cursorRow = await this.db
-        .selectFrom('aiMessage')
+        .selectFrom('agentMessage')
         .select('createdAt')
         .where('id', '=', options.cursor)
         .executeTakeFirst()
@@ -147,7 +157,7 @@ export class KyselyAIStorageService
     }
 
     const tcResult = await this.db
-      .selectFrom('aiToolCall')
+      .selectFrom('agentToolCall')
       .select(['id', 'messageId', 'toolName', 'args', 'result'])
       .where('threadId', '=', threadId)
       .orderBy('createdAt', 'asc')
@@ -160,10 +170,10 @@ export class KyselyAIStorageService
       tcByMessage.get(msgId)!.push(tc)
     }
 
-    const messages: AIMessage[] = []
+    const messages: AgentMessage[] = []
     for (const row of msgResult) {
       const rawContent = row.content as string | undefined
-      let parsedContent: AIMessage['content'] = rawContent ?? undefined
+      let parsedContent: AgentMessage['content'] = rawContent ?? undefined
       if (rawContent) {
         try {
           const parsed = JSON.parse(rawContent)
@@ -176,9 +186,9 @@ export class KyselyAIStorageService
           // Not JSON, use raw string
         }
       }
-      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),
       }
@@ -214,7 +224,10 @@ export class KyselyAIStorageService
     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')
@@ -222,7 +235,7 @@ export class KyselyAIStorageService
 
     if (nonToolMessages.length > 0) {
       await this.db
-        .insertInto('aiMessage')
+        .insertInto('agentMessage')
         .values(
           nonToolMessages.map((msg) => ({
             id: msg.id,
@@ -240,7 +253,7 @@ export class KyselyAIStorageService
     )
     if (toolCalls.length > 0) {
       await this.db
-        .insertInto('aiToolCall')
+        .insertInto('agentToolCall')
         .values(
           toolCalls.map((tc) => ({
             id: tc.id,
@@ -257,7 +270,7 @@ export class KyselyAIStorageService
       if (!toolMsg.toolResults) continue
       for (const tr of toolMsg.toolResults) {
         await this.db
-          .updateTable('aiToolCall')
+          .updateTable('agentToolCall')
           .set({ result: tr.result })
           .where('id', '=', tr.id)
           .execute()
@@ -265,7 +278,7 @@ export class KyselyAIStorageService
     }
 
     await this.db
-      .updateTable('aiThreads')
+      .updateTable('agentThreads')
       .set({ updatedAt: new Date() })
       .where('id', '=', threadId)
       .execute()
@@ -276,7 +289,7 @@ export class KyselyAIStorageService
     scope: 'resource' | 'thread'
   ): Promise<Record<string, unknown> | null> {
     const row = await this.db
-      .selectFrom('aiWorkingMemory')
+      .selectFrom('agentWorkingMemory')
       .select('data')
       .where('id', '=', id)
       .where('scope', '=', scope)
@@ -292,7 +305,7 @@ export class KyselyAIStorageService
     data: Record<string, unknown>
   ): Promise<void> {
     await this.db
-      .insertInto('aiWorkingMemory')
+      .insertInto('agentWorkingMemory')
       .values({
         id,
         scope,
@@ -312,7 +325,7 @@ export class KyselyAIStorageService
     const runId = crypto.randomUUID()
 
     await this.db
-      .insertInto('aiRun')
+      .insertInto('agentRun')
       .values({
         runId: runId,
         agentName: run.agentName,
@@ -362,14 +375,14 @@ export class KyselyAIStorageService
     }
 
     await this.db
-      .updateTable('aiRun')
+      .updateTable('agentRun')
       .set(setValues)
       .where('runId', '=', runId)
       .execute()
 
     if (updates.pendingApprovals !== undefined) {
       await this.db
-        .updateTable('aiToolCall')
+        .updateTable('agentToolCall')
         .set({
           approvalStatus: null,
           runId: null,
@@ -390,7 +403,7 @@ export class KyselyAIStorageService
 
   async getRun(runId: string): Promise<AgentRunState | null> {
     const row = await this.db
-      .selectFrom('aiRun')
+      .selectFrom('agentRun')
       .select([
         'runId',
         'agentName',
@@ -412,7 +425,7 @@ export class KyselyAIStorageService
     if (!row) return null
 
     const approvals = await this.db
-      .selectFrom('aiToolCall')
+      .selectFrom('agentToolCall')
       .select([
         'id',
         'toolName',
@@ -431,7 +444,7 @@ export class KyselyAIStorageService
 
   async getRunsByThread(threadId: string): Promise<AgentRunState[]> {
     const result = await this.db
-      .selectFrom('aiRun')
+      .selectFrom('agentRun')
       .select([
         'runId',
         'agentName',
@@ -454,7 +467,7 @@ export class KyselyAIStorageService
     const runs: AgentRunState[] = []
     for (const row of result) {
       const approvals = await this.db
-        .selectFrom('aiToolCall')
+        .selectFrom('agentToolCall')
         .select([
           'id',
           'toolName',
@@ -479,7 +492,7 @@ export class KyselyAIStorageService
     for (const a of approvals) {
       if (a.type === 'agent-call') {
         await this.db
-          .updateTable('aiToolCall')
+          .updateTable('agentToolCall')
           .set({
             approvalStatus: 'pending',
             runId: runId,
@@ -492,7 +505,7 @@ export class KyselyAIStorageService
           .execute()
       } else {
         await this.db
-          .updateTable('aiToolCall')
+          .updateTable('agentToolCall')
           .set({
             approvalStatus: 'pending',
             runId: runId,
@@ -551,7 +564,7 @@ export class KyselyAIStorageService
     approval: NonNullable<AgentRunState['pendingApprovals']>[number]
   } | null> {
     const tc = await this.db
-      .selectFrom('aiToolCall')
+      .selectFrom('agentToolCall')
       .select([
         'id',
         'toolName',
@@ -599,7 +612,7 @@ export class KyselyAIStorageService
   ): Promise<boolean> {
     // Only the caller that moves the tool call off 'pending' has claimed it.
     const result = await this.db
-      .updateTable('aiToolCall')
+      .updateTable('agentToolCall')
       .set({ approvalStatus: status })
       .where('id', '=', toolCallId)
       .where('approvalStatus', '=', 'pending')
@@ -607,5 +620,13 @@ export class KyselyAIStorageService
     return Number(result?.numUpdatedRows ?? 0) > 0
   }
 
+  async saveScore(score: SaveScoreInput): Promise<void> {
+    await saveRunScore(this.db, score)
+  }
+
+  async getScores(runId: string): Promise<AgentRunScore[]> {
+    return getRunScores(this.db, runId)
+  }
+
   public async close(): Promise<void> {}
 }

package/src/kysely-audit-service.ts

@@ -1,11 +1,13 @@
+import type { AuditService } from '@pikku/core'
 import type {
   AuditEvent,
   AuditEventBatch,
+} from '@pikku/core/ecosystem/services'
+import type {
   AuditFacets,
   AuditQuery,
   AuditQueryResult,
-  AuditService,
-} from '@pikku/core'
+} from '@pikku/core/ecosystem/types'
 import type { Kysely } from 'kysely'
 import { ensurePikkuSchema } from './schema/index.js'
 import { auditSchema } from './schema/audit.schema.js'

package/src/kysely-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 { Kysely } from 'kysely'
 import type { KyselyPikkuDB } from './kysely-tables.js'
 import { ensurePikkuSchema } from './schema/index.js'

package/src/kysely-eventhub-store.ts

@@ -1,4 +1,4 @@
-import { EventHubStore } from '@pikku/core/channel'
+import { EventHubStore } from '@pikku/core/ecosystem/channel'
 import type { Kysely } from 'kysely'
 import type { KyselyPikkuDB } from './kysely-tables.js'
 

package/src/kysely-scope-service.ts

@@ -1,6 +1,7 @@
-import type { Role, ScopeService } from '@pikku/core/services'
-import type { FlatScope } from '@pikku/core/scope'
-import type { SystemRole } from '@pikku/core/role'
+import type { ScopeService } from '@pikku/core/services'
+import type { Role } from '@pikku/core/ecosystem/services'
+import type { FlatScope } from '@pikku/core/ecosystem/scope'
+import type { SystemRole } from '@pikku/core/ecosystem/role'
 import {
   SystemRoleImmutableError,
   SystemRoleShadowedError,
@@ -378,7 +379,9 @@ export class KyselyScopeService implements ScopeService {
    * different decisions, and the number is what makes pruning a choice rather
    * than a formality.
    */
-  async findStaleSystemRoles(): Promise<Array<{ role: string; users: number }>> {
+  async findStaleSystemRoles(): Promise<
+    Array<{ role: string; users: number }>
+  > {
     const stale = await this.db
       .selectFrom('pikkuRoles')
       .leftJoin('pikkuUserRole', 'pikkuUserRole.role', 'pikkuRoles.name')

package/src/kysely-services.test.ts

@@ -5,7 +5,7 @@ import { SerializePlugin } from './serialize-plugin.js'
 import Database from 'better-sqlite3'
 import { PostgresJSDialect } from 'kysely-postgres-js'
 import postgres from 'postgres'
-import { defineServiceTests } from '@pikku/core/testing'
+import { defineServiceTests } from '@pikku/core/ecosystem/testing'
 
 import type { KyselyPikkuDB } from './kysely-tables.js'
 import { KyselyChannelStore } from './kysely-channel-store.js'
@@ -13,8 +13,8 @@ import { KyselyEventHubStore } from './kysely-eventhub-store.js'
 import { KyselyWorkflowService } from './kysely-workflow-service.js'
 import { KyselyWorkflowRunService } from './kysely-workflow-run-service.js'
 import { KyselyDeploymentService } from './kysely-deployment-service.js'
-import { KyselyAIStorageService } from './kysely-ai-storage-service.js'
-import { KyselyAgentRunService } from './kysely-ai-agent-run-service.js'
+import { KyselyAgentStorageService } from './kysely-agent-storage-service.js'
+import { KyselyAgentRunService } from './kysely-agent-run-service.js'
 import { KyselySecretService } from './kysely-secret-service.js'
 import { KyselyCredentialService } from './kysely-credential-service.js'
 import { KyselySessionStore } from './kysely-session-store.js'
@@ -42,11 +42,12 @@ async function dropAllTables(db: Kysely<KyselyPikkuDB>): Promise<void> {
   const tables = [
     'pikku_deployment_functions',
     'pikku_deployments',
-    'ai_tool_call',
-    'ai_message',
-    'ai_run',
-    'ai_working_memory',
-    'ai_threads',
+    'agent_tool_call',
+    'agent_message',
+    'agent_run_score',
+    'agent_run',
+    'agent_working_memory',
+    'agent_threads',
     'channel_subscriptions',
     'channels',
     'workflow_step_history',
@@ -96,8 +97,8 @@ function registerTests(
         await s.init()
         return s
       },
-      aiStorageService: async () => {
-        const s = new KyselyAIStorageService(getDb())
+      agentStorageService: async () => {
+        const s = new KyselyAgentStorageService(getDb())
         await s.init()
         return s
       },