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 Marmingefb45896588af
diff --git a/apps/server/integration/OrchestrationEngineHarness.integration.ts b/apps/server/integration/OrchestrationEngineHarness.integration.tsindex 484a4fa0f..643c6a2e9 100644--- a/apps/server/integration/OrchestrationEngineHarness.integration.ts+++ b/apps/server/integration/OrchestrationEngineHarness.integration.ts@@ -215,14 +215,13 @@ export const makeOrchestrationIntegrationHarness = Effect.gen(function* () {Layer.provide(providerSessionDirectoryLayer),Layer.provide(Layer.succeed(ProviderAdapterRegistry, registry)),);- const checkpointStoreLayer = CheckpointStoreLive.pipe(Layer.provide(NodeServices.layer));const runtimeServicesLayer = Layer.mergeAll(orchestrationLayer,OrchestrationProjectionSnapshotQueryLive,ProjectionCheckpointRepositoryLive,ProjectionPendingApprovalRepositoryLive,- checkpointStoreLayer,+ CheckpointStoreLive,providerLayer,);const runtimeIngestionLayer = ProviderRuntimeIngestionLive.pipe(diff --git a/apps/server/src/orchestration/Layers/CheckpointReactor.test.ts b/apps/server/src/orchestration/Layers/CheckpointReactor.test.tsindex 3da8faf73..bbec8f62b 100644--- a/apps/server/src/orchestration/Layers/CheckpointReactor.test.ts+++ b/apps/server/src/orchestration/Layers/CheckpointReactor.test.ts@@ -233,11 +233,12 @@ describe("CheckpointReactor", () => {Layer.provide(OrchestrationCommandReceiptRepositoryLive),Layer.provide(SqlitePersistenceMemory),);- const checkpointStoreLayer = CheckpointStoreLive.pipe(Layer.provide(NodeServices.layer));+const layer = CheckpointReactorLive.pipe(Layer.provideMerge(orchestrationLayer),Layer.provideMerge(Layer.succeed(ProviderService, provider.service)),- Layer.provideMerge(checkpointStoreLayer),+ Layer.provideMerge(CheckpointStoreLive),+ Layer.provideMerge(NodeServices.layer),);runtime = ManagedRuntime.make(layer);@@ -437,7 +438,9 @@ describe("CheckpointReactor", () => {await Effect.runPromise(Effect.sleep("40 millis"));const midReadModel = await Effect.runPromise(harness.engine.getReadModel());- const midThread = midReadModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));+ const midThread = midReadModel.threads.find(+ (entry) => entry.id === ThreadId.makeUnsafe("thread-1"),+ );expect(midThread?.checkpoints).toHaveLength(0);harness.provider.emit({diff --git a/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts b/apps/server/src/orchestration/Layers/ProjectionPipeline.test.tsindex 39b5929de..9b477f64a 100644--- a/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts+++ b/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts@@ -477,146 +477,150 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {}),);- it.effect("overwrites attachment file bytes when a message updates the same attachment index", () =>- Effect.gen(function* () {- const projectionPipeline = yield* OrchestrationProjectionPipeline;- const eventStore = yield* OrchestrationEventStore;- const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-projection-attachments-overwrite-"));- const now = new Date().toISOString();- const later = new Date(Date.now() + 1_000).toISOString();+ it.effect(+ "overwrites attachment file bytes when a message updates the same attachment index",+ () =>+ Effect.gen(function* () {+ const projectionPipeline = yield* OrchestrationProjectionPipeline;+ const eventStore = yield* OrchestrationEventStore;+ const stateDir = fs.mkdtempSync(+ path.join(os.tmpdir(), "t3-projection-attachments-overwrite-"),+ );+ const now = new Date().toISOString();+ const later = new Date(Date.now() + 1_000).toISOString();- const serverConfig = {- mode: "web",- port: 0,- host: undefined,- cwd: "/tmp/project-attachments",- keybindingsConfigPath: path.join(stateDir, "keybindings.json"),- stateDir,- staticDir: undefined,- devUrl: undefined,- noBrowser: true,- authToken: undefined,- autoBootstrapProjectFromCwd: false,- logWebSocketEvents: false,- } satisfies ServerConfigShape;+ const serverConfig = {+ mode: "web",+ port: 0,+ host: undefined,+ cwd: "/tmp/project-attachments",+ keybindingsConfigPath: path.join(stateDir, "keybindings.json"),+ stateDir,+ staticDir: undefined,+ devUrl: undefined,+ noBrowser: true,+ authToken: undefined,+ autoBootstrapProjectFromCwd: false,+ logWebSocketEvents: false,+ } satisfies ServerConfigShape;- yield* eventStore.append({- type: "project.created",- eventId: EventId.makeUnsafe("evt-overwrite-1"),- aggregateKind: "project",- aggregateId: ProjectId.makeUnsafe("project-overwrite"),- occurredAt: now,- commandId: CommandId.makeUnsafe("cmd-overwrite-1"),- causationEventId: null,- correlationId: CommandId.makeUnsafe("cmd-overwrite-1"),- metadata: {},- payload: {- projectId: ProjectId.makeUnsafe("project-overwrite"),- title: "Project Overwrite",- workspaceRoot: "/tmp/project-overwrite",- defaultModel: null,- scripts: [],- createdAt: now,- updatedAt: now,- },- });-- yield* eventStore.append({- type: "thread.created",- eventId: EventId.makeUnsafe("evt-overwrite-2"),- aggregateKind: "thread",- aggregateId: ThreadId.makeUnsafe("thread-overwrite"),- occurredAt: now,- commandId: CommandId.makeUnsafe("cmd-overwrite-2"),- causationEventId: null,- correlationId: CommandId.makeUnsafe("cmd-overwrite-2"),- metadata: {},- payload: {- threadId: ThreadId.makeUnsafe("thread-overwrite"),- projectId: ProjectId.makeUnsafe("project-overwrite"),- title: "Thread Overwrite",- model: "gpt-5-codex",- branch: null,- worktreePath: null,- createdAt: now,- updatedAt: now,- },- });+ yield* eventStore.append({+ type: "project.created",+ eventId: EventId.makeUnsafe("evt-overwrite-1"),+ aggregateKind: "project",+ aggregateId: ProjectId.makeUnsafe("project-overwrite"),+ occurredAt: now,+ commandId: CommandId.makeUnsafe("cmd-overwrite-1"),+ causationEventId: null,+ correlationId: CommandId.makeUnsafe("cmd-overwrite-1"),+ metadata: {},+ payload: {+ projectId: ProjectId.makeUnsafe("project-overwrite"),+ title: "Project Overwrite",+ workspaceRoot: "/tmp/project-overwrite",+ defaultModel: null,+ scripts: [],+ createdAt: now,+ updatedAt: now,+ },+ });- yield* eventStore.append({- type: "thread.message-sent",- eventId: EventId.makeUnsafe("evt-overwrite-3"),- aggregateKind: "thread",- aggregateId: ThreadId.makeUnsafe("thread-overwrite"),- occurredAt: now,- commandId: CommandId.makeUnsafe("cmd-overwrite-3"),- causationEventId: null,- correlationId: CommandId.makeUnsafe("cmd-overwrite-3"),- metadata: {},- payload: {- threadId: ThreadId.makeUnsafe("thread-overwrite"),- messageId: MessageId.makeUnsafe("message-overwrite"),- role: "user",- text: "first image",- attachments: [- {- type: "image",- name: "file.png",- mimeType: "image/png",- sizeBytes: 5,- dataUrl: "data:image/png;base64,SGVsbG8=",- },- ],- turnId: null,- streaming: false,- createdAt: now,- updatedAt: now,- },- });+ yield* eventStore.append({+ type: "thread.created",+ eventId: EventId.makeUnsafe("evt-overwrite-2"),+ aggregateKind: "thread",+ aggregateId: ThreadId.makeUnsafe("thread-overwrite"),+ occurredAt: now,+ commandId: CommandId.makeUnsafe("cmd-overwrite-2"),+ causationEventId: null,+ correlationId: CommandId.makeUnsafe("cmd-overwrite-2"),+ metadata: {},+ payload: {+ threadId: ThreadId.makeUnsafe("thread-overwrite"),+ projectId: ProjectId.makeUnsafe("project-overwrite"),+ title: "Thread Overwrite",+ model: "gpt-5-codex",+ branch: null,+ worktreePath: null,+ createdAt: now,+ updatedAt: now,+ },+ });- yield* eventStore.append({- type: "thread.message-sent",- eventId: EventId.makeUnsafe("evt-overwrite-4"),- aggregateKind: "thread",- aggregateId: ThreadId.makeUnsafe("thread-overwrite"),- occurredAt: later,- commandId: CommandId.makeUnsafe("cmd-overwrite-4"),- causationEventId: null,- correlationId: CommandId.makeUnsafe("cmd-overwrite-4"),- metadata: {},- payload: {- threadId: ThreadId.makeUnsafe("thread-overwrite"),- messageId: MessageId.makeUnsafe("message-overwrite"),- role: "user",- text: "",- attachments: [- {- type: "image",- name: "file.png",- mimeType: "image/png",- sizeBytes: 5,- dataUrl: "data:image/png;base64,V29ybGQ=",- },- ],- turnId: null,- streaming: false,- createdAt: now,- updatedAt: later,- },- });+ yield* eventStore.append({+ type: "thread.message-sent",+ eventId: EventId.makeUnsafe("evt-overwrite-3"),+ aggregateKind: "thread",+ aggregateId: ThreadId.makeUnsafe("thread-overwrite"),+ occurredAt: now,+ commandId: CommandId.makeUnsafe("cmd-overwrite-3"),+ causationEventId: null,+ correlationId: CommandId.makeUnsafe("cmd-overwrite-3"),+ metadata: {},+ payload: {+ threadId: ThreadId.makeUnsafe("thread-overwrite"),+ messageId: MessageId.makeUnsafe("message-overwrite"),+ role: "user",+ text: "first image",+ attachments: [+ {+ type: "image",+ name: "file.png",+ mimeType: "image/png",+ sizeBytes: 5,+ dataUrl: "data:image/png;base64,SGVsbG8=",+ },+ ],+ turnId: null,+ streaming: false,+ createdAt: now,+ updatedAt: now,+ },+ });- yield* projectionPipeline.bootstrap.pipe(Effect.provideService(ServerConfig, serverConfig));+ yield* eventStore.append({+ type: "thread.message-sent",+ eventId: EventId.makeUnsafe("evt-overwrite-4"),+ aggregateKind: "thread",+ aggregateId: ThreadId.makeUnsafe("thread-overwrite"),+ occurredAt: later,+ commandId: CommandId.makeUnsafe("cmd-overwrite-4"),+ causationEventId: null,+ correlationId: CommandId.makeUnsafe("cmd-overwrite-4"),+ metadata: {},+ payload: {+ threadId: ThreadId.makeUnsafe("thread-overwrite"),+ messageId: MessageId.makeUnsafe("message-overwrite"),+ role: "user",+ text: "",+ attachments: [+ {+ type: "image",+ name: "file.png",+ mimeType: "image/png",+ sizeBytes: 5,+ dataUrl: "data:image/png;base64,V29ybGQ=",+ },+ ],+ turnId: null,+ streaming: false,+ createdAt: now,+ updatedAt: later,+ },+ });- const attachmentPath = path.join(- stateDir,- "attachments",- "thread-overwrite",- "message-overwrite-0.png",- );- assert.equal(fs.existsSync(attachmentPath), true);- assert.deepEqual(fs.readFileSync(attachmentPath), Buffer.from("V29ybGQ=", "base64"));- fs.rmSync(stateDir, { recursive: true, force: true });- }),+ yield* projectionPipeline.bootstrap.pipe(Effect.provideService(ServerConfig, serverConfig));++ const attachmentPath = path.join(+ stateDir,+ "attachments",+ "thread-overwrite",+ "message-overwrite-0.png",+ );+ assert.equal(fs.existsSync(attachmentPath), true);+ assert.deepEqual(fs.readFileSync(attachmentPath), Buffer.from("V29ybGQ=", "base64"));+ fs.rmSync(stateDir, { recursive: true, force: true });+ }),);it.effect("does not persist attachment files when projector transaction rolls back", () =>@@ -624,7 +628,9 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {const projectionPipeline = yield* OrchestrationProjectionPipeline;const eventStore = yield* OrchestrationEventStore;const sql = yield* SqlClient.SqlClient;- const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-projection-attachments-rollback-"));+ const stateDir = fs.mkdtempSync(+ path.join(os.tmpdir(), "t3-projection-attachments-rollback-"),+ );const now = new Date().toISOString();const serverConfig = {@@ -643,12 +649,10 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {} satisfies ServerConfigShape;const appendAndProject = (event: Parameters<typeof eventStore.append>[0]) =>- eventStore- .append(event)- .pipe(- Effect.flatMap((savedEvent) => projectionPipeline.projectEvent(savedEvent)),- Effect.provideService(ServerConfig, serverConfig),- );+ eventStore.append(event).pipe(+ Effect.flatMap((savedEvent) => projectionPipeline.projectEvent(savedEvent)),+ Effect.provideService(ServerConfig, serverConfig),+ );yield* appendAndProject({type: "project.created",@@ -780,12 +784,10 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {} satisfies ServerConfigShape;const appendAndProject = (event: Parameters<typeof eventStore.append>[0]) =>- eventStore- .append(event)- .pipe(- Effect.flatMap((savedEvent) => projectionPipeline.projectEvent(savedEvent)),- Effect.provideService(ServerConfig, serverConfig),- );+ eventStore.append(event).pipe(+ Effect.flatMap((savedEvent) => projectionPipeline.projectEvent(savedEvent)),+ Effect.provideService(ServerConfig, serverConfig),+ );yield* appendAndProject({type: "project.created",@@ -996,12 +998,10 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {} satisfies ServerConfigShape;const appendAndProject = (event: Parameters<typeof eventStore.append>[0]) =>- eventStore- .append(event)- .pipe(- Effect.flatMap((savedEvent) => projectionPipeline.projectEvent(savedEvent)),- Effect.provideService(ServerConfig, serverConfig),- );+ eventStore.append(event).pipe(+ Effect.flatMap((savedEvent) => projectionPipeline.projectEvent(savedEvent)),+ Effect.provideService(ServerConfig, serverConfig),+ );yield* appendAndProject({type: "project.created",@@ -1101,6 +1101,59 @@ projectionLayer("OrchestrationProjectionPipeline", (it) => {}),);+ it.effect("ignores unsafe thread ids for attachment cleanup paths", () =>+ Effect.gen(function* () {+ const projectionPipeline = yield* OrchestrationProjectionPipeline;+ const eventStore = yield* OrchestrationEventStore;+ const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), "t3-projection-attachments-unsafe-"));+ const now = new Date().toISOString();+ const attachmentsRootDir = path.join(stateDir, "attachments");+ const attachmentsSentinelPath = path.join(attachmentsRootDir, "sentinel.txt");+ const stateDirSentinelPath = path.join(stateDir, "state-sentinel.txt");+ fs.mkdirSync(attachmentsRootDir, { recursive: true });+ fs.writeFileSync(attachmentsSentinelPath, "keep-attachments-root", "utf8");+ fs.writeFileSync(stateDirSentinelPath, "keep-state-dir", "utf8");++ const serverConfig = {+ mode: "web",+ port: 0,+ host: undefined,+ cwd: "/tmp/project-attachments",+ keybindingsConfigPath: path.join(stateDir, "keybindings.json"),+ stateDir,+ staticDir: undefined,+ devUrl: undefined,+ noBrowser: true,+ authToken: undefined,+ autoBootstrapProjectFromCwd: false,+ logWebSocketEvents: false,+ } satisfies ServerConfigShape;++ yield* eventStore.append({+ type: "thread.deleted",+ eventId: EventId.makeUnsafe("evt-unsafe-thread-delete"),+ aggregateKind: "thread",+ aggregateId: ThreadId.makeUnsafe(".."),+ occurredAt: now,+ commandId: CommandId.makeUnsafe("cmd-unsafe-thread-delete"),+ causationEventId: null,+ correlationId: CorrelationId.makeUnsafe("cmd-unsafe-thread-delete"),+ metadata: {},+ payload: {+ threadId: ThreadId.makeUnsafe(".."),+ deletedAt: now,+ },+ });++ yield* projectionPipeline.bootstrap.pipe(Effect.provideService(ServerConfig, serverConfig));++ assert.equal(fs.existsSync(attachmentsRootDir), true);+ assert.equal(fs.existsSync(attachmentsSentinelPath), true);+ assert.equal(fs.existsSync(stateDirSentinelPath), true);+ fs.rmSync(stateDir, { recursive: true, force: true });+ }),+ );+it.effect("resumes from projector last_applied_sequence without replaying older events", () =>Effect.gen(function* () {const projectionPipeline = yield* OrchestrationProjectionPipeline;diff --git a/apps/server/src/orchestration/Layers/ProjectionPipeline.ts b/apps/server/src/orchestration/Layers/ProjectionPipeline.tsindex 2ded57a17..c518744d1 100644--- a/apps/server/src/orchestration/Layers/ProjectionPipeline.ts+++ b/apps/server/src/orchestration/Layers/ProjectionPipeline.ts@@ -77,6 +77,21 @@ interface AttachmentSideEffects {readonly prunedThreadRelativePaths: Map<string, Set<string>>;}+function toSafeThreadAttachmentSegment(threadId: string): string | null {+ const segment = encodeURIComponent(threadId);+ if (+ segment.length === 0 ||+ segment === "." ||+ segment === ".." ||+ segment.includes("/") ||+ segment.includes("\\") ||+ segment.includes("\0")+ ) {+ return null;+ }+ return segment;+}+function parseBase64DataUrl(dataUrl: string,): { readonly mimeType: string; readonly base64: string } | null {@@ -114,7 +129,14 @@ const materializeAttachmentsForProjection = Effect.fn(function* (input: {const path = yield* Path.Path;const attachmentsRootDir = path.join(serverConfig.value.stateDir, "attachments");- const threadSegment = encodeURIComponent(input.threadId);+ const threadSegment = toSafeThreadAttachmentSegment(input.threadId);+ if (!threadSegment) {+ yield* Effect.logWarning("skipping attachment materialization for unsafe thread id", {+ threadId: input.threadId,+ messageId: input.messageId,+ });+ return input.attachments;+ }const messageSegment = encodeURIComponent(input.messageId);return yield* Effect.forEach(@@ -282,7 +304,11 @@ function collectThreadAttachmentRelativePaths(threadId: string,messages: ReadonlyArray<ProjectionThreadMessage>,): Set<string> {- const threadPrefix = `${encodeURIComponent(threadId)}/`;+ const threadSegment = toSafeThreadAttachmentSegment(threadId);+ if (!threadSegment) {+ return new Set();+ }+ const threadPrefix = `${threadSegment}/`;const relativePaths = new Set<string>();for (const message of messages) {for (const attachment of message.attachments ?? []) {@@ -317,10 +343,18 @@ const runAttachmentSideEffects = Effect.fn(function* (input: {yield* Effect.forEach(input.sideEffects.deletedThreadIds,- (threadId) => {- const threadDir = input.path.join(attachmentsRootDir, encodeURIComponent(threadId));- return input.fileSystem.remove(threadDir, { recursive: true, force: true });- },+ (threadId) =>+ Effect.gen(function* () {+ const threadSegment = toSafeThreadAttachmentSegment(threadId);+ if (!threadSegment) {+ yield* Effect.logWarning("skipping attachment cleanup for unsafe thread id", {+ threadId,+ });+ return;+ }+ const threadDir = input.path.join(attachmentsRootDir, threadSegment);+ yield* input.fileSystem.remove(threadDir, { recursive: true, force: true });+ }),{ concurrency: 1 },);@@ -330,8 +364,13 @@ const runAttachmentSideEffects = Effect.fn(function* (input: {if (input.sideEffects.deletedThreadIds.has(threadId)) {return Effect.void;}- const threadDir = input.path.join(attachmentsRootDir, encodeURIComponent(threadId));return Effect.gen(function* () {+ const threadSegment = toSafeThreadAttachmentSegment(threadId);+ if (!threadSegment) {+ yield* Effect.logWarning("skipping attachment prune for unsafe thread id", { threadId });+ return;+ }+ const threadDir = input.path.join(attachmentsRootDir, threadSegment);const entries = yield* input.fileSystem.readDirectory(threadDir, { recursive: true }).pipe(Effect.catch(() => Effect.succeed([] as Array<string>)));@@ -601,16 +640,7 @@ const makeOrchestrationProjectionPipeline = Effect.gen(function* () {stageFileWrite: (pendingWrite) => {attachmentSideEffects.writes.push(pendingWrite);},- }).pipe(- Effect.provideService(Path.Path, path),- Effect.catch((cause) =>- Effect.logWarning("failed to persist message attachments", {- threadId: event.payload.threadId,- messageId: event.payload.messageId,- cause,- }).pipe(Effect.as(event.payload.attachments)),- ),- )+ }).pipe(Effect.provideService(Path.Path, path)): existingMessage?.attachments;yield* projectionThreadMessageRepository.upsert({messageId: event.payload.messageId,diff --git a/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts b/apps/server/src/provider/Layers/ProviderSessionDirectory.test.tsindex 0b223c2c7..471b38a54 100644--- a/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts+++ b/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts@@ -26,6 +26,7 @@ function makeDirectoryLayer<E, R>(persistenceLayer: Layer.Layer<SqlClient.SqlClireturn Layer.mergeAll(runtimeRepositoryLayer,ProviderSessionDirectoryLive.pipe(Layer.provide(runtimeRepositoryLayer)),+ NodeServices.layer,);}@@ -223,5 +224,5 @@ it.layer(makeDirectoryLayer(SqlitePersistenceMemory))("ProviderSessionDirectoryL}).pipe(Effect.provide(directoryLayer));fs.rmSync(tempDir, { recursive: true, force: true });- }).pipe(Effect.provide(NodeServices.layer)));+ }));});diff --git a/apps/server/src/serverLayers.ts b/apps/server/src/serverLayers.tsindex da8def168..d5de9b4e9 100644--- a/apps/server/src/serverLayers.ts+++ b/apps/server/src/serverLayers.ts@@ -61,16 +61,16 @@ export function makeServerRuntimeServicesLayer() {Layer.provide(OrchestrationEventStoreLive),Layer.provide(OrchestrationCommandReceiptRepositoryLive),);- const checkpointStoreLayer = CheckpointStoreLive.pipe(Layer.provide(NodeServices.layer));+const checkpointDiffQueryLayer = CheckpointDiffQueryLive.pipe(Layer.provideMerge(OrchestrationProjectionSnapshotQueryLive),- Layer.provideMerge(checkpointStoreLayer),+ Layer.provideMerge(CheckpointStoreLive),);const runtimeServicesLayer = Layer.mergeAll(orchestrationLayer,OrchestrationProjectionSnapshotQueryLive,- checkpointStoreLayer,+ CheckpointStoreLive,checkpointDiffQueryLayer,);const runtimeIngestionLayer = ProviderRuntimeIngestionLive.pipe(diff --git a/apps/server/src/wsServer.test.ts b/apps/server/src/wsServer.test.tsindex 728478667..f475dde9d 100644--- a/apps/server/src/wsServer.test.ts+++ b/apps/server/src/wsServer.test.ts@@ -4,7 +4,7 @@ import os from "node:os";import path from "node:path";import * as NodeServices from "@effect/platform-node/NodeServices";-import { Effect, Exit, Layer, PubSub, Scope, Stream } from "effect";+import { Effect, Exit, Layer, PlatformError, PubSub, Scope, Stream } from "effect";import { describe, expect, it, afterEach, vi } from "vitest";import { createServer } from "./wsServer";import WebSocket from "ws";@@ -40,13 +40,14 @@ import type {} from "@t3tools/contracts";import { TerminalManager, type TerminalManagerShape } from "./terminal/Services/Manager";import { makeSqlitePersistenceLive, SqlitePersistenceMemory } from "./persistence/Layers/Sqlite";-import { SqlClient } from "effect/unstable/sql";+import { SqlClient, SqlError } from "effect/unstable/sql";import { ProviderService, type ProviderServiceShape } from "./provider/Services/ProviderService";import { Open, type OpenShape } from "./open";import { GitManager, type GitManagerShape } from "./git/Services/GitManager.ts";import type { GitCoreShape } from "./git/Services/GitCore.ts";import { GitCore } from "./git/Services/GitCore.ts";import { GitCommandError, GitManagerError } from "./git/Errors.ts";+import { MigrationError } from "@effect/sql-sqlite-bun/SqliteMigrator";interface PendingMessages {queue: unknown[];@@ -354,7 +355,10 @@ describe("WebSocket Server", () => {async function createTestServer(options: {- persistenceLayer?: Layer.Layer<SqlClient.SqlClient, never>;+ persistenceLayer?: Layer.Layer<+ SqlClient.SqlClient,+ SqlError.SqlError | MigrationError | PlatformError.PlatformError+ >;cwd?: string;autoBootstrapProjectFromCwd?: boolean;logWebSocketEvents?: boolean;@@ -614,9 +618,9 @@ describe("WebSocket Server", () => {it("includes bootstrap ids in welcome when cwd project and thread already exist", async () => {const stateDir = makeTempDir("t3code-state-bootstrap-existing-");- const persistenceLayer = makeSqlitePersistenceLive(- path.join(stateDir, "state.sqlite"),- ).pipe(Layer.provide(NodeServices.layer)) as unknown as Layer.Layer<SqlClient.SqlClient, never>;+ const persistenceLayer = makeSqlitePersistenceLive(path.join(stateDir, "state.sqlite")).pipe(+ Layer.provide(NodeServices.layer),+ );const cwd = "/test/bootstrap-existing";server = await createTestServer({diff --git a/apps/server/src/wsServer.ts b/apps/server/src/wsServer.tsindex d382ab9d3..5f4fb9d61 100644--- a/apps/server/src/wsServer.ts+++ b/apps/server/src/wsServer.ts@@ -23,7 +23,6 @@ import {WsPush,WsResponse,} from "@t3tools/contracts";-import * as NodeServices from "@effect/platform-node/NodeServices";import * as NodeHttpServer from "@effect/platform-node/NodeHttpServer";import {Cause,@@ -787,6 +786,6 @@ export const createServer = Effect.fn(function* (): Effect.fn.Return<});export const ServerLive = Layer.succeed(Server, {- start: createServer().pipe(Effect.provide(NodeServices.layer)),+ start: createServer(),stopSignal: Effect.never,} satisfies ServerShape);