@things-factory/ai-client-base 10.1.244 → 10.1.246

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/ai-client-base",
-  "version": "10.1.244",
+  "version": "10.1.246",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "heartyoh",
@@ -24,11 +24,11 @@
   "dependencies": {
     "@anthropic-ai/sdk": "^0.40.0",
     "@google/generative-ai": "^0.24.0",
-    "@things-factory/auth-base": "^10.1.244",
+    "@things-factory/auth-base": "^10.1.246",
     "@things-factory/env": "^10.1.149",
-    "@things-factory/setting-base": "^10.1.244",
-    "@things-factory/shell": "^10.1.234",
+    "@things-factory/setting-base": "^10.1.246",
+    "@things-factory/shell": "^10.1.246",
     "openai": "^4.0.0"
   },
-  "gitHead": "f80402ed4e682642b9dfb3ce68d8b00d591d44ee"
+  "gitHead": "46c0d3c93edf765cc1f13040b1f9d03fd1d9e60b"
 }

package/server/service/agent/ai-client-for.test.ts

@@ -4,15 +4,22 @@
  * design/ai/agent-settings.md §4).
  */
 const saved: any[] = []
+/* How long a usage row takes to write: 0, or slower than the answer it records. */
+const mockWrite = { ms: 0 }
 
 jest.mock('@things-factory/shell', () => ({
   ...jest.requireActual('@things-factory/shell'),
-  getRepository: jest.fn(() => ({ save: async (rows: any[]) => saved.push(...rows) }))
+  getRepository: jest.fn(() => ({
+    save: async (rows: any[]) => {
+      if (mockWrite.ms) await new Promise(resolve => setTimeout(resolve, mockWrite.ms))
+      saved.push(...rows)
+    }
+  }))
 }))
 jest.mock('./agent-directory', () => ({ readAiAgentDirectory: jest.fn() }))
 
 import { readAiAgentDirectory } from './agent-directory'
-import { aiClientFor, hourOf, outcomeOf, pickAgent } from './ai-client-for'
+import { aiClientFor, aiUsageRecorded, hourOf, outcomeOf, pickAgent } from './ai-client-for'
 import { registerAIProvider } from '../factory'
 
 const entry = (id: string, extra: any = {}) => ({
@@ -49,6 +56,7 @@ const flush = () => new Promise(resolve => setImmediate(resolve))
 beforeEach(() => {
   saved.length = 0
   replies = []
+  mockWrite.ms = 0
 })
 
 describe('which agent answers', () => {
@@ -115,6 +123,16 @@ describe('usage', () => {
     expect(saved[0].creator).toBeUndefined()
   })
 
+  /* A script closing its database after its last call (figure-ai-scenarios-agent.cjs) waits for the rows first. */
+  it('the rows still being written are waited for: none is left to a database closed after the last answer', async () => {
+    mockWrite.ms = 30
+    const client = await aiClientFor({ domain: { id: 'plant' } as any })
+    await client.chatWithTools!([], [], {})
+    expect(saved).toHaveLength(0)
+    await aiUsageRecorded()
+    expect(saved).toHaveLength(2)
+  })
+
   it('the caller\'s own usage listener still hears every request', async () => {
     const heard: any[] = []
     const client = await aiClientFor({ domain: { id: 'plant' } as any })

package/server/service/agent/ai-client-for.ts

@@ -32,6 +32,17 @@ export interface AgentClient extends AIClient {
   readonly agent: { id: string; name: string; provider: string; model: string }
 }
 
+/* The usage rows still being written: a request's answer does not wait for its row. */
+const recording = new Set<Promise<unknown>>()
+
+/**
+ * Once every usage row asked for so far is written (or failed and said so). For a process that closes its database
+ * after its last call -- a script running scenarios -- so the last rows are not lost to a closed handle.
+ */
+export async function aiUsageRecorded(): Promise<void> {
+  while (recording.size) await Promise.allSettled([...recording])
+}
+
 export async function aiClientFor(request: AiClientRequest): Promise<AgentClient> {
   if (_testing) return _testing(request)
   if (!request.domain) throw new Error('aiClientFor needs the domain the call is made in')
@@ -133,9 +144,11 @@ function meter(client: AIClient, entry: AiAgentEntry, request: AiClientRequest):
     }))
     /* Outside the caller's transaction: a rolled-back write still spent the tokens. By name, so the decorated entity
        stays out of this module's imports. */
-    getRepository<AiUsage>('AiUsage')
+    const written: Promise<unknown> = getRepository<AiUsage>('AiUsage')
       .save(rows as any)
       .catch(error => console.error('[ai-client-base] could not record AI usage:', error?.message ?? error))
+      .finally(() => recording.delete(written))
+    recording.add(written)
   }
 
   const metered: AgentClient = {