Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

chore: merge dev into desktop document continuation

Alfredo Lopezf56d85104072
diff --cc control-api/test/db.realPostgresMigration.integration.test.ts
index 7c02d431d,25ebd9eb9..e0ad938a4
--- a/control-api/test/db.realPostgresMigration.integration.test.ts
+++ b/control-api/test/db.realPostgresMigration.integration.test.ts
@@@ -30,7 -30,7 +30,8 @@@ import { PostgresGovernedSessionReplayR
import { projectAcceptedUsageEvents } from '../src/services/tracing/usageProjection.js'
import { ingestUsageEventsInTransaction } from '../src/services/usageEvents.js'
import { signRpcAccessToken } from '../src/utils/auth/rpcAuthToken.js'
+import { endPoolAndWaitForClients } from './helpers/realPostgresTeardown.js'
+ import './realPostgres.requirement.ts'
type PrivilegeExpectation = Record<string, Set<string>>
diff --cc control-api/test/oauth.reactiveRefreshLock.realPostgres.integration.test.ts
index a358c6862,51183fe6f..23c7df4c3
--- a/control-api/test/oauth.reactiveRefreshLock.realPostgres.integration.test.ts
+++ b/control-api/test/oauth.reactiveRefreshLock.realPostgres.integration.test.ts
@@@ -75,15 -80,15 +81,15 @@@ describeRealPostgres('oauth reactive re
})
afterAll(async () => {
- await endPoolAndWaitForClients(dbPool)
- if (adminPool) {
- await adminPool.query(
- `SELECT pg_terminate_backend(pid) FROM pg_stat_activity
- WHERE datname = $1 AND pid <> pg_backend_pid()`,
- [database]
- )
- await adminPool.query(`DROP DATABASE IF EXISTS "${database.replace(/"/g, '""')}"`)
- await adminPool.end()
+ try {
- await dbPool?.end()
++ await endPoolAndWaitForClients(dbPool)
+ await Promise.all(clientClosures)
+ if (adminPool) {
+ // A remaining connection must fail DROP rather than be force-terminated.
+ await adminPool.query(`DROP DATABASE IF EXISTS "${database.replace(/"/g, '""')}"`)
+ }
+ } finally {
+ await adminPool?.end()
}
})
diff --cc control-api/test/services.adminAuthDelete.realPostgres.integration.test.ts
index 666e4b364,601ff4df6..0e688fd68
--- a/control-api/test/services.adminAuthDelete.realPostgres.integration.test.ts
+++ b/control-api/test/services.adminAuthDelete.realPostgres.integration.test.ts
@@@ -3,8 -3,8 +3,9 @@@ import { randomBytes, randomUUID } fro
import { Pool } from 'pg'
import { initDb, pool } from '../src/db.js'
import { deleteControlAdmin } from '../src/services/adminAuthService.js'
+import { endPoolAndWaitForClients } from './helpers/realPostgresTeardown.js'
import './realPostgres.requirement.ts'
+ import { waitForDatabaseConnectionsToClose } from './realPostgresCleanup.ts'
const adminUrl = process.env.CONTROL_API_REAL_PG_ADMIN_URL
const describeRealPostgres = adminUrl ? describe : describe.skip
@@@ -75,15 -75,14 +76,14 @@@ describeRealPostgres('deleteControlAdmi
afterAll(async () => {
querySpy?.mockRestore()
connectSpy?.mockRestore()
+ await endPoolAndWaitForClients(testPool)
if (!adminPool) return
- await adminPool.query(
- `SELECT pg_terminate_backend(pid) FROM pg_stat_activity
- WHERE datname = $1 AND pid <> pg_backend_pid()`,
- [database]
- )
- await adminPool.query(`DROP DATABASE IF EXISTS ${quoteIdent(database)}`)
- await adminPool.end()
+ try {
- await testPool?.end()
+ await waitForDatabaseConnectionsToClose(adminPool, database)
+ await adminPool.query(`DROP DATABASE IF EXISTS ${quoteIdent(database)}`)
+ } finally {
+ await adminPool.end()
+ }
})
// Regression for the plain DELETE /admin/control-admins/:id path (replaceInviter
diff --cc control-api/test/services.controlAdminReplaceInviter.realPostgres.integration.test.ts
index 17210d380,59ca26618..d1a208289
--- a/control-api/test/services.controlAdminReplaceInviter.realPostgres.integration.test.ts
+++ b/control-api/test/services.controlAdminReplaceInviter.realPostgres.integration.test.ts
@@@ -23,8 -23,8 +23,9 @@@ import
createSilentInvitationForTeams,
} from '../src/services/directory/membership.js'
import { retireDesktopUser } from '../src/services/directory/users.js'
+import { endPoolAndWaitForClients } from './helpers/realPostgresTeardown.js'
import './realPostgres.requirement.ts'
+ import { waitForDatabaseConnectionsToClose } from './realPostgresCleanup.ts'
const adminUrl = process.env.CONTROL_API_REAL_PG_ADMIN_URL
const describeRealPostgres = adminUrl ? describe : describe.skip
@@@ -182,15 -182,14 +183,14 @@@ describeRealPostgres('control admin rep
afterAll(async () => {
querySpy?.mockRestore()
connectSpy?.mockRestore()
+ await endPoolAndWaitForClients(testPool)
if (!adminPool) return
- await adminPool.query(
- `SELECT pg_terminate_backend(pid) FROM pg_stat_activity
- WHERE datname = $1 AND pid <> pg_backend_pid()`,
- [database]
- )
- await adminPool.query(`DROP DATABASE IF EXISTS ${quoteIdent(database)}`)
- await adminPool.end()
+ try {
- await testPool?.end()
+ await waitForDatabaseConnectionsToClose(adminPool, database)
+ await adminPool.query(`DROP DATABASE IF EXISTS ${quoteIdent(database)}`)
+ } finally {
+ await adminPool.end()
+ }
})
it('stores replaceInviter and exposes it with the inviter on every invitation read', async () => {
diff --cc control-api/test/services.directory.userRetirement.realPostgres.integration.test.ts
index 9d6d3b350,245b4d5d1..455a46bbc
--- a/control-api/test/services.directory.userRetirement.realPostgres.integration.test.ts
+++ b/control-api/test/services.directory.userRetirement.realPostgres.integration.test.ts
@@@ -4,7 -4,7 +4,8 @@@ import { Pool } from 'pg
import { initDb, pool } from '../src/db.js'
import { retireDesktopUser } from '../src/services/directory/users.js'
import { gfsDesktopOperatorLinkService } from '../src/services/gfsDesktopOperatorLinkService.js'
+import { endPoolAndWaitForClients } from './helpers/realPostgresTeardown.js'
+ import { waitForDatabaseConnectionsToClose } from './realPostgresCleanup.ts'
const adminUrl = process.env.CONTROL_API_REAL_PG_ADMIN_URL
const describeRealPostgres = adminUrl ? describe : describe.skip
@@@ -57,15 -57,14 +58,14 @@@ describeRealPostgres('retireDesktopUse
afterAll(async () => {
corePoolConnectSpy?.mockRestore()
+ await endPoolAndWaitForClients(testPool)
if (!adminPool) return
- await adminPool.query(
- `SELECT pg_terminate_backend(pid) FROM pg_stat_activity
- WHERE datname = $1 AND pid <> pg_backend_pid()`,
- [database]
- )
- await adminPool.query(`DROP DATABASE IF EXISTS ${quoteIdent(database)}`)
- await adminPool.end()
+ try {
- await testPool?.end()
+ await waitForDatabaseConnectionsToClose(adminPool, database)
+ await adminPool.query(`DROP DATABASE IF EXISTS ${quoteIdent(database)}`)
+ } finally {
+ await adminPool.end()
+ }
})
it('persists the legacy deleted outcome and returns it on an identical replay', async () => {
diff --cc desktop-app/src/ipc.ts
index 0f1c2623b,4b9fc50aa..340dcc39a
--- a/desktop-app/src/ipc.ts
+++ b/desktop-app/src/ipc.ts
@@@ -30,8 -30,8 +30,9 @@@ import
type ChatAuthorityScope,
type ChatDeleteFence,
DesktopRuntimeConfig,
+ EntityChangeStreamEvent,
HostActivityStreamEvent,
+ HostMessageAttachment,
HostMessageRequest,
HostStatusStreamEvent,
TaskProgressStreamEvent,
diff --cc desktop-app/ui/src/hooks/domain/__tests__/useAgentChatController.test.tsx
index fafc4617b,c817cbd01..802ef1bb5
--- a/desktop-app/ui/src/hooks/domain/__tests__/useAgentChatController.test.tsx
+++ b/desktop-app/ui/src/hooks/domain/__tests__/useAgentChatController.test.tsx
@@@ -12,18 -12,7 +12,18 @@@
*/
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { makeTaskKey } from '@contexts/AgentTaskTrackerContext/types'
- import { act, waitFor } from '@testing-library/react'
+ import { act, cleanup, waitFor as rtlWaitFor } from '@testing-library/react'
+import { classifyBytes } from '@clerum/gfs-interaction-policy'
+import { base64Length, composerNonImageShareBytes } from '@lib/composerFileAdmission'
+import { buildComposerFileReferences } from '@lib/composerFileReferences'
+import { buildComposerRequestContent } from '@lib/composerReferencesPrompt'
+import { loadHostModels, resetHostModelSelectionStore } from '@lib/hostModelSelectionStore'
+import type { HostModelsResult } from '../../../../../src/types'
+import type {
+ ComposerGlobalFileReference,
+ ComposerImageAttachment,
+ ReadyComposerFileAttachment,
+} from '../../../uiTypes'
import { renderController } from './__fixtures__/controllerHarness'
import { type MockClerum, installMockClerum, uninstallMockClerum } from './__fixtures__/mockClerum'
diff --cc tests/e2e/package-lock.json
index 5111bfe43,c4e9efb72..5a53b1c45
--- a/tests/e2e/package-lock.json
+++ b/tests/e2e/package-lock.json
@@@ -1,12 -1,12 +1,12 @@@
{
"name": "clerum-e2e-tests",
- "version": "0.1.98",
- "version": "0.1.97",
++ "version": "0.1.99",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-e2e-tests",
- "version": "0.1.98",
- "version": "0.1.97",
++ "version": "0.1.99",
"devDependencies": {
"@clerum/llm-provider-attempt-contract": "file:../../packages/llm-provider-attempt-contract",
"@types/jsonwebtoken": "^9.0.10",
diff --cc tests/e2e/package.json
index c27e783d6,e3c2c5a98..8cdb46303
--- a/tests/e2e/package.json
+++ b/tests/e2e/package.json
@@@ -1,6 -1,6 +1,6 @@@
{
"name": "clerum-e2e-tests",
- "version": "0.1.98",
- "version": "0.1.97",
++ "version": "0.1.99",
"private": true,
"type": "module",
"scripts": {