@pikku/core 0.12.83 → 0.12.84

package/src/public-surface.json

@@ -70,7 +70,7 @@
     "isVersionedId",
     "parseDurationString",
     "parseVersionedId",
-    "pikkuAIMiddleware",
+    "pikkuAgentMiddleware",
     "pikkuApprovalDescription",
     "pikkuAuth",
     "pikkuCLIRender",
@@ -173,9 +173,7 @@
     "reconstructStateAt"
   ],
   "./workflow/types": [],
-  "./actor-flow": [
-    "runConversation"
-  ],
+  "./actor-flow": ["runConversation"],
   "./virtual-user": [
     "DISPOSITIONS",
     "IntentStack",
@@ -218,9 +216,7 @@
     "wireHTTP",
     "wireHTTPRoutes"
   ],
-  "./remote": [
-    "buildRemoteHeaders"
-  ],
+  "./remote": ["buildRemoteHeaders"],
   "./queue": [
     "QueueJobDiscardedError",
     "QueueJobFailedError",
@@ -235,11 +231,7 @@
     "runScheduledTask",
     "wireScheduler"
   ],
-  "./trigger": [
-    "PikkuTriggerService",
-    "wireTrigger",
-    "wireTriggerSource"
-  ],
+  "./trigger": ["PikkuTriggerService", "wireTrigger", "wireTriggerSource"],
   "./rpc": [
     "PikkuRPCService",
     "RPCNotFoundError",
@@ -257,10 +249,7 @@
     "safeFetch",
     "setDefaultHostResolver"
   ],
-  "./node-host-resolver": [
-    "installNodeHostResolver",
-    "nodeHostResolver"
-  ],
+  "./node-host-resolver": ["installNodeHostResolver", "nodeHostResolver"],
   "./mcp": [
     "MCPEndpointRegistry",
     "MCPError",
@@ -273,28 +262,28 @@
     "wireMCPPrompt",
     "wireMCPResource"
   ],
