Skip to content

Commit da5fa81

Browse files
refactor(server): one module per service instead of Services/ and Layers/ folders
ProviderRegistry, ProviderAuthService, ProviderInstanceRegistry, OrchestrationCommandReceipts and OrchestrationEventStore each had their tag in Services/ and their layer in Layers/. Each is now one module: types, the tag with its interface inline, make, then layer. Callers import it once as a namespace, and the `…Layer` aliases that worked around the split (ProviderRegistryLayer, OrchestrationEventStoreLayer, OrchestrationCommandReceiptsLayer, AcpRegistryCatalogLayer, ProviderOrchestrationAdapterInfrastructureLayer, ProviderInstanceRegistryLive) collapse into it. The separate `…Shape` interfaces are gone; the few consumers use `Foo.Foo["Service"]`. Service keys follow the new paths, as the Effect language service requires. Importers, test fixture paths, shard weights and doc links point at the new locations. No behavior change. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
1 parent b679334 commit da5fa81

173 files changed

Lines changed: 1047 additions & 1087 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cursor/rules/cursor-cloud.mdc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ Gradle auto-downloads any additional pinned SDK packages on demand.
6969
## Known flaky tests (unrelated to setup)
7070

7171
- `apps/server/src/git/GitManager.test.ts` (cross-repo PR metadata, can time out at 12s).
72-
- `apps/server/src/provider/Layers/ProviderRegistry.test.ts` (codex binaryPath re-probe ordering).
72+
- `apps/server/src/provider/ProviderRegistry.test.ts` (codex binaryPath re-probe ordering).

‎apps/server/integration/transferBudgetV2.integration.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import * as HttpApi from "effect/http-api/HttpApi";
3535
import * as HttpApiBuilder from "effect/http-api/HttpApiBuilder";
3636
import { HttpRouter, HttpServer } from "effect/http";
3737
import { Rpc, RpcGroup, RpcServer, RpcSerialization } from "effect/rpc";
38-
import * as SqlitePersistence from "../src/persistence/Layers/Sqlite.ts";
39-
import * as OrchestrationEventStore from "../src/persistence/Layers/OrchestrationEventStore.ts";
38+
import * as SqlitePersistence from "../src/persistence/Sqlite.ts";
39+
import * as OrchestrationEventStore from "../src/persistence/OrchestrationEventStore.ts";
4040
import * as EventStore from "../src/orchestration-v2/EventStore.ts";
4141
import * as EventSink from "../src/orchestration-v2/EventSink.ts";
4242
import * as ProjectionStore from "../src/orchestration-v2/ProjectionStore.ts";

‎apps/server/scripts/migrate-dev-db.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ export const runMigrateDevDb = Effect.fn("runMigrateDevDb")(function* (
476476
yield* Console.log("Running migrations on the snapshot...");
477477
const executed = yield* Effect.gen(function* () {
478478
const sql = yield* SqlClient.SqlClient;
479-
// Mirror server boot (persistence/Layers/Sqlite.ts).
479+
// Mirror server boot (persistence/Sqlite.ts).
480480
yield* sql.unsafe("PRAGMA foreign_keys = ON").unprepared;
481481
return yield* runMigrations();
482482
}).pipe(

‎apps/server/scripts/record-codex-app-server-replay-fixture.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as NodeOS from "node:os";
22

33
import { CODEX_THREAD_CONFIG } from "../src/orchestration-v2/Adapters/CodexAdapterV2.ts";
44
import { revertCodexThread } from "../src/provider/CodexThreadRevert.ts";
5-
import { buildCodexInitializeParams } from "../src/provider/Layers/CodexProvider.ts";
5+
import { buildCodexInitializeParams } from "../src/provider/CodexProvider.ts";
66
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
77
import * as NodeServices from "@effect/platform-node/NodeServices";
88
import { HostProcessEnvironment } from "@t3tools/shared/hostProcess";

‎apps/server/src/auth/EnvironmentAuth.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import * as SqlClient from "effect/sql/SqlClient";
1010
import * as ServerConfig from "../config.ts";
1111
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
1212
import * as PersistenceErrors from "../persistence/Errors.ts";
13-
import * as SqlitePersistence from "../persistence/Layers/Sqlite.ts";
13+
import * as SqlitePersistence from "../persistence/Sqlite.ts";
1414
import * as PairingGrantStore from "./PairingGrantStore.ts";
1515
import * as EnvironmentAuth from "./EnvironmentAuth.ts";
1616

‎apps/server/src/auth/EnvironmentAuth.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import * as ServerSecretStore from "./ServerSecretStore.ts";
3838
import * as SessionStore from "./SessionStore.ts";
3939
import { REUSABLE_DEV_SESSION_EXPIRES_AT, resolveReusableDevAuth } from "./ReusableDevAuth.ts";
4040
import { verifyRequestDpopProof } from "./dpop.ts";
41-
import * as SqlitePersistence from "../persistence/Layers/Sqlite.ts";
41+
import * as SqlitePersistence from "../persistence/Sqlite.ts";
4242

4343
const DEFAULT_SESSION_SUBJECT = "cli-issued-session";
4444
export const INTERNAL_ADMINISTRATIVE_BOOTSTRAP_SUBJECT = "administrative-bootstrap";

‎apps/server/src/auth/EnvironmentAuthAdmin.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as Layer from "effect/Layer";
55

66
import * as ServerConfig from "../config.ts";
77
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
8-
import * as SqlitePersistence from "../persistence/Layers/Sqlite.ts";
8+
import * as SqlitePersistence from "../persistence/Sqlite.ts";
99
import * as EnvironmentAuth from "./EnvironmentAuth.ts";
1010
import * as ServerSecretStore from "./ServerSecretStore.ts";
1111
import * as SessionStore from "./SessionStore.ts";

‎apps/server/src/auth/PairingGrantStore.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import * as TestClock from "effect/testing/TestClock";
1010
import * as ServerConfig from "../config.ts";
1111
import * as AuthPairingLinks from "../persistence/AuthPairingLinks.ts";
1212
import { PersistenceSqlError } from "../persistence/Errors.ts";
13-
import * as SqlitePersistence from "../persistence/Layers/Sqlite.ts";
13+
import * as SqlitePersistence from "../persistence/Sqlite.ts";
1414
import * as PairingGrantStore from "./PairingGrantStore.ts";
1515

1616
const layerServerConfig = (

‎apps/server/src/auth/SessionStore.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import * as ServerConfig from "../config.ts";
1616
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
1717
import { PersistenceSqlError } from "../persistence/Errors.ts";
1818

19-
import * as SqlitePersistence from "../persistence/Layers/Sqlite.ts";
19+
import * as SqlitePersistence from "../persistence/Sqlite.ts";
2020
import * as AuthSessions from "../persistence/AuthSessions.ts";
2121
import * as SessionStore from "./SessionStore.ts";
2222
import * as ServerSecretStore from "./ServerSecretStore.ts";

‎apps/server/src/auth/http.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import * as HttpRouter from "effect/http/HttpRouter";
1515

1616
import * as ServerConfig from "../config.ts";
1717
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
18-
import * as SqlitePersistence from "../persistence/Layers/Sqlite.ts";
18+
import * as SqlitePersistence from "../persistence/Sqlite.ts";
1919
import * as EnvironmentAuth from "./EnvironmentAuth.ts";
2020
import * as ServerSecretStore from "./ServerSecretStore.ts";
2121
import * as AuthHttp from "./http.ts";

0 commit comments

Comments
 (0)