Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
simplify layers
Julius Marminge268bb4bfa3c2
diff --git a/apps/server/integration/OrchestrationEngineHarness.integration.ts b/apps/server/integration/OrchestrationEngineHarness.integration.tsindex 90197f009..412973950 100644--- a/apps/server/integration/OrchestrationEngineHarness.integration.ts+++ b/apps/server/integration/OrchestrationEngineHarness.integration.ts@@ -253,22 +253,12 @@ export const makeOrchestrationIntegrationHarness = (? makeProviderServiceLive().pipe(Layer.provide(providerSessionDirectoryLayer),Layer.provide(realCodexRegistry),- Layer.provide(- Layer.succeed(AnalyticsService, {- record: () => Effect.void,- flush: Effect.void,- }),- ),+ Layer.provide(AnalyticsService.layerTest),): makeProviderServiceLive().pipe(Layer.provide(providerSessionDirectoryLayer),Layer.provide(fakeRegistry!),- Layer.provide(- Layer.succeed(AnalyticsService, {- record: () => Effect.void,- flush: Effect.void,- }),- ),+ Layer.provide(AnalyticsService.layerTest),);const runtimeServicesLayer = Layer.mergeAll(diff --git a/apps/server/integration/providerService.integration.test.ts b/apps/server/integration/providerService.integration.test.tsindex 7c0aceebd..53b4f30a8 100644--- a/apps/server/integration/providerService.integration.test.ts+++ b/apps/server/integration/providerService.integration.test.ts@@ -60,10 +60,7 @@ const makeIntegrationFixture = Effect.gen(function* () {const shared = Layer.mergeAll(directoryLayer,Layer.succeed(ProviderAdapterRegistry, registry),- Layer.succeed(AnalyticsService, {- record: () => Effect.void,- flush: Effect.void,- }),+ AnalyticsService.layerTest,).pipe(Layer.provide(SqlitePersistenceMemory));const layer = makeProviderServiceLive().pipe(Layer.provide(shared));diff --git a/apps/server/src/main.test.ts b/apps/server/src/main.test.tsindex 613655fe5..15e363d07 100644--- a/apps/server/src/main.test.ts+++ b/apps/server/src/main.test.ts@@ -49,10 +49,7 @@ const testLayer = Layer.mergeAll(openBrowser: (_target: string) => Effect.void,openInEditor: () => Effect.void,} satisfies OpenShape),- Layer.succeed(AnalyticsService, {- record: () => Effect.void,- flush: Effect.void,- }),+ AnalyticsService.layerTest,FetchHttpClient.layer,NodeServices.layer,);diff --git a/apps/server/src/provider/Layers/ProviderService.test.ts b/apps/server/src/provider/Layers/ProviderService.test.tsindex e3a2fb1ec..255c6fca0 100644--- a/apps/server/src/provider/Layers/ProviderService.test.ts+++ b/apps/server/src/provider/Layers/ProviderService.test.ts@@ -215,11 +215,6 @@ function makeFakeCodexAdapter(provider: ProviderKind = "codex") {const sleep = (ms: number) =>Effect.promise(() => new Promise<void>((resolve) => setTimeout(resolve, ms)));-const noopAnalyticsLayer = Layer.succeed(AnalyticsService, {- record: () => Effect.void,- flush: Effect.void,-});-function makeProviderServiceLayer() {const codex = makeFakeCodexAdapter();const registry: typeof ProviderAdapterRegistry.Service = {@@ -241,7 +236,7 @@ function makeProviderServiceLayer() {makeProviderServiceLive().pipe(Layer.provide(providerAdapterLayer),Layer.provide(directoryLayer),- Layer.provideMerge(noopAnalyticsLayer),+ Layer.provideMerge(AnalyticsService.layerTest),),directoryLayer,@@ -288,7 +283,7 @@ it.effect("ProviderServiceLive keeps persisted resumable sessions on startup", (const providerLayer = makeProviderServiceLive().pipe(Layer.provide(Layer.succeed(ProviderAdapterRegistry, registry)),Layer.provide(directoryLayer),- Layer.provide(noopAnalyticsLayer),+ Layer.provide(AnalyticsService.layerTest),);yield* Effect.gen(function* () {@@ -347,7 +342,7 @@ it.effect(const firstProviderLayer = makeProviderServiceLive().pipe(Layer.provide(Layer.succeed(ProviderAdapterRegistry, firstRegistry)),Layer.provide(firstDirectoryLayer),- Layer.provide(noopAnalyticsLayer),+ Layer.provide(AnalyticsService.layerTest),);const startedSession = yield* Effect.gen(function* () {@@ -390,7 +385,7 @@ it.effect(const secondProviderLayer = makeProviderServiceLive().pipe(Layer.provide(Layer.succeed(ProviderAdapterRegistry, secondRegistry)),Layer.provide(secondDirectoryLayer),- Layer.provide(noopAnalyticsLayer),+ Layer.provide(AnalyticsService.layerTest),);secondCodex.startSession.mockClear();diff --git a/apps/server/src/telemetry/Layers/AnalyticsService.ts b/apps/server/src/telemetry/Layers/AnalyticsService.tsindex 83e5496e4..9881e910d 100644--- a/apps/server/src/telemetry/Layers/AnalyticsService.ts+++ b/apps/server/src/telemetry/Layers/AnalyticsService.ts@@ -96,26 +96,28 @@ const makeAnalyticsService = Effect.gen(function* () {});const flush: AnalyticsServiceShape["flush"] = Effect.gen(function* () {- const batch = yield* Ref.modify(bufferRef, (current) => {- if (current.length === 0) {- return [[] as ReadonlyArray<BufferedAnalyticsEvent>, current] as const;- }- const nextBatch = current.slice(0, telemetryConfig.flushBatchSize);- const remaining = current.slice(nextBatch.length);- return [nextBatch, remaining] as const;- });+ while (true) {+ const batch = yield* Ref.modify(bufferRef, (current) => {+ if (current.length === 0) {+ return [[] as ReadonlyArray<BufferedAnalyticsEvent>, current] as const;+ }+ const nextBatch = current.slice(0, telemetryConfig.flushBatchSize);+ const remaining = current.slice(nextBatch.length);+ return [nextBatch, remaining] as const;+ });- if (batch.length === 0) {- return;- }+ if (batch.length === 0) {+ return;+ }- yield* sendBatch(batch).pipe(- Effect.catch((error) =>- Ref.update(bufferRef, (current) => [...batch, ...current]).pipe(- Effect.flatMap(() => Effect.fail(error)),+ yield* sendBatch(batch).pipe(+ Effect.catch((error) =>+ Ref.update(bufferRef, (current) => [...batch, ...current]).pipe(+ Effect.flatMap(() => Effect.fail(error)),+ ),),- ),- );+ );+ }}).pipe(Effect.catch((cause) => Effect.logError("Failed to flush telemetry", { cause })));const record: AnalyticsServiceShape["record"] = Effect.fnUntraced(function* (event, properties) {