-  "./ai-agent": [
+  "./agent": [
     "AgentInterruptedError",
     "NoSpeechDetectedError",
     "SPOKEN_TRANSCRIPT",
     "SPOKEN_TURN",
     "ToolApprovalRequired",
     "ToolCredentialRequired",
-    "addAIAgent",
+    "addAgent",
     "agent",
     "agentApprove",
     "agentInterrupt",
     "agentResume",
     "agentStream",
     "canAccessThread",
-    "interruptAIAgent",
+    "interruptAgent",
     "isOwnedByPrincipal",
     "resolveModelAlias",
-    "resumeAIAgent",
-    "resumeAIAgentSync",
-    "runAIAgent",
+    "resumeAgent",
+    "resumeAgentSync",
+    "runAgent",
     "signalRunInterrupt",
-    "streamAIAgent",
+    "streamAgent",
     "threadOwnerConstraint",
     "unspeakableScripts",
     "voiceForText",
@@ -302,16 +291,16 @@
     "voiceOutput",
     "wrapChannelWithAGUI"
   ],
-  "./ai-scorer": [
-    "addAIScorer",
+  "./agent-scorer": [
+    "addAgentScorer",
     "enableScoreSnapshots",
-    "getAIScorers",
-    "getAIScorersMeta",
+    "getAgentScorers",
+    "getAgentScorersMeta",
     "getScoreSnapshot",
     "gradeRun",
-    "pikkuAIJudge",
-    "pikkuAIScorer",
-    "wireAIScorerQueueWorkers"
+    "pikkuAgentJudge",
+    "pikkuAgentScorer",
+    "wireAgentScorerQueueWorkers"
   ],
   "./gateway": [
     "createListenerMessageHandler",
@@ -328,10 +317,7 @@
     "runCLICommand",
     "wireCLI"
   ],
-  "./cli/command-parser": [
-    "generateCommandHelp",
-    "parseCLIArguments"
-  ],
+  "./cli/command-parser": ["generateCommandHelp", "parseCLIArguments"],
   "./cli/channel": [
     "executeCLIViaChannel",
     "executeRawCLIViaChannel",
@@ -368,14 +354,8 @@
     "validateAndBuildPersonasMeta",
     "verifyPersonaRoles"
   ],
-  "./secret": [
-    "defineSecret",
-    "validateAndBuildSecretDefinitionsMeta"
-  ],
-  "./variable": [
-    "defineVariable",
-    "validateAndBuildVariableDefinitionsMeta"
-  ],
+  "./secret": ["defineSecret", "validateAndBuildSecretDefinitionsMeta"],
+  "./variable": ["defineVariable", "validateAndBuildVariableDefinitionsMeta"],
   "./oauth2": [],
   "./errors": [
     "AIProviderAuthError",
@@ -428,7 +408,7 @@
   "./services": [
     "ConsoleLogger",
     "DEFAULT_WEBHOOK_RETRIES",
-    "InMemoryAIRunStateService",
+    "InMemoryAgentRunStateService",
     "InMemoryQueueService",
     "InMemorySessionStore",
     "InMemoryTriggerService",
@@ -463,19 +443,10 @@
     "spy",
     "stub"
   ],
-  "./services/local-meta": [
-    "LocalMetaService"
-  ],
-  "./services/v8-coverage": [
-    "V8CoverageService"
-  ],
-  "./services/istanbul-coverage": [
-    "IstanbulCoverageService"
-  ],
-  "./services/local-content": [
-    "LocalContent",
-    "signedContentPath"
-  ],
+  "./services/local-meta": ["LocalMetaService"],
+  "./services/v8-coverage": ["V8CoverageService"],
+  "./services/istanbul-coverage": ["IstanbulCoverageService"],
+  "./services/local-content": ["LocalContent", "signedContentPath"],
   "./services/local-content-request-handler": [
     "createLocalContentRequestHandler",
     "verifySignedContentRequest"
@@ -505,10 +476,7 @@
     "verifyWithKeyMaterial",
     "wrapDEK"
   ],
-  "./hmac": [
-    "hmacSha256Hex",
-    "timingSafeStringEqual"
-  ],
+  "./hmac": ["hmacSha256Hex", "timingSafeStringEqual"],
   "./ecosystem": [
     "addFunction",
     "addGlobalMiddleware",
@@ -522,6 +490,149 @@
     "runPikkuFunc",
     "setSingletonServices"
   ],
+  "./ecosystem/agent": [
+    "addAgent",
+    "agent",
+    "agentApprove",
+    "agentResume",
+    "agentStream",
+    "canAccessThread",
+    "isOwnedByPrincipal",
+    "resolveModelAlias",
+    "threadOwnerConstraint",
+    "voiceInput",
+    "voiceOutput"
+  ],
+  "./ecosystem/agent-scorer": [
+    "addAgentScorer",
+    "enableScoreSnapshots",
+    "getScoreSnapshot",
+    "gradeRun",
+    "pikkuAgentJudge",
+    "pikkuAgentScorer",
+    "wireAgentScorerQueueWorkers"
+  ],
+  "./ecosystem/channel": [
+    "EventHubStore",
+    "PikkuAbstractChannelHandler",
+    "addChannelMiddleware",
+    "logChannels"
+  ],
+  "./ecosystem/channel/local": ["PikkuLocalChannelHandler"],
+  "./ecosystem/cli": ["CLIError", "executeCLI", "generateCommandHelp"],
+  "./ecosystem/cli/channel": ["executeRawCLIViaChannel", "handleRawCLI"],
+  "./ecosystem/credential": ["validateAndBuildCredentialDefinitionsMeta"],
+  "./ecosystem/dev": ["reconcileAddonRegistry", "reloadGeneratedMeta"],
+  "./ecosystem/function": ["getAllFunctionNames", "pikkuAuth"],
+  "./ecosystem/gateway": [],
+  "./ecosystem/hmac": ["hmacSha256Hex", "timingSafeStringEqual"],
+  "./ecosystem/http": ["DEFAULT_MAX_BODY_SIZE", "logRoutes", "toWebRequest"],
+  "./ecosystem/mcp": [
+    "MCPEndpointRegistry",
+    "MCPError",
+    "getMCPPromptsMeta",
+    "getMCPResourcesMeta",
+    "getMCPToolsMeta"
+  ],
+  "./ecosystem/middleware": [
+    "addGlobalPermission",
+    "authAPIKey",
+    "authCookie",
+    "pikkuRemoteAuthMiddleware",
+    "runMiddleware",
+    "telemetryInner",
+    "telemetryOuter"
+  ],
+  "./ecosystem/node": [],
+  "./ecosystem/node-host-resolver": ["installNodeHostResolver"],
+  "./ecosystem/oauth2": [],
+  "./ecosystem/persona": [
+    "HttpPersona",
+    "createHttpPersonas",
+    "personaEmails",
+    "personaEnvironmentErrors",
+    "personaEnvironmentRefusal",
+    "roleMismatchMessage",
+    "validateAndBuildPersonasMeta",
+    "verifyPersonaRoles"
+  ],
+  "./ecosystem/queue": [
+    "QueueJobDiscardedError",
+    "QueueJobFailedError",
+    "registerQueueWorkers"
+  ],
+  "./ecosystem/remote": ["buildRemoteHeaders"],
+  "./ecosystem/role": [
+    "defineSystemRole",
+    "flattenSystemRoleDefinitions",
+    "validateAndBuildSystemRoleDefinitionsMeta"
+  ],
+  "./ecosystem/rpc": ["wireAddon", "wireRemoteAddon"],
+  "./ecosystem/safe-fetch": ["safeFetch"],
+  "./ecosystem/scenario": [
+    "PikkuScenarioService",
+    "SCENARIO_SURFACES",
+    "addFeature",
+    "composeStepProse",
+    "resolveFeatureScenarios"
+  ],
+  "./ecosystem/scheduler": ["getScheduledTasks"],
+  "./ecosystem/schema": ["addSchema"],
+  "./ecosystem/scope": [
+    "defineScope",
+    "flattenScopeDefinitions",
+    "validateAndBuildScopeDefinitionsMeta"
+  ],
+  "./ecosystem/secret": ["validateAndBuildSecretDefinitionsMeta"],
+  "./ecosystem/services": [
+    "InMemoryAgentRunStateService",
+    "PIKKU_OUTGOING_WEBHOOK_QUEUE_NAME",
+    "PikkuSessionService",
+    "TypedVariablesService",
+    "createMiddlewareSessionWireProps",
+    "getStubTracker",
+    "pikkuWebhookWorkerFunc",
+    "spy"
+  ],
+  "./ecosystem/services/istanbul-coverage": ["IstanbulCoverageService"],
+  "./ecosystem/services/local-content": ["signedContentPath"],
+  "./ecosystem/services/local-content-request-handler": [
+    "createLocalContentRequestHandler",
+    "verifySignedContentRequest"
+  ],
+  "./ecosystem/services/v8-coverage": ["V8CoverageService"],
+  "./ecosystem/testing": ["defineServiceTests"],
+  "./ecosystem/trigger": [],
+  "./ecosystem/types": [
+    "PikkuRequest",
+    "formatVersionedId",
+    "isExpectedError",
+    "isSerializable",
+    "isVersionedId",
+    "parseDurationString",
+    "parseVersionedId"
+  ],
+  "./ecosystem/variable": ["validateAndBuildVariableDefinitionsMeta"],
+  "./ecosystem/virtual-user": [
+    "DISPOSITIONS",
+    "PRODUCTION_DISPOSITION",
+    "catalogueClassification",
+    "dispositionProfile",
+    "intentsForPersona",
+    "isReadOnly",
+    "personaScopes",
+    "prepareVirtualUserRun",
+    "reachableCatalogue",
+    "unreachableCatalogue"
+  ],
+  "./ecosystem/workflow": [
+    "assertWorkflowRunOwner",
+    "buildRunTimeline",
+    "isRef",
+    "reconstructFinalState",
+    "reconstructStateAt",
+    "template"
+  ],
   "./schema": [
     "addSchema",
     "applyDefaultsFromSchema",
@@ -530,12 +641,6 @@
     "getSchema",
     "validateSchema"
   ],
-  "./testing": [
-    "defineServiceTests"
-  ],
-  "./dev": [
-    "pikkuDevReloader",
-    "reconcileAddonRegistry",
-    "reloadGeneratedMeta"
-  ]
+  "./testing": ["defineServiceTests"],
+  "./dev": ["pikkuDevReloader", "reconcileAddonRegistry", "reloadGeneratedMeta"]
 }

package/src/public-surface.json.README

@@ -5,17 +5,35 @@ disagree, so widening the API is a visible diff rather than a side effect of an
 
 Types are not pinned: they are erased before the test can enumerate them.
 
+A wildcard subpath is expanded to the files it matches, so `./ecosystem/*` is
+pinned as one entry per area rather than as a pattern — otherwise a new
+sub-barrel joins the published API without a diff.
+
 Regenerate after an intentional change, from `packages/core`:
 
 ```bash
 cat > src/__gen-surface.mts <<'EOF'
-import { readFileSync, writeFileSync } from 'node:fs'
+import { readdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import { pathToFileURL } from 'node:url'
 
 const pkg = JSON.parse(readFileSync('package.json', 'utf-8'))
+const expand = ([sub, dist]: [string, string]): [string, string][] => {
+  if (!sub.includes('*')) return [[sub, dist]]
+  const [prefix] = dist.split('*') as [string]
+  return readdirSync(resolve(prefix.replace('./dist/', './src/')), {
+    recursive: true,
+    encoding: 'utf-8',
+  })
+    .filter((f) => f.endsWith('.ts') && !f.endsWith('.d.ts'))
+    .map((f) => f.slice(0, -'.ts'.length))
+    .sort()
+    .map((area) => [sub.replace('*', area), dist.replace('*', area)])
+}
 const surface: Record<string, string[]> = {}
-for (const [sub, dist] of Object.entries(pkg.exports as Record<string, string>)) {
+for (const [sub, dist] of Object.entries(
+  pkg.exports as Record<string, string>
+).flatMap(expand)) {
   const src = pathToFileURL(resolve(dist.replace('./dist/', './src/'))).href
   surface[sub] = Object.keys(await import(src)).sort()
 }

package/src/public-surface.test.ts

@@ -1,6 +1,6 @@
 import { describe, test } from 'node:test'
 import assert from 'node:assert/strict'
-import { readFileSync } from 'node:fs'
+import { readdirSync, readFileSync } from 'node:fs'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 import { dirname, join, resolve } from 'node:path'
 
@@ -16,6 +16,34 @@ const expected: Record<string, string[]> = JSON.parse(
 
 const subpaths = packageJson.exports as Record<string, string>
 
+/**
+ * `exports` entries, with a wildcard subpath replaced by the files it matches.
+ *
+ * `./ecosystem/*` publishes one sub-barrel per area, so pinning it as written
+ * would pin a pattern rather than a surface — and a new barrel would appear in
+ * the published API without a diff. Expanding it is what keeps each area's
+ * exports in `public-surface.json` under the same guarantee as every other
+ * entry point's.
+ */
+const entryPoints = (): [string, string][] =>
+  Object.entries(subpaths).flatMap(([subpath, dist]) => {
+    if (!subpath.includes('*')) return [[subpath, dist] as [string, string]]
+
+    const [prefix] = dist.split('*') as [string]
+    const directory = resolve(packageRoot, prefix.replace('./dist/', './src/'))
+    return readdirSync(directory, { recursive: true, encoding: 'utf-8' })
+      .filter((file) => file.endsWith('.ts') && !file.endsWith('.d.ts'))
+      .map((file) => file.slice(0, -'.ts'.length))
+      .sort()
+      .map(
+        (area) =>
+          [subpath.replace('*', area), dist.replace('*', area)] as [
+            string,
+            string,
+          ]
+      )
+  })
+
 /**
  * Every runtime export reachable through an entry point, keyed by subpath.
  *
@@ -24,7 +52,7 @@ const subpaths = packageJson.exports as Record<string, string>
  */
 const actualSurface = async () => {
   const surface: Record<string, string[]> = {}
-  for (const [subpath, dist] of Object.entries(subpaths)) {
+  for (const [subpath, dist] of entryPoints()) {
     const src = resolve(packageRoot, dist.replace('./dist/', './src/'))
     const module = await import(pathToFileURL(src).href)
     surface[subpath] = Object.keys(module).sort()
@@ -38,7 +66,7 @@ const REGENERATE =
 
 describe('the published surface is the surface we meant to publish', () => {
   test('every export subpath resolves to a source file', () => {
-    const missing = Object.entries(subpaths).filter(([, dist]) => {
+    const missing = entryPoints().filter(([, dist]) => {
       try {
         readFileSync(
           resolve(packageRoot, dist.replace('./dist/', './src/')).replace(

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

@@ -1,14 +1,14 @@
 import type {
   AgentRunState,
   PendingApproval,
-} from '../wirings/ai-agent/ai-agent.types.js'
-import type { AIRunScore } from '../wirings/ai-scorer/ai-scorer.types.js'
+} from '../wirings/agent/agent.types.js'
+import type { AgentRunScore } from '../wirings/agent-scorer/agent-scorer.types.js'
 
 export type CreateRunInput = Omit<AgentRunState, 'runId'>
 
-export type SaveScoreInput = Omit<AIRunScore, 'createdAt'>
+export type SaveScoreInput = Omit<AgentRunScore, 'createdAt'>
 
-export interface AIRunStateService {
+export interface AgentRunStateService {
   createRun(run: CreateRunInput): Promise<string>
   updateRun(runId: string, updates: Partial<AgentRunState>): Promise<void>
   getRun(runId: string): Promise<AgentRunState | null>
@@ -33,5 +33,5 @@ export interface AIRunStateService {
    * grade that was acted on.
    */
   saveScore(score: SaveScoreInput): Promise<void>
-  getScores(runId: string): Promise<AIRunScore[]>
+  getScores(runId: string): Promise<AgentRunScore[]>
 }

package/src/services/{ai-agent-runner-service.ts → agent-runner-service.ts}

@@ -1,18 +1,18 @@
 import type {
-  AIMessage,
-  AIAgentStep,
-  AIAgentToolDef,
-  AIStreamChannel,
-} from '../wirings/ai-agent/ai-agent.types.js'
+  AgentMessage,
+  AgentStep,
+  AgentToolDef,
+  AgentStreamChannel,
+} from '../wirings/agent/agent.types.js'
 
 export type AIProviderOptions = Record<string, Record<string, unknown>>
 
-export type AIAgentRunnerParams = {
+export type AgentRunnerParams = {
   model: string
   temperature?: number
   instructions: string
-  messages: AIMessage[]
-  tools: AIAgentToolDef[]
+  messages: AgentMessage[]
+  tools: AgentToolDef[]
   maxSteps: number
   toolChoice: 'auto' | 'required' | 'none'
   outputSchema?: Record<string, unknown>
@@ -21,7 +21,7 @@ export type AIAgentRunnerParams = {
   agentId?: string
   /**
    * Cancels the model call itself, not just delivery of its output. Set by
-   * `streamAIAgent` from the run's interrupt handle so a voice barge-in stops
+   * `streamAgent` from the run's interrupt handle so a voice barge-in stops
    * generation upstream rather than leaving tokens being billed into a stream
    * nobody reads. A runner that ignores it degrades to "the caller stops
    * listening", which is the behaviour before this field existed.
@@ -41,14 +41,14 @@ export type AIAgentRunnerParams = {
   providerOptions?: AIProviderOptions
 }
 
-export type AIAgentRunnerResult = {
+export type AgentRunnerResult = {
   text: string
   object?: unknown
-  steps: AIAgentStep[]
+  steps: AgentStep[]
   usage: { inputTokens: number; outputTokens: number }
 }
 
-export type AIAgentStepResult = {
+export type AgentStepResult = {
   text: string
   object?: unknown
   toolCalls: { toolCallId: string; toolName: string; args: unknown }[]
@@ -216,12 +216,12 @@ export type AIRerankResult<VALUE extends string | Record<string, unknown>> = {
   response?: unknown
 }
 
-export interface AIAgentRunnerService {
+export interface AgentRunnerService {
   stream(
-    params: AIAgentRunnerParams,
-    channel: AIStreamChannel
-  ): Promise<AIAgentStepResult>
-  run(params: AIAgentRunnerParams): Promise<AIAgentStepResult>
+    params: AgentRunnerParams,
+    channel: AgentStreamChannel
+  ): Promise<AgentStepResult>
+  run(params: AgentRunnerParams): Promise<AgentStepResult>
   transcribe?(params: AITranscriptionParams): Promise<AITranscriptionResult>
   generateSpeech?(
     params: AIGenerateSpeechParams
@@ -234,5 +234,5 @@ export interface AIAgentRunnerService {
   ): Promise<AIRerankResult<VALUE>>
   /** Return a new runner that uses the given API key for every LLM call.
    *  Optional — runners that don't support per-key scoping leave this undefined. */
-  withApiKey?(apiKey: string): AIAgentRunnerService
+  withApiKey?(apiKey: string): AgentRunnerService
 }

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

@@ -1,6 +1,6 @@
-import type { AIThread, AIMessage } from '../wirings/ai-agent/ai-agent.types.js'
+import type { AgentThread, AgentMessage } from '../wirings/agent/agent.types.js'
 
-export interface AIStorageService {
+export interface AgentStorageService {
   createThread(
     resourceId: string,
     options?: {
@@ -8,11 +8,11 @@ export interface AIStorageService {
       title?: string
       metadata?: Record<string, unknown>
     }
-  ): Promise<AIThread>
+  ): Promise<AgentThread>
 
-  getThread(threadId: string): Promise<AIThread>
+  getThread(threadId: string): Promise<AgentThread>
 
-  getThreads(resourceId: string): Promise<AIThread[]>
+  getThreads(resourceId: string): Promise<AgentThread[]>
 
   deleteThread(threadId: string): Promise<void>
 
@@ -22,9 +22,9 @@ export interface AIStorageService {
       lastN?: number
       cursor?: string
     }
-  ): Promise<AIMessage[]>
+  ): Promise<AgentMessage[]>
 
-  saveMessages(threadId: string, messages: AIMessage[]): Promise<void>
+  saveMessages(threadId: string, messages: AgentMessage[]): Promise<void>
 
   getWorkingMemory(
     id: string,

package/src/services/http-personas-converse.test.ts

@@ -4,7 +4,7 @@ import { createServer, type Server } from 'node:http'
 
 import { createHttpPersonas } from './http-personas.js'
 import { pikkuState, resetPikkuState } from '../pikku-state.js'
-import type { AIAgentStepResult } from './ai-agent-runner-service.js'
+import type { AgentStepResult } from './agent-runner-service.js'
 
 /**
  * Minimal target app exposing the agent HTTP surface: actor sign-in, the agent
@@ -104,7 +104,7 @@ const scriptedRunner = () => {
   return {
     run: async (params: {
       outputSchema?: unknown
-    }): Promise<AIAgentStepResult> => {
+    }): Promise<AgentStepResult> => {
       const props =
         (params.outputSchema as { properties?: Record<string, unknown> })
           ?.properties ?? {}
@@ -135,7 +135,7 @@ const wireRunner = () => {
       error: () => {},
       debug: () => {},
     },
-    aiAgentRunner: scriptedRunner(),
+    agentRunner: scriptedRunner(),
   } as any)
 }
 

package/src/services/http-personas.ts

@@ -43,7 +43,7 @@ export interface HttpPersonasConfig {
   /**
    * Default model a persona thinks with when `converse(...)` is called without
    * an explicit `model`. Its own turns/approvals/evaluation run in-process via
-   * the configured `aiAgentRunner`.
+   * the configured `agentRunner`.
    */
   model?: string
 }
@@ -107,8 +107,8 @@ export class HttpPersona implements ScenarioPersona {
   }
 
   async converse(options: ConverseOptions): Promise<ActorFlowVerdict> {
-    const { aiAgentRunner } = getSingletonServices()
-    if (!aiAgentRunner) {
+    const { agentRunner } = getSingletonServices()
+    if (!agentRunner) {
       throw new AIProviderNotConfiguredError()
     }
     const model = options.model ?? this.config.model
@@ -129,7 +129,7 @@ export class HttpPersona implements ScenarioPersona {
       approvals: options.approvals,
       model,
       maxTurns: options.maxTurns,
-      llm: (params) => aiAgentRunner.run(params),
+      llm: (params) => agentRunner.run(params),
       target: {
         run: (message) =>
           this.agentRun(options.agent, message, threadId, resourceId),

package/src/services/{in-memory-ai-run-state-service.ts → in-memory-agent-run-state-service.ts}

@@ -1,17 +1,17 @@
 import type {
-  AIRunStateService,
+  AgentRunStateService,
   CreateRunInput,
   SaveScoreInput,
-} from './ai-run-state-service.js'
+} from './agent-run-state-service.js'
 import type {
   AgentRunState,
   PendingApproval,
-} from '../wirings/ai-agent/ai-agent.types.js'
-import type { AIRunScore } from '../wirings/ai-scorer/ai-scorer.types.js'
+} from '../wirings/agent/agent.types.js'
+import type { AgentRunScore } from '../wirings/agent-scorer/agent-scorer.types.js'
 
-export class InMemoryAIRunStateService implements AIRunStateService {
+export class InMemoryAgentRunStateService implements AgentRunStateService {
   private runs = new Map<string, AgentRunState>()
-  private scores = new Map<string, AIRunScore[]>()
+  private scores = new Map<string, AgentRunScore[]>()
   private counter = 0
 
   async createRun(run: CreateRunInput): Promise<string> {
@@ -81,7 +81,7 @@ export class InMemoryAIRunStateService implements AIRunStateService {
     this.scores.set(score.runId, existing)
   }
 
-  async getScores(runId: string): Promise<AIRunScore[]> {
+  async getScores(runId: string): Promise<AgentRunScore[]> {
     return [...(this.scores.get(runId) ?? [])]
   }
 }