The best way to control Claude Code, Codex and more from any computer or phone
chore(deps): upgrade Effect to 4.1.2 and alchemy to beta.85 (#26833)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Nov 2, 2026 at 16:31 UTC
57cd05904d3a5dc42bd6a6540d3d00f33db7f0c1
352 files changed
+5635
-3977
apps/desktop/src/app/DesktopApp.ts
+3
-3
@@ -6,7 +6,7 @@ import * as Ref from "effect/Ref";
6
import * as Schema from "effect/Schema";
7
8
import * as NetService from "@t3tools/shared/Net";
9
-import * as Crypto from "effect/Crypto";
9
+import * as SecureRandom from "effect/crypto/SecureRandom";
10
import * as ElectronApp from "../electron/ElectronApp.ts";
11
import * as ElectronDialog from "../electron/ElectronDialog.ts";
12
import * as ElectronProtocol from "../electron/ElectronProtocol.ts";
@@ -42,8 +42,8 @@ const DEFAULT_DESKTOP_BACKEND_PORT = 3773;
42
const MAX_TCP_PORT = 65_535;
43
const DESKTOP_BACKEND_PORT_PROBE_HOSTS = ["127.0.0.1", "0.0.0.0", "::"] as const;
44
45
-const makeDesktopRunId = Crypto.Crypto.pipe(
46
- Effect.flatMap((crypto) => crypto.randomUUIDv4()),
45
+const makeDesktopRunId = SecureRandom.SecureRandom.pipe(
46
+ Effect.flatMap((random) => random.uuidV4()),
47
Effect.map((value) => value.replaceAll("-", "").slice(0, 12)),
48
);
49
apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts
+2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import { ConnectionCatalogDocument } from "@t3tools/client-runtime/platform";
@@ -75,6 +76,7 @@ function layerFor(
76
layerEnvironment,
77
layerSafeStorage,
78
NodeServices.layer,
79
+ NodeCrypto.layer,
80
fileSystemLayer,
81
);
82
const layerSavedEnvironments = DesktopSavedEnvironments.layer.pipe(
apps/desktop/src/app/DesktopConnectionCatalogStore.ts
+3
-12
@@ -13,7 +13,7 @@ import {
13
import type { PersistedSavedEnvironmentRecord } from "@t3tools/contracts";
14
import { fromLenientJson } from "@t3tools/shared/schemaJson";
15
import * as Context from "effect/Context";
16
-import * as Crypto from "effect/Crypto";
16
+import * as SecureRandom from "effect/crypto/SecureRandom";
17
import * as Effect from "effect/Effect";
18
import * as Base64 from "effect/encoding/Base64";
19
import * as FileSystem from "effect/FileSystem";
@@ -381,7 +381,7 @@ export const make = Effect.gen(function* () {
381
const fileSystem = yield* FileSystem.FileSystem;
382
const path = yield* Path.Path;
383
const safeStorage = yield* ElectronSafeStorage.ElectronSafeStorage;
384
- const crypto = yield* Crypto.Crypto;
384
+ const random = yield* SecureRandom.SecureRandom;
385
const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
386
const catalogPath = path.join(environment.stateDir, "connection-catalog.json");
387
const encryptionAvailable = safeStorage.isEncryptionAvailable.pipe(
@@ -410,16 +410,7 @@ export const make = Effect.gen(function* () {
410
),
411
),
412
);
413
- const suffix = (yield* crypto.randomUUIDv4().pipe(
414
- Effect.mapError(
415
- (cause) =>
416
- new DesktopConnectionCatalogStoreWriteError({
417
- operation: "create-temporary-file-name",
418
- path: catalogPath,
419
- cause,
420
- }),
421
- ),
422
- )).replace(/-/g, "");
413
+ const suffix = (yield* random.uuidV4()).replace(/-/g, "");
414
yield* writeDocument({
415
fileSystem,
416
path,
apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts
+1
-1
@@ -381,7 +381,7 @@ describe("DesktopLinuxUrlHandler", () => {
381
if (!ChildProcess.isStandardCommand(command)) {
382
return yield* Effect.die("expected a single registration command");
383
}
384
- recorded.commands.push({ command: command.command, args: command.args });
384
+ recorded.commands.push({ command: command.command, args: command.args.map(String) });
385
if (command.command !== stalledHelper) return mockProcess(0);
386
const child = yield* realSpawner.spawn(
387
ChildProcess.make(
apps/desktop/src/backend/DesktopBackendConfiguration.test.ts
+14
-12
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import { currentDesktopBootstrapToken } from "@t3tools/shared/desktopBootstrapToken";
@@ -76,6 +77,7 @@ function layerEnvironment(
77
Layer.provide(
78
Layer.mergeAll(
79
NodeServices.layer,
80
+ NodeCrypto.layer,
81
DesktopConfig.layerTest({
82
T3CODE_HOME: baseDir,
83
T3CODE_PORT: "9999",
@@ -127,7 +129,7 @@ const withHarness = <A, E, R>(
129
),
130
),
131
);
130
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer));
132
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
133
134
interface PackagedWslHarnessContext {
135
readonly baseDir: string;
@@ -219,7 +221,7 @@ const withPackagedWslHarness = <A, E, R>(
221
),
222
),
223
);
222
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer));
224
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
225
226
describe("DesktopBackendConfiguration", () => {
227
it.effect("resolvePrimary produces a stable scoped bootstrap token", () =>
@@ -316,7 +318,7 @@ describe("DesktopBackendConfiguration", () => {
318
path.join(resourcesPath, "server.asar/apps/server/dist/bin.mjs"),
319
);
320
assert.equal(config.env.ELECTRON_RUN_AS_NODE, "1");
319
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
321
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
322
);
323
324
it.effect("resolveWsl pins a default-tracking run to the concrete default distro", () =>
@@ -376,7 +378,7 @@ describe("DesktopBackendConfiguration", () => {
378
assert.deepEqual(config.args.slice(0, 2), ["-d", "Ubuntu"]);
379
assert.deepEqual(observedDistros, ["Ubuntu", "Ubuntu", "Ubuntu"]);
380
assert.isTrue(Option.isNone(config.preflightFailure));
379
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
381
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
382
);
383
384
it.effect("resolveWsl launches a packaged backend from the WSL-local runtime cache", () => {
@@ -665,7 +667,7 @@ describe("DesktopBackendConfiguration", () => {
667
assert.notInclude(config.args, "/bin/sh");
668
assert.notInclude(config.args, "-c");
669
assert.isTrue(Option.isNone(config.preflightFailure));
668
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
670
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
671
);
672
673
it.effect("resolvePrimary and resolveWsl share one token under concurrent resolution", () =>
@@ -733,7 +735,7 @@ describe("DesktopBackendConfiguration", () => {
735
restoreEnv("T3CODE_TELEMETRY_ENABLED", previousTelemetry);
736
restoreEnv("OTEL_RESOURCE_ATTRIBUTES", previousResourceAttributes);
737
}
736
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
738
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
739
);
740
741
it.effect("resolveWsl preserves existing WSLENV entries when forwarding backend secrets", () =>
@@ -800,7 +802,7 @@ describe("DesktopBackendConfiguration", () => {
802
restoreEnv("T3CODE_OTLP_PROTOCOL", previousOtlpProtocol);
803
for (const [name, value] of ambientOtel) restoreEnv(name, value);
804
}
803
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
805
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
806
);
807
808
it.effect(
@@ -837,7 +839,7 @@ describe("DesktopBackendConfiguration", () => {
839
),
840
),
841
);
840
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
842
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
843
);
844
845
it.effect(
@@ -880,7 +882,7 @@ describe("DesktopBackendConfiguration", () => {
882
),
883
),
884
);
883
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
885
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
886
);
887
888
it.effect("resolveWsl marks a missing packaged server entry as fatal", () =>
@@ -913,7 +915,7 @@ describe("DesktopBackendConfiguration", () => {
915
),
916
),
917
);
916
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
918
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
919
);
920
921
it.effect("prefers the external packaged resource monitor over the copy inside the asar", () =>
@@ -962,7 +964,7 @@ describe("DesktopBackendConfiguration", () => {
964
),
965
),
966
);
965
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
967
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
968
);
969
970
it("resolvePrimaryLabel is runSync-safe against the real WSL availability probe", async () => {
@@ -983,7 +985,7 @@ describe("DesktopBackendConfiguration", () => {
985
),
986
),
987
Layer.provideMerge(layerEnvironment("/tmp/t3-wsl-isavailable", { platform: "win32" })),
986
- Layer.provide(NodeServices.layer),
988
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
989
),
990
);
991
try {
apps/desktop/src/backend/DesktopBackendConfiguration.ts
+3
-3
@@ -4,7 +4,7 @@ import { parsePersistedServerObservabilitySettings } from "@t3tools/shared/serve
4
import { currentDesktopBootstrapToken } from "@t3tools/shared/desktopBootstrapToken";
5
import * as Clock from "effect/Clock";
6
import * as Context from "effect/Context";
7
-import * as Crypto from "effect/Crypto";
7
+import * as SecureRandom from "effect/crypto/SecureRandom";
8
import * as Effect from "effect/Effect";
9
import * as Hex from "effect/encoding/Hex";
10
import * as FileSystem from "effect/FileSystem";
@@ -723,14 +723,14 @@ export const make = Effect.gen(function* () {
723
const wslEnvironment = yield* DesktopWslEnvironment.DesktopWslEnvironment;
724
const wslServerTree = yield* DesktopWslServerTree.DesktopWslServerTree;
725
const settings = yield* DesktopAppSettings.DesktopAppSettings;
726
- const crypto = yield* Crypto.Crypto;
726
+ const random = yield* SecureRandom.SecureRandom;
727
// Random generation yields; serialize it so concurrent backends cannot capture distinct bootstrap secrets.
728
const secretRef = yield* SynchronizedRef.make(Option.none<string>());
729
const getOrCreateBootstrapSecret = SynchronizedRef.modifyEffect(secretRef, (current) =>
730
Option.match(current, {
731
onSome: (secret) => Effect.succeed([secret, current] as const),
732
onNone: () =>
733
- crypto.randomBytes(32).pipe(
733
+ random.randomBytes(32).pipe(
734
Effect.map((bytes) => {
735
const secret = Hex.encode(bytes);
736
return [secret, Option.some(secret)] as const;
apps/desktop/src/backend/DesktopServerExposure.test.ts
+7
-2
@@ -1,5 +1,6 @@
1
import * as NodeFileSystem from "@effect/platform-node/NodeFileSystem";
2
import * as NodeHttpClient from "@effect/platform-node/NodeHttpClient";
3
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
4
import * as NodeServices from "@effect/platform-node/NodeServices";
5
import { assert, describe, it } from "@effect/vitest";
6
import * as Deferred from "effect/Deferred";
@@ -81,7 +82,11 @@ function layerEnvironmentFor(baseDir: string, env: Record<string, string | undef
82
runningUnderArm64Translation: false,
83
}).pipe(
84
Layer.provide(
84
- Layer.mergeAll(NodeServices.layer, DesktopConfig.layerTest({ T3CODE_HOME: baseDir, ...env })),
85
+ Layer.mergeAll(
86
+ NodeServices.layer,
87
+ NodeCrypto.layer,
88
+ DesktopConfig.layerTest({ T3CODE_HOME: baseDir, ...env }),
89
+ ),
90
),
91
);
92
}
@@ -145,7 +150,7 @@ const withHarness = <A, E, R>(
150
}),
151
),
152
);
148
- }).pipe(Effect.provide(NodeServices.layer), Effect.scoped);
153
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)), Effect.scoped);
154
155
describe("DesktopServerExposure", () => {
156
it.effect("uses cached Tailscale identity to exclude another VPN's pairing address", () => {
apps/desktop/src/main.ts
+3
-2
@@ -7,6 +7,7 @@ for (const stream of [process.stdout, process.stderr]) {
7
8
import * as NodeHttpClient from "@effect/platform-node/NodeHttpClient";
9
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
10
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
11
import * as NodeServices from "@effect/platform-node/NodeServices";
12
// @effect-diagnostics-next-line nodeBuiltinImport:off - Version output must flush before Electron exits, without acquiring the runtime.
13
import * as NodeFS from "node:fs";
@@ -230,12 +231,12 @@ const layerDesktopClerk = DesktopClerk.layer.pipe(
231
Layer.provide(DesktopPreReadyFileSystem.layer),
232
Layer.provideMerge(ElectronShell.layer),
233
Layer.provideMerge(layerDesktopEnvironment),
233
- Layer.provideMerge(NodeServices.layer),
234
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
235
Layer.provideMerge(ElectronApp.layer),
236
);
237
238
const layerDesktopApplicationRuntime = layerDesktopApplication.pipe(
238
- Layer.provideMerge(NodeServices.layer),
239
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
240
Layer.provideMerge(NodeHttpClient.layerUndici),
241
Layer.provideMerge(NetService.layer),
242
Layer.provideMerge(layerElectron),
apps/desktop/src/preview/BrowserSession.test.ts
+2
-1
@@ -1,4 +1,5 @@
1
import { assert, describe, it } from "@effect/vitest";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as Effect from "effect/Effect";
5
import * as Layer from "effect/Layer";
@@ -46,7 +47,7 @@ const layerDialog = Layer.succeed(ElectronDialog.ElectronDialog, {
47
showErrorBox: () => Effect.void,
48
});
49
const layer = BrowserSession.layer.pipe(
49
- Layer.provide(Layer.merge(NodeServices.layer, layerDialog)),
50
+ Layer.provide(Layer.merge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer), layerDialog)),
51
);
52
53
describe("BrowserSession", () => {
apps/desktop/src/preview/BrowserSession.ts
+3
-3
@@ -1,7 +1,7 @@
1
import type { Session, WebContents } from "electron";
2
import { BrowserWindow, session } from "electron";
3
import * as Context from "effect/Context";
4
-import * as Crypto from "effect/Crypto";
4
+import * as Digest from "effect/crypto/Digest";
5
import * as Effect from "effect/Effect";
6
import * as Hex from "effect/encoding/Hex";
7
import * as Layer from "effect/Layer";
@@ -186,7 +186,7 @@ const previewHostWindow = (guest: WebContents | null): BrowserWindow | undefined
186
187
/** @public */
188
export const make = Effect.gen(function* BrowserSessionMake() {
189
- const crypto = yield* Crypto.Crypto;
189
+ const crypto = yield* Digest.Digest;
190
const electronDialog = yield* ElectronDialog.ElectronDialog;
191
const runFork = Effect.runForkWith(yield* Effect.context<never>());
192
// One prompt at a time, so a page cannot stack dialogs by looping a deep link.
@@ -261,7 +261,7 @@ export const make = Effect.gen(function* BrowserSessionMake() {
261
persistent = true,
262
namespace?: BrowserSessionPartitionNamespace,
263
) {
264
- const digest = yield* crypto.digest("SHA-256", encodeScopeForDigest(scope)).pipe(
264
+ const digest = yield* crypto.digest(Digest.sha256, encodeScopeForDigest(scope)).pipe(
265
Effect.mapError(
266
(cause) =>
267
new BrowserSessionPartitionDerivationError({
apps/desktop/src/preview/Manager.ts
+3
-3
@@ -35,7 +35,7 @@ import {
35
import * as Cause from "effect/Cause";
36
import * as Clock from "effect/Clock";
37
import * as Context from "effect/Context";
38
-import * as Crypto from "effect/Crypto";
38
+import * as SecureRandom from "effect/crypto/SecureRandom";
39
import * as DateTime from "effect/DateTime";
40
import * as Deferred from "effect/Deferred";
41
import * as Effect from "effect/Effect";
@@ -523,7 +523,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
523
const rendererHistory = yield* DesktopRendererHistory.DesktopRendererHistory;
524
const hostPlatform = yield* HostProcess.Platform;
525
const path = yield* Path.Path;
526
- const crypto = yield* Crypto.Crypto;
526
+ const random = yield* SecureRandom.SecureRandom;
527
const parentScope = yield* Scope.Scope;
528
const browserHost = yield* DesktopBrowserHost.DesktopBrowserHost;
529
const passkeys = yield* PreviewPasskeys.PreviewPasskeys;
@@ -2390,7 +2390,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
2390
wc,
2391
),
2392
]);
2393
- const uuid = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
2393
+ const uuid = yield* random.uuidV4();
2394
const id = `browser-screenshot-${artifactSiteSlug(wc.getURL())}-${millis.toString(36)}-${uuid.slice(0, 8)}`;
2395
const artifactPath = path.join(resolvedArtifactDirectory, `${id}.png`);
2396
const data = image.toPNG();
apps/desktop/src/settings/DesktopAppSettings.test.ts
+8
-3
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import * as Effect from "effect/Effect";
@@ -52,7 +53,11 @@ function layerEnvironment(baseDir: string, appVersion = "0.0.17") {
53
runningUnderArm64Translation: false,
54
}).pipe(
55
Layer.provide(
55
- Layer.mergeAll(NodeServices.layer, DesktopConfig.layerTest({ T3CODE_HOME: baseDir })),
56
+ Layer.mergeAll(
57
+ NodeServices.layer,
58
+ NodeCrypto.layer,
59
+ DesktopConfig.layerTest({ T3CODE_HOME: baseDir }),
60
+ ),
61
),
62
);
63
}
@@ -74,11 +79,11 @@ const withSettings = <A, E, R>(
79
Effect.provide(
80
DesktopAppSettings.layer.pipe(
81
Layer.provideMerge(layerEnvironment(baseDir, options?.appVersion)),
77
- Layer.provideMerge(NodeServices.layer),
82
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
83
),
84
),
85
);
81
- }).pipe(Effect.provide(NodeServices.layer), Effect.scoped);
86
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)), Effect.scoped);
87
88
function writeSettingsPatch(patch: typeof DesktopSettingsPatch.Type) {
89
return Effect.gen(function* () {
apps/desktop/src/settings/DesktopAppSettings.ts
+3
-11
@@ -7,7 +7,7 @@ import {
7
import { fromLenientJson } from "@t3tools/shared/schemaJson";
8
import { resolveSymlinkTarget } from "@t3tools/shared/symlink";
9
import * as Context from "effect/Context";
10
-import * as Crypto from "effect/Crypto";
10
+import * as SecureRandom from "effect/crypto/SecureRandom";
11
import * as Effect from "effect/Effect";
12
import * as FileSystem from "effect/FileSystem";
13
import * as Layer from "effect/Layer";
@@ -469,7 +469,7 @@ export const make = Effect.gen(function* () {
469
const environment = yield* DesktopEnvironment.DesktopEnvironment;
470
const fileSystem = yield* FileSystem.FileSystem;
471
const path = yield* Path.Path;
472
- const crypto = yield* Crypto.Crypto;
472
+ const random = yield* SecureRandom.SecureRandom;
473
const settingsRef = yield* SynchronizedRef.make(environment.defaultDesktopSettings);
474
475
const updateInMemory = (update: (settings: DesktopSettings) => DesktopSettings) =>
@@ -487,16 +487,8 @@ export const make = Effect.gen(function* () {
487
return Effect.succeed([settingsChange(settings, false), settings] as const);
488
}
489
490
- return crypto.randomUUIDv4().pipe(
490
+ return random.uuidV4().pipe(
491
Effect.map((uuid) => uuid.replace(/-/g, "")),
492
- Effect.mapError(
493
- (cause) =>
494
- new DesktopSettingsWriteError({
495
- operation: "create-temporary-file-name",
496
- path: environment.desktopSettingsPath,
497
- cause,
498
- }),
499
- ),
492
Effect.flatMap((suffix) =>
493
writeSettings({
494
fileSystem,
apps/desktop/src/settings/DesktopClientSettings.test.ts
+8
-3
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import {
@@ -89,13 +90,17 @@ function layer(baseDir: string) {
90
runningUnderArm64Translation: false,
91
}).pipe(
92
Layer.provide(
92
- Layer.mergeAll(NodeServices.layer, DesktopConfig.layerTest({ T3CODE_HOME: baseDir })),
93
+ Layer.mergeAll(
94
+ NodeServices.layer,
95
+ NodeCrypto.layer,
96
+ DesktopConfig.layerTest({ T3CODE_HOME: baseDir }),
97
+ ),
98
),
99
);
100
101
return DesktopClientSettings.layer.pipe(
102
Layer.provideMerge(layerEnvironment),
98
- Layer.provideMerge(NodeServices.layer),
103
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
104
);
105
}
106
@@ -108,7 +113,7 @@ const withClientSettings = <A, E, R>(
113
prefix: "t3-desktop-client-settings-test-",
114
});
115
return yield* effect.pipe(Effect.provide(layer(baseDir)));
111
- }).pipe(Effect.provide(NodeServices.layer), Effect.scoped);
116
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)), Effect.scoped);
117
118
describe("DesktopClientSettings", () => {
119
it.effect("saves through a symlinked client settings file without replacing the link", () =>
apps/desktop/src/settings/DesktopClientSettings.ts
+3
-11
@@ -2,7 +2,7 @@ import { ClientSettingsSchema, type ClientSettings } from "@t3tools/contracts";
2
import { fromLenientJson } from "@t3tools/shared/schemaJson";
3
import { resolveSymlinkTarget } from "@t3tools/shared/symlink";
4
import * as Context from "effect/Context";
5
-import * as Crypto from "effect/Crypto";
5
+import * as SecureRandom from "effect/crypto/SecureRandom";
6
import * as Effect from "effect/Effect";
7
import * as FileSystem from "effect/FileSystem";
8
import * as Layer from "effect/Layer";
@@ -188,23 +188,15 @@ export const make = Effect.gen(function* () {
188
const environment = yield* DesktopEnvironment.DesktopEnvironment;
189
const fileSystem = yield* FileSystem.FileSystem;
190
const path = yield* Path.Path;
191
- const crypto = yield* Crypto.Crypto;
191
+ const random = yield* SecureRandom.SecureRandom;
192
193
return DesktopClientSettings.of({
194
get: readClientSettings(fileSystem, environment.clientSettingsPath).pipe(
195
Effect.withSpan("desktop.clientSettings.get"),
196
),
197
set: Effect.fn("desktop.clientSettings.set")(function (settings) {
198
- return crypto.randomUUIDv4().pipe(
198
+ return random.uuidV4().pipe(
199
Effect.map((uuid) => uuid.replace(/-/g, "")),
200
- Effect.mapError(
201
- (cause) =>
202
- new DesktopClientSettingsWriteError({
203
- operation: "create-temporary-file-name",
204
- path: environment.clientSettingsPath,
205
- cause,
206
- }),
207
- ),
200
Effect.flatMap((suffix) =>
201
writeClientSettings({
202
fileSystem,
apps/desktop/src/snapShot/DesktopSnapShot.test.ts
+5
-11
@@ -6,7 +6,7 @@ import {
6
type ClientSettings,
7
type DesktopSnapShotEvent,
8
} from "@t3tools/contracts";
9
-import * as Crypto from "effect/Crypto";
9
+import * as SecureRandom from "effect/crypto/SecureRandom";
10
import * as Effect from "effect/Effect";
11
import * as Fiber from "effect/Fiber";
12
import * as FileSystem from "effect/FileSystem";
@@ -519,11 +519,8 @@ const layerTest = (
519
FileSystem.layerNoop(fileSystemOverrides),
520
Path.layer,
521
Layer.succeed(
522
- Crypto.Crypto,
523
- Crypto.make({
524
- randomBytes: (size) => new Uint8Array(size),
525
- digest: (_algorithm, data) => Effect.succeed(data),
526
- }),
522
+ SecureRandom.SecureRandom,
523
+ SecureRandom.make((size) => new Uint8Array(size)),
524
),
525
),
526
),
@@ -675,11 +672,8 @@ function concurrentCaptureFixture(platform: NodeJS.Platform, animations: boolean
672
readFileString: (path) => Effect.sync(() => metadata.get(path)!),
673
}),
674
Layer.succeed(
678
- Crypto.Crypto,
679
- Crypto.make({
680
- randomBytes: (size) => new Uint8Array(size).fill(++randomByte),
681
- digest: (_algorithm, data) => Effect.succeed(data),
682
- }),
675
+ SecureRandom.SecureRandom,
676
+ SecureRandom.make((size) => new Uint8Array(size).fill(++randomByte)),
677
),
678
Layer.succeed(
679
DesktopWindow.DesktopWindow,
apps/desktop/src/snapShot/DesktopSnapShot.ts
+3
-3
@@ -23,7 +23,7 @@ import {
23
} from "@t3tools/contracts";
24
import * as Clock from "effect/Clock";
25
import * as Context from "effect/Context";
26
-import * as Crypto from "effect/Crypto";
26
+import * as SecureRandom from "effect/crypto/SecureRandom";
27
import * as DateTime from "effect/DateTime";
28
import * as Effect from "effect/Effect";
29
import * as Base64 from "effect/encoding/Base64";
@@ -750,7 +750,7 @@ export const make = Effect.gen(function* () {
750
const desktopWindow = yield* DesktopWindow.DesktopWindow;
751
const fileSystem = yield* FileSystem.FileSystem;
752
const path = yield* Path.Path;
753
- const crypto = yield* Crypto.Crypto;
753
+ const random = yield* SecureRandom.SecureRandom;
754
const settingsRef = yield* Ref.make(DEFAULT_CLIENT_SETTINGS);
755
const stateRef = yield* Ref.make<DesktopSnapShotState>({
756
mode: captureMode(environment.platform),
@@ -896,7 +896,7 @@ export const make = Effect.gen(function* () {
896
const prepareCapture = Effect.fn("desktop.snapShot.prepareCapture")(function* (
897
settings: ClientSettings,
898
) {
899
- const id = yield* crypto.randomUUIDv4().pipe(Effect.mapError((cause) => captureFailure(cause)));
899
+ const id = yield* random.uuidV4().pipe(Effect.mapError((cause) => captureFailure(cause)));
900
const mode = captureMode(environment.platform);
901
if (mode === "unavailable") {
902
return yield* new DesktopSnapShotError({ operation: "unsupported", captureId: id });
apps/desktop/src/ssh/DesktopSshEnvironment.ts
+2
-2
@@ -18,7 +18,7 @@ import {
18
} from "@t3tools/ssh/errors";
19
import * as SshTunnel from "@t3tools/ssh/tunnel";
20
import * as Context from "effect/Context";
21
-import type * as Crypto from "effect/Crypto";
21
+import type * as Digest from "effect/crypto/Digest";
22
import * as Effect from "effect/Effect";
23
import * as FileSystem from "effect/FileSystem";
24
import * as Layer from "effect/Layer";
@@ -30,7 +30,7 @@ import * as DesktopSshPasswordPrompts from "./DesktopSshPasswordPrompts.ts";
30
31
export type DesktopSshEnvironmentRuntimeServices =
32
| ChildProcessSpawner.ChildProcessSpawner
33
- | Crypto.Crypto
33
+ | Digest.Digest
34
| FileSystem.FileSystem
35
| Path.Path
36
| HttpClient.HttpClient
apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts
+2
-1
@@ -1,4 +1,5 @@
1
import { assert, describe, it } from "@effect/vitest";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as Effect from "effect/Effect";
5
import * as Fiber from "effect/Fiber";
@@ -107,7 +108,7 @@ function layerElectronWindow(window: ReturnType<typeof makeTestWindow>["window"]
108
function layer(window: ReturnType<typeof makeTestWindow>["window"]) {
109
return DesktopSshPasswordPrompts.layer({ passwordPromptTimeoutMs: 1_000 }).pipe(
110
Layer.provide(layerElectronWindow(window)),
110
- Layer.provide(NodeServices.layer),
111
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
112
Layer.provideMerge(TestClock.layer()),
113
);
114
}
apps/desktop/src/ssh/DesktopSshPasswordPrompts.ts
+3
-3
@@ -2,7 +2,7 @@ import type { DesktopSshPasswordPromptRequest } from "@t3tools/contracts";
2
import { DesktopSshPasswordPromptResolutionInputSchema } from "@t3tools/contracts";
3
import type { SshPasswordRequest } from "@t3tools/ssh/auth";
4
import * as Context from "effect/Context";
5
-import * as Crypto from "effect/Crypto";
5
+import * as SecureRandom from "effect/crypto/SecureRandom";
6
import * as DateTime from "effect/DateTime";
7
import * as Deferred from "effect/Deferred";
8
import * as Duration from "effect/Duration";
@@ -223,7 +223,7 @@ export const make = Effect.fn("desktop.sshPasswordPrompts.make")(function* (
223
options: DesktopSshPasswordPromptsOptions = {},
224
) {
225
const electronWindow = yield* ElectronWindow.ElectronWindow;
226
- const crypto = yield* Crypto.Crypto;
226
+ const random = yield* SecureRandom.SecureRandom;
227
const pendingRef = yield* Ref.make(new Map<string, PendingSshPasswordPrompt>());
228
const passwordPromptTimeoutMs =
229
options.passwordPromptTimeoutMs ?? DEFAULT_SSH_PASSWORD_PROMPT_TIMEOUT_MS;
@@ -307,7 +307,7 @@ export const make = Effect.fn("desktop.sshPasswordPrompts.make")(function* (
307
});
308
}
309
310
- const requestId = yield* crypto.randomUUIDv4().pipe(
310
+ const requestId = yield* random.uuidV4().pipe(
311
Effect.mapError(
312
(cause) =>
313
new DesktopSshPromptRequestIdGenerationError({
apps/desktop/src/updates/updatesTestHarness.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import type { DesktopUpdateState } from "@t3tools/contracts";
4
import * as Effect from "effect/Effect";
@@ -288,7 +289,7 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
289
}),
290
),
291
Layer.provideMerge(layerEnvironment),
291
- Layer.provideMerge(NodeServices.layer),
292
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
293
);
294
295
return {
apps/mobile/scripts/measure-renders.mts
+6
-4
@@ -1,8 +1,9 @@
1
// See docs/internals/mobile-development.md#measuring-renders.
2
import * as NodeHttpClient from "@effect/platform-node/NodeHttpClient";
3
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
4
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
5
import * as NodeServices from "@effect/platform-node/NodeServices";
5
-import * as NodeSocket from "@effect/platform-node/NodeSocket";
6
+import * as NodeWS from "@effect/platform-node/NodeWS";
7
import {
8
CommandId,
9
EnvironmentId,
@@ -17,7 +18,7 @@ import {
18
type OrchestrationV2ThreadProjection,
19
} from "@t3tools/contracts";
20
import * as Console from "effect/Console";
20
-import * as Crypto from "effect/Crypto";
21
+import * as SecureRandom from "effect/crypto/SecureRandom";
22
import * as Effect from "effect/Effect";
23
import * as FileSystem from "effect/FileSystem";
24
import * as Layer from "effect/Layer";
@@ -71,7 +72,7 @@ interface Options {
72
readonly projectRoot: string;
73
}
74
74
-const uuid = Effect.flatMap(Crypto.Crypto, (crypto) => crypto.randomUUIDv4());
75
+const uuid = Effect.flatMap(SecureRandom.SecureRandom, (random) => random.uuidV4());
76
77
const median = (values: ReadonlyArray<number>) => {
78
const sorted = [...values].sort((a, b) => a - b);
@@ -398,8 +399,9 @@ Command.run(command, { version: "0.0.0" }).pipe(
399
Effect.provide(
400
Layer.mergeAll(
401
NodeServices.layer,
402
+ NodeCrypto.layer,
403
NodeHttpClient.layerUndici,
402
- NodeSocket.layerWebSocketConstructorWS,
404
+ NodeWS.layerWebSocketConstructor,
405
),
406
),
407
NodeRuntime.runMain,
apps/mobile/src/features/cloud/dpop.test.ts
+4
-6
@@ -4,7 +4,7 @@ import * as NodeCrypto from "node:crypto";
4
5
import { vi } from "vite-plus/test";
6
import { describe, expect, it } from "@effect/vitest";
7
-import * as Crypto from "effect/Crypto";
7
+import * as Digest from "effect/crypto/Digest";
8
import * as Effect from "effect/Effect";
9
import { verifyDpopProof } from "@t3tools/shared/dpop";
10
@@ -65,12 +65,10 @@ function proofHtu(proof: string): string {
65
describe("mobile DPoP", () => {
66
it.effect("passes typed-array digest input through the Expo Crypto adapter", () =>
67
Effect.gen(function* () {
68
- const crypto = yield* Crypto.Crypto;
69
- const digest = yield* crypto.digest("SHA-256", new TextEncoder().encode("typed-array"));
68
+ const digest = yield* Digest.Digest;
69
+ const hex = yield* digest.digestHex(Digest.sha256, new TextEncoder().encode("typed-array"));
70
71
- expect(Buffer.from(digest).toString("hex")).toBe(
72
- NodeCrypto.createHash("sha256").update("typed-array").digest("hex"),
73
- );
71
+ expect(hex).toBe(NodeCrypto.createHash("sha256").update("typed-array").digest("hex"));
72
}).pipe(Effect.provide(Dpop.layer)),
73
);
74
apps/mobile/src/features/cloud/dpop.ts
+46
-30
@@ -1,8 +1,10 @@
1
import * as Clock from "effect/Clock";
2
-import * as Crypto from "effect/Crypto";
2
+import * as Digest from "effect/crypto/Digest";
3
+import * as SecureRandom from "effect/crypto/SecureRandom";
4
import * as Data from "effect/Data";
5
import * as Effect from "effect/Effect";
6
import * as Base64Url from "effect/encoding/Base64Url";
7
+import * as Hex from "effect/encoding/Hex";
8
import * as Result from "effect/Result";
9
import * as Schema from "effect/Schema";
10
import * as ExpoCrypto from "expo-crypto";
@@ -50,10 +52,10 @@ const DpopJwtPayloadJson = Schema.fromJsonString(
52
const encodeDpopJwtHeaderJson = Schema.encodeEffect(DpopJwtHeaderJson);
53
const encodeDpopJwtPayloadJson = Schema.encodeEffect(DpopJwtPayloadJson);
54
53
-function toExpoDigestAlgorithm(
54
- algorithm: Crypto.DigestAlgorithm,
55
-): ExpoCrypto.CryptoDigestAlgorithm {
56
- switch (algorithm) {
55
+function toExpoDigestAlgorithm(algorithm: Digest.Algorithm): ExpoCrypto.CryptoDigestAlgorithm {
56
+ switch (algorithm.name) {
57
+ case "MD5":
58
+ return ExpoCrypto.CryptoDigestAlgorithm.MD5;
59
case "SHA-1":
60
return ExpoCrypto.CryptoDigestAlgorithm.SHA1;
61
case "SHA-256":
@@ -65,17 +67,23 @@ function toExpoDigestAlgorithm(
67
}
68
}
69
68
-export const layer = Layer.succeed(
69
- Crypto.Crypto,
70
- Crypto.make({
71
- randomBytes: ExpoCrypto.getRandomBytes,
72
- digest: (algorithm, data) =>
73
- Effect.promise(async () => {
74
- const input = new Uint8Array(data.length);
75
- input.set(data);
76
- return new Uint8Array(await ExpoCrypto.digest(toExpoDigestAlgorithm(algorithm), input));
77
- }),
78
- }),
70
+// Hermes has no SubtleCrypto, so Effect's WebCrypto layers cannot back these services.
71
+const digest = (algorithm: Digest.Algorithm, data: Uint8Array) =>
72
+ Effect.promise(async () => {
73
+ const input = new Uint8Array(data.length);
74
+ input.set(data);
75
+ return new Uint8Array(await ExpoCrypto.digest(toExpoDigestAlgorithm(algorithm), input));
76
+ });
77
+
78
+export const layer = Layer.mergeAll(
79
+ Layer.succeed(SecureRandom.SecureRandom, SecureRandom.make(ExpoCrypto.getRandomBytes)),
80
+ Layer.succeed(
81
+ Digest.Digest,
82
+ Digest.Digest.of({
83
+ digest,
84
+ digestHex: (algorithm, data) => Effect.map(digest(algorithm, data), Hex.encode),
85
+ }),
86
+ ),
87
);
88
89
type DpopPrivateJwk = typeof DpopPrivateJwkSchema.Type;
@@ -95,9 +103,9 @@ function base64UrlToBytes(value: string): Uint8Array {
103
function sha256Digest(
104
data: Uint8Array,
105
message: string,
98
-): Effect.Effect<Uint8Array, CloudDpopError, Crypto.Crypto> {
99
- return Crypto.Crypto.pipe(
100
- Effect.flatMap((crypto) => crypto.digest("SHA-256", data)),
106
+): Effect.Effect<Uint8Array, CloudDpopError, Digest.Digest> {
107
+ return Digest.Digest.pipe(
108
+ Effect.flatMap((service) => service.digest(Digest.sha256, data)),
109
Effect.mapError(cloudDpopError(message)),
110
);
111
}
@@ -105,7 +113,7 @@ function sha256Digest(
113
function base64UrlSha256(
114
data: Uint8Array,
115
message: string,
108
-): Effect.Effect<string, CloudDpopError, Crypto.Crypto> {
116
+): Effect.Effect<string, CloudDpopError, Digest.Digest> {
117
return sha256Digest(data, message).pipe(Effect.map(Base64Url.encode));
118
}
119
@@ -120,7 +128,7 @@ function dpopThumbprintInput(jwk: DpopPublicJwk): string {
128
129
function computeDpopJwkThumbprintEffect(
130
jwk: DpopPublicJwk,
123
-): Effect.Effect<string, CloudDpopError, Crypto.Crypto> {
131
+): Effect.Effect<string, CloudDpopError, Digest.Digest> {
132
return base64UrlSha256(
133
new TextEncoder().encode(dpopThumbprintInput(jwk)),
134
"Could not hash the DPoP public key thumbprint.",
@@ -129,7 +137,7 @@ function computeDpopJwkThumbprintEffect(
137
138
function computeDpopAccessTokenHashEffect(
139
accessToken: string,
132
-): Effect.Effect<string, CloudDpopError, Crypto.Crypto> {
140
+): Effect.Effect<string, CloudDpopError, Digest.Digest> {
141
return base64UrlSha256(
142
new TextEncoder().encode(accessToken),
143
"Could not hash the DPoP access token.",
@@ -139,9 +147,9 @@ function computeDpopAccessTokenHashEffect(
147
function secureRandomBytes(
148
byteCount: number,
149
message: string,
142
-): Effect.Effect<Uint8Array, CloudDpopError, Crypto.Crypto> {
143
- return Crypto.Crypto.pipe(
144
- Effect.flatMap((crypto) => crypto.randomBytes(byteCount)),
150
+): Effect.Effect<Uint8Array, CloudDpopError, SecureRandom.SecureRandom> {
151
+ return SecureRandom.SecureRandom.pipe(
152
+ Effect.flatMap((random) => random.randomBytes(byteCount)),
153
Effect.mapError(cloudDpopError(message)),
154
);
155
}
@@ -166,7 +174,11 @@ function privateJwkFromPrivateKey(
174
}
175
176
export const generateDpopProofKeyPair = Effect.fn("dpop.generateDpopProofKeyPair")(
169
- function* (): Effect.fn.Return<DpopProofKeyPair, CloudDpopError, Crypto.Crypto> {
177
+ function* (): Effect.fn.Return<
178
+ DpopProofKeyPair,
179
+ CloudDpopError,
180
+ SecureRandom.SecureRandom | Digest.Digest
181
+ > {
182
let privateKey: Uint8Array;
183
do {
184
privateKey = yield* secureRandomBytes(
@@ -188,7 +200,11 @@ export const generateDpopProofKeyPair = Effect.fn("dpop.generateDpopProofKeyPair
200
);
201
202
export const loadOrCreateDpopProofKeyPair = Effect.fn("dpop.loadOrCreateDpopProofKeyPair")(
191
- function* (): Effect.fn.Return<DpopProofKeyPair, CloudDpopError, Crypto.Crypto> {
203
+ function* (): Effect.fn.Return<
204
+ DpopProofKeyPair,
205
+ CloudDpopError,
206
+ SecureRandom.SecureRandom | Digest.Digest
207
+ > {
208
const stored = yield* Effect.tryPromise({
209
try: () => SecureStore.getItemAsync(DPOP_PROOF_KEY_STORAGE_KEY),
210
catch: cloudDpopError("Could not read the DPoP proof key."),
@@ -243,7 +259,7 @@ export const createDpopProof = Effect.fn("dpop.createDpopProof")(function* (inpu
259
}): Effect.fn.Return<
260
{ readonly proof: string; readonly thumbprint: string },
261
CloudDpopError,
246
- Crypto.Crypto
262
+ SecureRandom.SecureRandom | Digest.Digest
263
> {
264
const keyPair = input.proofKey ?? (yield* generateDpopProofKeyPair());
265
const privateKey = yield* Effect.try({
@@ -251,8 +267,8 @@ export const createDpopProof = Effect.fn("dpop.createDpopProof")(function* (inpu
267
catch: cloudDpopError("Could not import DPoP private key."),
268
});
269
const nowMs = yield* Clock.currentTimeMillis;
254
- const jti = yield* Crypto.Crypto.pipe(
255
- Effect.flatMap((crypto) => crypto.randomUUIDv4()),
270
+ const jti = yield* SecureRandom.SecureRandom.pipe(
271
+ Effect.flatMap((random) => random.uuidV4()),
272
Effect.mapError(cloudDpopError("Could not generate DPoP proof identifier.")),
273
);
274
const htu = yield* normalizeHtu(input.url);
apps/mobile/src/features/cloud/managedRelayLayer.ts
+11
-4
@@ -1,7 +1,8 @@
1
import { ManagedRelay } from "@t3tools/client-runtime/relay";
2
import { RelayMobileClientId } from "@t3tools/contracts/relay";
3
import * as Cache from "effect/Cache";
4
-import * as Crypto from "effect/Crypto";
4
+import * as Digest from "effect/crypto/Digest";
5
+import * as SecureRandom from "effect/crypto/SecureRandom";
6
import * as Duration from "effect/Duration";
7
import * as Effect from "effect/Effect";
8
import * as Exit from "effect/Exit";
@@ -13,9 +14,14 @@ import { managedRelayAccessTokenStore } from "./managedRelayTokenStore";
14
const layerRelayDpopSigner = Layer.effect(
15
ManagedRelay.ManagedRelayDpopSigner,
16
Effect.gen(function* () {
16
- const crypto = yield* Crypto.Crypto;
17
+ const random = yield* SecureRandom.SecureRandom;
18
+ const digest = yield* Digest.Digest;
19
const proofKeyCache = yield* Cache.makeWith(
18
- () => loadOrCreateDpopProofKeyPair().pipe(Effect.provideService(Crypto.Crypto, crypto)),
20
+ () =>
21
+ loadOrCreateDpopProofKeyPair().pipe(
22
+ Effect.provideService(SecureRandom.SecureRandom, random),
23
+ Effect.provideService(Digest.Digest, digest),
24
+ ),
25
{
26
capacity: 1,
27
timeToLive: (exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero),
@@ -46,7 +52,8 @@ const layerRelayDpopSigner = Layer.effect(
52
),
53
);
54
return yield* createDpopProof({ ...input, proofKey }).pipe(
49
- Effect.provideService(Crypto.Crypto, crypto),
55
+ Effect.provideService(SecureRandom.SecureRandom, random),
56
+ Effect.provideService(Digest.Digest, digest),
57
Effect.map((proof) => proof.proof),
58
Effect.mapError(
59
(error) =>
apps/server/integration/NetworkTransferMeasurement.integration.ts
+4
-4
@@ -2,7 +2,7 @@
2
import * as NodeHttp from "node:http";
3
import * as NodeZlib from "node:zlib";
4
5
-import * as NodeSocket from "@effect/platform-node/NodeSocket";
5
+import * as NodeWS from "@effect/platform-node/NodeWS";
6
import { WsRpcGroup } from "@t3tools/contracts";
7
import * as Effect from "effect/Effect";
8
import * as Exit from "effect/Exit";
@@ -106,13 +106,13 @@ export interface WebSocketTransferRecorder {
106
readonly awaitOpen: Effect.Effect<void>;
107
}
108
109
-interface NodeWebSocketWithTransport extends NodeSocket.NodeWS.WebSocket {
109
+interface NodeWebSocketWithTransport extends NodeWS.WebSocket {
110
readonly _socket?: {
111
readonly bytesRead: number;
112
};
113
}
114
115
-function rawDataBytes(data: NodeSocket.NodeWS.RawData): number {
115
+function rawDataBytes(data: NodeWS.RawData): number {
116
if (Array.isArray(data)) {
117
return data.reduce((total, chunk) => total + chunk.byteLength, 0);
118
}
@@ -132,7 +132,7 @@ function makeWebSocketTransferRecorder(): WebSocketTransferRecorder {
132
133
return {
134
connect: (url, protocols, cookie) => {
135
- const nextSocket = new NodeSocket.NodeWS.WebSocket(url, protocols, {
135
+ const nextSocket = new NodeWS.WebSocket(url, protocols, {
136
headers: { cookie },
137
perMessageDeflate: true,
138
}) as NodeWebSocketWithTransport;
apps/server/scripts/cli.ts
+1
-1
@@ -35,7 +35,7 @@ const runCommand = Effect.fn("runCommand")(function* (command: ChildProcess.Stan
35
if (exitCode !== 0) {
36
return yield* new ServerCliCommandExitError({
37
command: command.command,
38
- args: command.args,
38
+ args: command.args.map(String),
39
cwd: command.options.cwd,
40
exitCode,
41
});
apps/server/scripts/record-fx-acp-replay-fixture.ts
+6
-2
@@ -4,6 +4,7 @@
4
* fx 0.0.13 on PATH (or T3_FX_BIN); HOME stays the user's real login:
5
* node scripts/record-fx-acp-replay-fixture.ts --scenario simple
6
*/
7
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
8
import * as NodeServices from "@effect/platform-node/NodeServices";
9
import { ProviderInstanceId, type ProviderReplayEntry } from "@t3tools/contracts";
10
import { FxSettings } from "@t3tools/provider-fx/settings";
@@ -398,8 +399,11 @@ const recordScenario = Effect.fn("recordFxScenario")(function* (fixtureName: str
399
).pipe(
400
Layer.provide(
401
Layer.mergeAll(
401
- TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
402
+ TestProviderHost.layer().pipe(
403
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
404
+ ),
405
NodeServices.layer,
406
+ NodeCrypto.layer,
407
IdAllocator.layer,
408
),
409
),
@@ -520,5 +524,5 @@ if (scenarios.length === 0) {
524
await Effect.runPromise(
525
Effect.forEach(scenarios, (name) => Effect.scoped(recordScenario(name)), {
526
discard: true,
523
- }).pipe(Effect.provide(NodeServices.layer)),
527
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
528
);
apps/server/scripts/record-grok-acp-replay-fixture.ts
+6
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { type ProviderReplayEntry } from "@t3tools/contracts";
4
import { GrokSettings } from "@t3tools/provider-grok/settings";
@@ -448,8 +449,11 @@ const recordScenario = Effect.fn("recordGrokScenario")(function* (fixtureName: s
449
).pipe(
450
Layer.provide(
451
Layer.mergeAll(
451
- TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
452
+ TestProviderHost.layer().pipe(
453
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
454
+ ),
455
NodeServices.layer,
456
+ NodeCrypto.layer,
457
IdAllocator.layer,
458
),
459
),
@@ -558,5 +562,5 @@ if (scenarios.length === 0) {
562
await Effect.runPromise(
563
Effect.forEach(scenarios, (name) => Effect.scoped(recordScenario(name)), {
564
discard: true,
561
- }).pipe(Effect.provide(NodeServices.layer)),
565
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
566
);
apps/server/scripts/record-kiro-acp-replay-fixture.ts
+6
-2
@@ -4,6 +4,7 @@
4
* with `kiro-cli login`, with `kiro-cli` on PATH (or T3_KIRO_BIN):
5
* node scripts/record-kiro-acp-replay-fixture.ts --scenario simple
6
*/
7
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
8
import * as NodeServices from "@effect/platform-node/NodeServices";
9
import type { ProviderReplayEntry } from "@t3tools/contracts";
10
import { KiroSettings } from "@t3tools/provider-kiro/settings";
@@ -487,8 +488,11 @@ const recordScenario = Effect.fn("recordKiroScenario")(function* (fixtureName: s
488
).pipe(
489
Layer.provide(
490
Layer.mergeAll(
490
- TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
491
+ TestProviderHost.layer().pipe(
492
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
493
+ ),
494
NodeServices.layer,
495
+ NodeCrypto.layer,
496
IdAllocator.layer,
497
),
498
),
@@ -604,5 +608,5 @@ if (scenarios.length > 1 && readArgValues("--out").length > 0) {
608
await Effect.runPromise(
609
Effect.forEach(scenarios, (name) => Effect.scoped(recordScenario(name)), {
610
discard: true,
607
- }).pipe(Effect.provide(NodeServices.layer)),
611
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
612
);
apps/server/src/assets/AssetAccess.test.ts
+6
-5
@@ -1,4 +1,5 @@
1
// @effect-diagnostics nodeBuiltinImport:off - tests inject swaps at the native open boundary.
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as NodeHttpPlatform from "@effect/platform-node/NodeHttpPlatform";
5
import * as NodeFSP from "node:fs/promises";
@@ -119,7 +120,7 @@ const layerTest = Layer.mergeAll(
120
),
121
NativeAppIconResolver.layer.pipe(Layer.provide(layerConfig)),
122
ServerSecretStore.layer.pipe(Layer.provide(layerConfig)),
122
-).pipe(Layer.provideMerge(NodeServices.layer));
123
+).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
124
125
describe("AssetAccess", () => {
126
describe("readMcpAppHtml", () => {
@@ -135,7 +136,7 @@ describe("AssetAccess", () => {
136
const bytes = yield* readMcpAppHtml(file);
137
expect(bytes?.byteLength).toBe(limit);
138
expect(bytes?.every((byte) => byte === 120)).toBe(true);
138
- }).pipe(Effect.provide(NodeServices.layer)),
139
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
140
);
141
142
it.effect("rejects snapshots one byte past the limit and much larger files", () =>
@@ -149,7 +150,7 @@ describe("AssetAccess", () => {
150
yield* fileSystem.writeFile(file, new Uint8Array(size).fill(120));
151
expect(yield* readMcpAppHtml(file)).toBeNull();
152
}
152
- }).pipe(Effect.provide(NodeServices.layer)),
153
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
154
);
155
156
it.effect("preserves UTF-8 bytes across stream chunks and accepts empty snapshots", () =>
@@ -165,7 +166,7 @@ describe("AssetAccess", () => {
166
expect(bytes?.byteLength).toBe(expected.byteLength);
167
expect(bytes && new TextDecoder().decode(bytes)).toBe(html);
168
}
168
- }).pipe(Effect.provide(NodeServices.layer)),
169
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
170
);
171
172
// regression: #17026 apply host color scheme to saved MCP apps
@@ -177,7 +178,7 @@ describe("AssetAccess", () => {
178
const error = yield* readMcpAppHtml(path.join(directory, "missing.html")).pipe(Effect.flip);
179
expect(error._tag).toBe("PlatformError");
180
expect(error.reason._tag).toBe("NotFound");
180
- }).pipe(Effect.provide(NodeServices.layer)),
181
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
182
);
183
});
184
apps/server/src/assets/AssetAccess.ts
+3
-3
@@ -38,7 +38,7 @@ import {
38
import { isNetworkPath } from "@t3tools/shared/path";
39
import { MAX_TOOL_OUTPUT_IMAGE_BASE64_LENGTH, toolOutputImages } from "@t3tools/shared/toolOutput";
40
import * as Clock from "effect/Clock";
41
-import * as Crypto from "effect/Crypto";
41
+import * as Digest from "effect/crypto/Digest";
42
import * as Effect from "effect/Effect";
43
import * as Hex from "effect/encoding/Hex";
44
import * as FileSystem from "effect/FileSystem";
@@ -774,7 +774,7 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
774
expiresAt,
775
};
776
if (sourceFaviconPath && canonicalFaviconPath) {
777
- const crypto = yield* Crypto.Crypto;
777
+ const digest = yield* Digest.Digest;
778
const faviconBytes = yield* fileSystem.readFile(canonicalFaviconPath).pipe(
779
Effect.mapError(
780
(cause) =>
@@ -784,7 +784,7 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
784
}),
785
),
786
);
787
- const revision = yield* crypto.digest("SHA-256", faviconBytes).pipe(
787
+ const revision = yield* digest.digest(Digest.sha256, faviconBytes).pipe(
788
Effect.map(Hex.encode),
789
Effect.mapError(
790
(cause) =>
apps/server/src/assets/AttachmentUpload.test.ts
+6
-1
@@ -3,6 +3,7 @@ import * as DocumentText from "../provider/DocumentText.ts";
3
import * as NodeFS from "node:fs";
4
import * as NodePath from "node:path";
5
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import { describe, expect, it } from "@effect/vitest";
9
import { ChatAttachmentId } from "@t3tools/contracts";
@@ -32,7 +33,11 @@ import {
33
34
const layerTest = ServerSecretStore.layer.pipe(
35
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "t3-attachment-upload-" })),
35
- Layer.provideMerge(DocumentText.layer.pipe(Layer.provideMerge(NodeServices.layer))),
36
+ Layer.provideMerge(
37
+ DocumentText.layer.pipe(
38
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
39
+ ),
40
+ ),
41
);
42
43
const uploadInput = {
apps/server/src/assets/AttachmentUpload.ts
+3
-3
@@ -8,7 +8,7 @@ import {
8
} from "@t3tools/contracts";
9
import { isSvgAttachment } from "@t3tools/shared/image";
10
import * as Clock from "effect/Clock";
11
-import * as Crypto from "effect/Crypto";
11
+import * as SecureRandom from "effect/crypto/SecureRandom";
12
import * as Effect from "effect/Effect";
13
import * as FileSystem from "effect/FileSystem";
14
import * as Option from "effect/Option";
@@ -178,8 +178,8 @@ export const storeAttachmentUpload = Effect.fn("AttachmentUpload.store")(functio
178
attachmentsDir: config.attachmentsDir,
179
relativePath,
180
});
181
- const crypto = yield* Crypto.Crypto;
182
- const partId = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
181
+ const random = yield* SecureRandom.SecureRandom;
182
+ const partId = yield* random.uuidV4();
183
const partPath = resolveAttachmentRelativePath({
184
attachmentsDir: config.attachmentsDir,
185
relativePath: `${relativePath}.${partId}.part`,
apps/server/src/assets/NativeAppIconResolver.ts
+7
-5
@@ -1,7 +1,8 @@
1
import type { ToolActivityNativeAppReference } from "@t3tools/contracts";
2
import * as Cache from "effect/Cache";
3
import * as Cause from "effect/Cause";
4
-import * as Crypto from "effect/Crypto";
4
+import * as Digest from "effect/crypto/Digest";
5
+import * as SecureRandom from "effect/crypto/SecureRandom";
6
import * as Effect from "effect/Effect";
7
import * as Clock from "effect/Clock";
8
import * as Context from "effect/Context";
@@ -174,10 +175,11 @@ const resolveNativeAppIconUncached = Effect.fn("NativeAppIconResolver.resolveUnc
175
const appVersion =
176
(yield* plistValue(infoPlistPath, "CFBundleVersion")) ||
177
(yield* plistValue(infoPlistPath, "CFBundleShortVersionString"));
177
- const crypto = yield* Crypto.Crypto;
178
- const cacheKey = yield* crypto
178
+ const random = yield* SecureRandom.SecureRandom;
179
+ const digest = yield* Digest.Digest;
180
+ const cacheKey = yield* digest
181
.digest(
180
- "SHA-256",
182
+ Digest.sha256,
183
new TextEncoder().encode(`${canonicalAppPath}\0${appVersion}\0${sourceIconPath}`),
184
)
185
.pipe(Effect.map(Hex.encode), Effect.orDie);
@@ -188,7 +190,7 @@ const resolveNativeAppIconUncached = Effect.fn("NativeAppIconResolver.resolveUnc
190
yield* fileSystem.makeDirectory(cacheDirectory, { recursive: true });
191
const temporaryPath = path.join(
192
cacheDirectory,
191
- `.${cacheKey}-${process.pid}-${(yield* Clock.currentTimeMillis).toString(36)}-${yield* crypto.randomUUIDv4().pipe(Effect.orDie)}.png`,
193
+ `.${cacheKey}-${process.pid}-${(yield* Clock.currentTimeMillis).toString(36)}-${yield* random.uuidV4()}.png`,
194
);
195
yield* commandOutput("/usr/bin/sips", [
196
"-z",
apps/server/src/auth/EnvironmentAuth.test.ts
+645
-628
@@ -1,6 +1,7 @@
1
// @effect-diagnostics-next-line nodeBuiltinImport:off -- Effect's Crypto has no generateKeyPairSync or sign.
2
import * as NodeCrypto from "node:crypto";
3
4
+import * as NodePlatformCrypto from "@effect/platform-node/NodeCrypto";
5
import * as NodeServices from "@effect/platform-node/NodeServices";
6
import { authScopeResponse, AuthStandardClientScopes } from "@t3tools/contracts";
7
import {
@@ -109,498 +110,406 @@ const makeDpopKey = () => {
110
};
111
};
112
112
-it.layer(NodeServices.layer)("EnvironmentAuth.layer", (it) => {
113
- it.effect("uses the reusable dev cookie without overriding a normal scoped cookie", () =>
114
- Effect.gen(function* () {
115
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
116
- const sessions = yield* SessionStore.SessionStore;
117
- const token = "reusable-dev-auth-token-that-is-long-enough";
118
- const devExchange = yield* serverAuth.createBrowserSession(token, requestMetadata);
119
- const pairing = yield* serverAuth.issuePairingCredential({ scopes: ["orchestration:read"] });
120
- const scopedExchange = yield* serverAuth.createBrowserSession(
121
- pairing.credential,
122
- requestMetadata,
123
- );
124
- const request = {
125
- cookies: {
126
- [sessions.cookieName]: scopedExchange.sessionToken,
127
- [devExchange.cookieName ?? "missing"]: devExchange.sessionToken,
128
- },
129
- headers: {},
130
- } as unknown as Parameters<
131
- EnvironmentAuth.EnvironmentAuth["Service"]["authenticateHttpRequest"]
132
- >[0];
133
-
134
- const authenticated = yield* serverAuth.authenticateHttpRequest(request);
135
- expect(devExchange.cookieName).toMatch(/^t3_dev_session_/);
136
- expect(devExchange.expireNormalCookie).toBe(true);
137
- expect(devExchange.response).toMatchObject(authScopeResponse(AuthStandardClientScopes));
138
- expect(authenticated.scopes).toEqual(["orchestration:read"]);
139
- }).pipe(
140
- Effect.provide(
141
- layerEnvironmentAuth({
142
- mode: "web",
143
- devUrl: new URL("http://127.0.0.1:5173"),
144
- devAuthToken: Redacted.make("reusable-dev-auth-token-that-is-long-enough"),
145
- }),
146
- ),
147
- ),
148
- );
113
+it.layer(Layer.mergeAll(NodeServices.layer, NodePlatformCrypto.layer))(
114
+ "EnvironmentAuth.layer",
115
+ (it) => {
116
+ it.effect("uses the reusable dev cookie without overriding a normal scoped cookie", () =>
117
+ Effect.gen(function* () {
118
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
119
+ const sessions = yield* SessionStore.SessionStore;
120
+ const token = "reusable-dev-auth-token-that-is-long-enough";
121
+ const devExchange = yield* serverAuth.createBrowserSession(token, requestMetadata);
122
+ const pairing = yield* serverAuth.issuePairingCredential({
123
+ scopes: ["orchestration:read"],
124
+ });
125
+ const scopedExchange = yield* serverAuth.createBrowserSession(
126
+ pairing.credential,
127
+ requestMetadata,
128
+ );
129
+ const request = {
130
+ cookies: {
131
+ [sessions.cookieName]: scopedExchange.sessionToken,
132
+ [devExchange.cookieName ?? "missing"]: devExchange.sessionToken,
133
+ },
134
+ headers: {},
135
+ } as unknown as Parameters<
136
+ EnvironmentAuth.EnvironmentAuth["Service"]["authenticateHttpRequest"]
137
+ >[0];
138
150
- it.effect("does not fall back to the dev cookie after a normal cookie is rejected", () =>
151
- Effect.gen(function* () {
152
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
153
- const sessions = yield* SessionStore.SessionStore;
154
- const token = "reusable-dev-auth-token-that-is-long-enough";
155
- const devExchange = yield* serverAuth.createBrowserSession(token, requestMetadata);
156
- const pairing = yield* serverAuth.issuePairingCredential({ scopes: ["orchestration:read"] });
157
- const scopedExchange = yield* serverAuth.createBrowserSession(
158
- pairing.credential,
159
- requestMetadata,
160
- );
161
- const scoped = yield* sessions.verify(scopedExchange.sessionToken);
162
- yield* sessions.revoke(scoped.sessionId);
163
- const request = {
164
- cookies: {
165
- [sessions.cookieName]: scopedExchange.sessionToken,
166
- [devExchange.cookieName ?? "missing"]: devExchange.sessionToken,
167
- },
168
- headers: {},
169
- } as unknown as Parameters<
170
- EnvironmentAuth.EnvironmentAuth["Service"]["authenticateHttpRequest"]
171
- >[0];
172
-
173
- const error = yield* Effect.flip(serverAuth.authenticateHttpRequest(request));
174
- expect(error._tag).toBe("ServerAuthInvalidCredentialError");
175
- }).pipe(
176
- Effect.provide(
177
- layerEnvironmentAuth({
178
- mode: "web",
179
- devUrl: new URL("http://127.0.0.1:5173"),
180
- devAuthToken: Redacted.make("reusable-dev-auth-token-that-is-long-enough"),
181
- }),
139
+ const authenticated = yield* serverAuth.authenticateHttpRequest(request);
140
+ expect(devExchange.cookieName).toMatch(/^t3_dev_session_/);
141
+ expect(devExchange.expireNormalCookie).toBe(true);
142
+ expect(devExchange.response).toMatchObject(authScopeResponse(AuthStandardClientScopes));
143
+ expect(authenticated.scopes).toEqual(["orchestration:read"]);
144
+ }).pipe(
145
+ Effect.provide(
146
+ layerEnvironmentAuth({
147
+ mode: "web",
148
+ devUrl: new URL("http://127.0.0.1:5173"),
149
+ devAuthToken: Redacted.make("reusable-dev-auth-token-that-is-long-enough"),
150
+ }),
151
+ ),
152
),
183
- ),
184
- );
153
+ );
154
186
- it.effect("does not use the dev cookie when Authorization is invalid or empty", () =>
187
- Effect.gen(function* () {
188
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
189
- const token = "reusable-dev-auth-token-that-is-long-enough";
190
- const devExchange = yield* serverAuth.createBrowserSession(token, requestMetadata);
191
- for (const authorization of [
192
- "Bearer invalid",
193
- "bearer invalid",
194
- "bEaReR invalid",
195
- "Basic invalid",
196
- "",
197
- ] as const) {
155
+ it.effect("does not fall back to the dev cookie after a normal cookie is rejected", () =>
156
+ Effect.gen(function* () {
157
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
158
+ const sessions = yield* SessionStore.SessionStore;
159
+ const token = "reusable-dev-auth-token-that-is-long-enough";
160
+ const devExchange = yield* serverAuth.createBrowserSession(token, requestMetadata);
161
+ const pairing = yield* serverAuth.issuePairingCredential({
162
+ scopes: ["orchestration:read"],
163
+ });
164
+ const scopedExchange = yield* serverAuth.createBrowserSession(
165
+ pairing.credential,
166
+ requestMetadata,
167
+ );
168
+ const scoped = yield* sessions.verify(scopedExchange.sessionToken);
169
+ yield* sessions.revoke(scoped.sessionId);
170
const request = {
199
- cookies: { [devExchange.cookieName ?? "missing"]: devExchange.sessionToken },
200
- headers: { authorization },
171
+ cookies: {
172
+ [sessions.cookieName]: scopedExchange.sessionToken,
173
+ [devExchange.cookieName ?? "missing"]: devExchange.sessionToken,
174
+ },
175
+ headers: {},
176
} as unknown as Parameters<
177
EnvironmentAuth.EnvironmentAuth["Service"]["authenticateHttpRequest"]
178
>[0];
179
+
180
const error = yield* Effect.flip(serverAuth.authenticateHttpRequest(request));
205
- expect(EnvironmentAuth.isServerAuthCredentialError(error)).toBe(true);
206
- }
207
- }).pipe(
208
- Effect.provide(
209
- layerEnvironmentAuth({
210
- mode: "web",
211
- devUrl: new URL("http://127.0.0.1:5173"),
212
- devAuthToken: Redacted.make("reusable-dev-auth-token-that-is-long-enough"),
213
- }),
181
+ expect(error._tag).toBe("ServerAuthInvalidCredentialError");
182
+ }).pipe(
183
+ Effect.provide(
184
+ layerEnvironmentAuth({
185
+ mode: "web",
186
+ devUrl: new URL("http://127.0.0.1:5173"),
187
+ devAuthToken: Redacted.make("reusable-dev-auth-token-that-is-long-enough"),
188
+ }),
189
+ ),
190
),
215
- ),
216
- );
191
+ );
192
218
- it.effect("exchanges the reusable dev token for a local scoped OAuth session", () =>
219
- Effect.gen(function* () {
220
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
221
- const sessions = yield* SessionStore.SessionStore;
222
- const token = "reusable-dev-auth-token-that-is-long-enough";
223
- const exchanged = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
224
- token,
225
- ["orchestration:read"],
226
- requestMetadata,
227
- );
228
-
229
- expect(exchanged.access_token).not.toBe(token);
230
- expect(exchanged.scope).toBe("orchestration:read");
231
- const dpop = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
232
- token,
233
- ["orchestration:read"],
234
- requestMetadata,
235
- { proofKeyThumbprint: "test-proof-key" },
236
- );
237
- expect(dpop.access_token).not.toBe(token);
238
- expect(dpop.access_token).not.toBe(exchanged.access_token);
239
- expect(dpop.token_type).toBe("DPoP");
240
- expect(dpop.scope).toBe("orchestration:read");
241
-
242
- const secondBearer = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
243
- token,
244
- ["orchestration:read"],
245
- requestMetadata,
246
- );
247
- const firstSession = yield* serverAuth.authenticateHttpRequest(
248
- makeBearerRequest(exchanged.access_token),
249
- );
250
- const secondSession = yield* serverAuth.authenticateHttpRequest(
251
- makeBearerRequest(secondBearer.access_token),
252
- );
253
- expect(firstSession.subject).toBe("reusable-dev-token-child");
254
- expect(secondSession.subject).toBe("reusable-dev-token-child");
255
- expect((yield* sessions.verify(token)).subject).toBe("reusable-dev-token");
256
- const before = yield* serverAuth.listClientSessions(firstSession.sessionId);
257
- const denied = yield* serverAuth
258
- .exchangeBootstrapCredentialForAccessToken(token, ["review:write"], requestMetadata)
259
- .pipe(Effect.flip);
260
- expect(denied._tag).toBe("ServerAuthScopeNotGrantedError");
261
- const empty = yield* serverAuth
262
- .exchangeBootstrapCredentialForAccessToken(token, [], requestMetadata)
263
- .pipe(Effect.flip);
264
- expect(empty._tag).toBe("ServerAuthScopeNotGrantedError");
265
- expect(yield* serverAuth.listClientSessions(firstSession.sessionId)).toEqual(before);
266
- }).pipe(
267
- Effect.provide(
268
- layerEnvironmentAuth({
269
- mode: "web",
270
- devUrl: new URL("http://127.0.0.1:5173"),
271
- devAuthToken: Redacted.make("reusable-dev-auth-token-that-is-long-enough"),
272
- }),
193
+ it.effect("does not use the dev cookie when Authorization is invalid or empty", () =>
194
+ Effect.gen(function* () {
195
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
196
+ const token = "reusable-dev-auth-token-that-is-long-enough";
197
+ const devExchange = yield* serverAuth.createBrowserSession(token, requestMetadata);
198
+ for (const authorization of [
199
+ "Bearer invalid",
200
+ "bearer invalid",
201
+ "bEaReR invalid",
202
+ "Basic invalid",
203
+ "",
204
+ ] as const) {
205
+ const request = {
206
+ cookies: { [devExchange.cookieName ?? "missing"]: devExchange.sessionToken },
207
+ headers: { authorization },
208
+ } as unknown as Parameters<
209
+ EnvironmentAuth.EnvironmentAuth["Service"]["authenticateHttpRequest"]
210
+ >[0];
211
+ const error = yield* Effect.flip(serverAuth.authenticateHttpRequest(request));
212
+ expect(EnvironmentAuth.isServerAuthCredentialError(error)).toBe(true);
213
+ }
214
+ }).pipe(
215
+ Effect.provide(
216
+ layerEnvironmentAuth({
217
+ mode: "web",
218
+ devUrl: new URL("http://127.0.0.1:5173"),
219
+ devAuthToken: Redacted.make("reusable-dev-auth-token-that-is-long-enough"),
220
+ }),
221
+ ),
222
),
274
- ),
275
- );
223
+ );
224
277
- it.effect("uses a one-time startup credential after local dev token revocation", () =>
278
- Effect.gen(function* () {
279
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
280
- const sessions = yield* SessionStore.SessionStore;
281
- const token = "reusable-dev-auth-token-that-is-long-enough";
282
- const initial = yield* serverAuth.issueStartupPairingCredential();
283
- const seeded = yield* sessions.verify(token);
284
-
285
- yield* sessions.revoke(seeded.sessionId);
286
- const recovery = yield* serverAuth.issueStartupPairingCredential();
287
-
288
- expect(initial.credential).toBe(token);
289
- expect(recovery.credential).not.toBe(token);
290
- expect((yield* Effect.flip(sessions.verify(token)))._tag).toBe("SessionTokenRevokedError");
291
- expect(
292
- (yield* serverAuth.createBrowserSession(recovery.credential, requestMetadata)).response,
293
- ).toMatchObject({ authenticated: true, ...authScopeResponse(AuthStandardClientScopes) });
294
- }).pipe(
295
- Effect.provide(
296
- layerEnvironmentAuth({
297
- mode: "web",
298
- devUrl: new URL("http://127.0.0.1:5173"),
299
- devAuthToken: Redacted.make("reusable-dev-auth-token-that-is-long-enough"),
300
- }),
225
+ it.effect("exchanges the reusable dev token for a local scoped OAuth session", () =>
226
+ Effect.gen(function* () {
227
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
228
+ const sessions = yield* SessionStore.SessionStore;
229
+ const token = "reusable-dev-auth-token-that-is-long-enough";
230
+ const exchanged = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
231
+ token,
232
+ ["orchestration:read"],
233
+ requestMetadata,
234
+ );
235
+
236
+ expect(exchanged.access_token).not.toBe(token);
237
+ expect(exchanged.scope).toBe("orchestration:read");
238
+ const dpop = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
239
+ token,
240
+ ["orchestration:read"],
241
+ requestMetadata,
242
+ { proofKeyThumbprint: "test-proof-key" },
243
+ );
244
+ expect(dpop.access_token).not.toBe(token);
245
+ expect(dpop.access_token).not.toBe(exchanged.access_token);
246
+ expect(dpop.token_type).toBe("DPoP");
247
+ expect(dpop.scope).toBe("orchestration:read");
248
+
249
+ const secondBearer = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
250
+ token,
251
+ ["orchestration:read"],
252
+ requestMetadata,
253
+ );
254
+ const firstSession = yield* serverAuth.authenticateHttpRequest(
255
+ makeBearerRequest(exchanged.access_token),
256
+ );
257
+ const secondSession = yield* serverAuth.authenticateHttpRequest(
258
+ makeBearerRequest(secondBearer.access_token),
259
+ );
260
+ expect(firstSession.subject).toBe("reusable-dev-token-child");
261
+ expect(secondSession.subject).toBe("reusable-dev-token-child");
262
+ expect((yield* sessions.verify(token)).subject).toBe("reusable-dev-token");
263
+ const before = yield* serverAuth.listClientSessions(firstSession.sessionId);
264
+ const denied = yield* serverAuth
265
+ .exchangeBootstrapCredentialForAccessToken(token, ["review:write"], requestMetadata)
266
+ .pipe(Effect.flip);
267
+ expect(denied._tag).toBe("ServerAuthScopeNotGrantedError");
268
+ const empty = yield* serverAuth
269
+ .exchangeBootstrapCredentialForAccessToken(token, [], requestMetadata)
270
+ .pipe(Effect.flip);
271
+ expect(empty._tag).toBe("ServerAuthScopeNotGrantedError");
272
+ expect(yield* serverAuth.listClientSessions(firstSession.sessionId)).toEqual(before);
273
+ }).pipe(
274
+ Effect.provide(
275
+ layerEnvironmentAuth({
276
+ mode: "web",
277
+ devUrl: new URL("http://127.0.0.1:5173"),
278
+ devAuthToken: Redacted.make("reusable-dev-auth-token-that-is-long-enough"),
279
+ }),
280
+ ),
281
),
302
- ),
303
- );
282
+ );
283
305
- it.effect("prefers a bearer token over a stale legacy cookie", () =>
306
- Effect.gen(function* () {
307
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
308
- const sessions = yield* SessionStore.SessionStore;
309
- const bearer = yield* serverAuth.issueSession();
310
- const verified = yield* serverAuth.authenticateHttpRequest({
311
- cookies: { [sessions.legacyCookieName ?? "t3_session"]: "stale" },
312
- headers: { authorization: `Bearer ${bearer.token}` },
313
- } as never);
314
-
315
- expect(verified.sessionId).toBe(bearer.sessionId);
316
- }).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web", host: "192.168.1.50" }))),
317
- );
284
+ it.effect("uses a one-time startup credential after local dev token revocation", () =>
285
+ Effect.gen(function* () {
286
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
287
+ const sessions = yield* SessionStore.SessionStore;
288
+ const token = "reusable-dev-auth-token-that-is-long-enough";
289
+ const initial = yield* serverAuth.issueStartupPairingCredential();
290
+ const seeded = yield* sessions.verify(token);
291
319
- it.effect("prefers a bearer token over an empty primary cookie", () =>
320
- Effect.gen(function* () {
321
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
322
- const sessions = yield* SessionStore.SessionStore;
323
- const bearer = yield* serverAuth.issueSession();
324
- const verified = yield* serverAuth.authenticateHttpRequest({
325
- cookies: { [sessions.cookieName]: "" },
326
- headers: { authorization: `Bearer ${bearer.token}` },
327
- } as never);
328
-
329
- expect(verified.sessionId).toBe(bearer.sessionId);
330
- }).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web", host: "192.168.1.50" }))),
331
- );
292
+ yield* sessions.revoke(seeded.sessionId);
293
+ const recovery = yield* serverAuth.issueStartupPairingCredential();
294
333
- it.effect("preserves pairing grants after rejecting scopes they do not grant", () =>
334
- Effect.gen(function* () {
335
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
336
- const pairingCredential = yield* serverAuth.issuePairingCredential({
337
- scopes: ["orchestration:read", "orchestration:operate"],
338
- });
295
+ expect(initial.credential).toBe(token);
296
+ expect(recovery.credential).not.toBe(token);
297
+ expect((yield* Effect.flip(sessions.verify(token)))._tag).toBe("SessionTokenRevokedError");
298
+ expect(
299
+ (yield* serverAuth.createBrowserSession(recovery.credential, requestMetadata)).response,
300
+ ).toMatchObject({ authenticated: true, ...authScopeResponse(AuthStandardClientScopes) });
301
+ }).pipe(
302
+ Effect.provide(
303
+ layerEnvironmentAuth({
304
+ mode: "web",
305
+ devUrl: new URL("http://127.0.0.1:5173"),
306
+ devAuthToken: Redacted.make("reusable-dev-auth-token-that-is-long-enough"),
307
+ }),
308
+ ),
309
+ ),
310
+ );
311
340
- const error = yield* serverAuth
341
- .exchangeBootstrapCredentialForAccessToken(
342
- pairingCredential.credential,
343
- ["access:write"],
344
- requestMetadata,
345
- )
346
- .pipe(Effect.flip);
347
-
348
- expect(error._tag).toBe("ServerAuthScopeNotGrantedError");
349
- expect((yield* serverAuth.listPairingLinks()).map((link) => link.id)).toContain(
350
- pairingCredential.id,
351
- );
352
- expect(yield* serverAuth.listSessions()).toEqual([]);
353
-
354
- const token = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
355
- pairingCredential.credential,
356
- ["orchestration:read"],
357
- requestMetadata,
358
- );
359
- const session = yield* serverAuth.authenticateHttpRequest(
360
- makeBearerRequest(token.access_token),
361
- );
362
-
363
- expect(token.scope).toBe("orchestration:read");
364
- expect(session.scopes).toEqual(["orchestration:read"]);
365
- expect((yield* serverAuth.listPairingLinks()).map((link) => link.id)).not.toContain(
366
- pairingCredential.id,
367
- );
368
- const reused = yield* serverAuth
369
- .exchangeBootstrapCredentialForAccessToken(
370
- pairingCredential.credential,
371
- ["orchestration:read"],
372
- requestMetadata,
373
- )
374
- .pipe(Effect.flip);
375
- expect(reused._tag).toBe("ServerAuthInvalidCredentialError");
376
- }).pipe(Effect.provide(layerEnvironmentAuth())),
377
- );
312
+ it.effect("prefers a bearer token over a stale legacy cookie", () =>
313
+ Effect.gen(function* () {
314
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
315
+ const sessions = yield* SessionStore.SessionStore;
316
+ const bearer = yield* serverAuth.issueSession();
317
+ const verified = yield* serverAuth.authenticateHttpRequest({
318
+ cookies: { [sessions.legacyCookieName ?? "t3_session"]: "stale" },
319
+ headers: { authorization: `Bearer ${bearer.token}` },
320
+ } as never);
321
379
- it.effect.each([
380
- { label: "omits scope", requestedScopes: undefined },
381
- {
382
- label: "requests unsupported permissions alongside a granted one",
383
- requestedScopes: ["orchestration:read", "access:write"] as const,
384
- },
385
- ])("inherits a constrained pairing grant when token exchange $label", ({ requestedScopes }) =>
386
- Effect.gen(function* () {
387
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
388
- const pairingCredential = yield* serverAuth.issuePairingCredential({
389
- scopes: ["orchestration:read"],
390
- });
322
+ expect(verified.sessionId).toBe(bearer.sessionId);
323
+ }).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web", host: "192.168.1.50" }))),
324
+ );
325
392
- const token = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
393
- pairingCredential.credential,
394
- requestedScopes,
395
- requestMetadata,
396
- );
326
+ it.effect("prefers a bearer token over an empty primary cookie", () =>
327
+ Effect.gen(function* () {
328
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
329
+ const sessions = yield* SessionStore.SessionStore;
330
+ const bearer = yield* serverAuth.issueSession();
331
+ const verified = yield* serverAuth.authenticateHttpRequest({
332
+ cookies: { [sessions.cookieName]: "" },
333
+ headers: { authorization: `Bearer ${bearer.token}` },
334
+ } as never);
335
398
- expect(token.scope).toBe("orchestration:read");
399
- }).pipe(Effect.provide(layerEnvironmentAuth())),
400
- );
336
+ expect(verified.sessionId).toBe(bearer.sessionId);
337
+ }).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web", host: "192.168.1.50" }))),
338
+ );
339
402
- it.effect(
403
- "preserves a rejected MCP pairing code for exactly one concurrent lower-access retry",
404
- () =>
340
+ it.effect("preserves pairing grants after rejecting scopes they do not grant", () =>
341
Effect.gen(function* () {
342
const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
407
- const pairing = yield* serverAuth.issuePairingCredential({
408
- scopes: ["orchestration:read"],
343
+ const pairingCredential = yield* serverAuth.issuePairingCredential({
344
+ scopes: ["orchestration:read", "orchestration:operate"],
345
});
346
411
- const rejected = yield* Effect.flip(
412
- serverAuth.consumeMcpApprovalCode(pairing.credential, "full-access"),
347
+ const error = yield* serverAuth
348
+ .exchangeBootstrapCredentialForAccessToken(
349
+ pairingCredential.credential,
350
+ ["access:write"],
351
+ requestMetadata,
352
+ )
353
+ .pipe(Effect.flip);
354
+
355
+ expect(error._tag).toBe("ServerAuthScopeNotGrantedError");
356
+ expect((yield* serverAuth.listPairingLinks()).map((link) => link.id)).toContain(
357
+ pairingCredential.id,
358
);
414
- expect(rejected).toMatchObject({
415
- _tag: "ServerAuthMcpApprovalCodeError",
416
- reason: "insufficient_scope",
417
- });
359
+ expect(yield* serverAuth.listSessions()).toEqual([]);
360
419
- const retry = Effect.result(
420
- serverAuth.consumeMcpApprovalCode(pairing.credential, "read-only"),
361
+ const token = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
362
+ pairingCredential.credential,
363
+ ["orchestration:read"],
364
+ requestMetadata,
365
+ );
366
+ const session = yield* serverAuth.authenticateHttpRequest(
367
+ makeBearerRequest(token.access_token),
368
);
422
- const results = yield* Effect.all([retry, retry], { concurrency: "unbounded" });
369
424
- expect(results.filter((result) => result._tag === "Success")).toHaveLength(1);
425
- expect(results.filter((result) => result._tag === "Failure")).toMatchObject([
426
- { failure: { _tag: "ServerAuthMcpApprovalCodeError", reason: "unknown_or_used" } },
427
- ]);
370
+ expect(token.scope).toBe("orchestration:read");
371
+ expect(session.scopes).toEqual(["orchestration:read"]);
372
+ expect((yield* serverAuth.listPairingLinks()).map((link) => link.id)).not.toContain(
373
+ pairingCredential.id,
374
+ );
375
+ const reused = yield* serverAuth
376
+ .exchangeBootstrapCredentialForAccessToken(
377
+ pairingCredential.credential,
378
+ ["orchestration:read"],
379
+ requestMetadata,
380
+ )
381
+ .pipe(Effect.flip);
382
+ expect(reused._tag).toBe("ServerAuthInvalidCredentialError");
383
}).pipe(Effect.provide(layerEnvironmentAuth())),
429
- );
430
-
431
- it.effect("narrows seeded desktop grants to the requested scopes", () =>
432
- Effect.gen(function* () {
433
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
434
- const token = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
435
- "desktop-bootstrap-token",
436
- ["orchestration:read"],
437
- requestMetadata,
438
- );
439
- const session = yield* serverAuth.authenticateHttpRequest(
440
- makeBearerRequest(token.access_token),
441
- );
442
-
443
- expect(token.scope).toBe("orchestration:read");
444
- expect(session.scopes).toEqual(["orchestration:read"]);
445
- }).pipe(
446
- Effect.provide(layerEnvironmentAuth({ desktopBootstrapToken: "desktop-bootstrap-token" })),
447
- ),
448
- );
449
-
450
- it.effect("rotates desktop bearer sessions without accumulating authorized clients", () =>
451
- Effect.gen(function* () {
452
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
453
- const sessions = yield* SessionStore.SessionStore;
454
- const browser = yield* serverAuth.createBrowserSession(
455
- "desktop-bootstrap-token",
456
- requestMetadata,
457
- );
458
- const browserSession = yield* serverAuth.authenticateHttpRequest(
459
- makeCookieRequest(sessions.cookieName, browser.sessionToken),
460
- );
461
- const staleSessions = yield* Effect.forEach([1, 2, 3], () =>
462
- sessions.issue({ subject: "desktop-bootstrap", method: "bearer-access-token" }),
463
- );
464
- const pairing = yield* serverAuth.issuePairingCredential();
465
- const paired = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
466
- pairing.credential,
467
- undefined,
468
- { ...requestMetadata, label: "T3 Code Desktop" },
469
- );
470
- const first = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
471
- "desktop-bootstrap-token",
472
- undefined,
473
- requestMetadata,
474
- );
475
- const firstSession = yield* serverAuth.authenticateHttpRequest(
476
- makeBearerRequest(first.access_token),
477
- );
478
- const second = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
479
- "desktop-bootstrap-token",
480
- undefined,
481
- requestMetadata,
482
- );
483
-
484
- const active = yield* serverAuth.listSessions();
485
- const firstError = yield* serverAuth
486
- .authenticateHttpRequest(makeBearerRequest(first.access_token))
487
- .pipe(Effect.flip);
488
- const secondSession = yield* serverAuth.authenticateHttpRequest(
489
- makeBearerRequest(second.access_token),
490
- );
491
-
492
- expect(active).toHaveLength(3);
493
- expect(active.map((entry) => entry.sessionId)).toContain(browserSession.sessionId);
494
- expect(active.map((entry) => entry.sessionId)).toContain(secondSession.sessionId);
495
- expect(active.map((entry) => entry.sessionId)).not.toContain(firstSession.sessionId);
496
- expect(firstError._tag).toBe("ServerAuthInvalidCredentialError");
497
- for (const stale of staleSessions) {
498
- const error = yield* sessions.verify(stale.token).pipe(Effect.flip);
499
- expect(error._tag).toBe("SessionTokenRevokedError");
500
- }
501
- const pairedSession = yield* serverAuth.authenticateHttpRequest(
502
- makeBearerRequest(paired.access_token),
503
- );
504
- expect(pairedSession.subject).toBe("one-time-token");
505
- expect(active.map((entry) => entry.sessionId)).toContain(pairedSession.sessionId);
506
- }).pipe(
507
- Effect.provide(
508
- layerEnvironmentAuth({
509
- desktopBootstrapToken: "desktop-bootstrap-token",
510
- }),
511
- ),
512
- ),
513
- );
384
+ );
385
+
386
+ it.effect.each([
387
+ { label: "omits scope", requestedScopes: undefined },
388
+ {
389
+ label: "requests unsupported permissions alongside a granted one",
390
+ requestedScopes: ["orchestration:read", "access:write"] as const,
391
+ },
392
+ ])("inherits a constrained pairing grant when token exchange $label", ({ requestedScopes }) =>
393
+ Effect.gen(function* () {
394
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
395
+ const pairingCredential = yield* serverAuth.issuePairingCredential({
396
+ scopes: ["orchestration:read"],
397
+ });
398
515
- it.effect("issues startup pairing URLs that bootstrap administrative sessions", () =>
516
- Effect.gen(function* () {
517
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
518
- const sessions = yield* SessionStore.SessionStore;
519
-
520
- const pairingUrl = yield* serverAuth.issueStartupPairingUrl("http://127.0.0.1:3773");
521
- const token = new URLSearchParams(new URL(pairingUrl).hash.slice(1)).get("token");
522
- const listedPairingLinks = yield* serverAuth.listPairingLinks();
523
- expect(token).toBeTruthy();
524
- expect(
525
- listedPairingLinks.some(
526
- (pairingLink) => pairingLink.subject === "administrative-bootstrap",
527
- ),
528
- ).toBe(false);
399
+ const token = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
400
+ pairingCredential.credential,
401
+ requestedScopes,
402
+ requestMetadata,
403
+ );
404
530
- const exchanged = yield* serverAuth.createBrowserSession(token ?? "", requestMetadata);
531
- const verified = yield* serverAuth.authenticateHttpRequest(
532
- makeCookieRequest(sessions.cookieName, exchanged.sessionToken),
533
- );
405
+ expect(token.scope).toBe("orchestration:read");
406
+ }).pipe(Effect.provide(layerEnvironmentAuth())),
407
+ );
408
+
409
+ it.effect(
410
+ "preserves a rejected MCP pairing code for exactly one concurrent lower-access retry",
411
+ () =>
412
+ Effect.gen(function* () {
413
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
414
+ const pairing = yield* serverAuth.issuePairingCredential({
415
+ scopes: ["orchestration:read"],
416
+ });
417
+
418
+ const rejected = yield* Effect.flip(
419
+ serverAuth.consumeMcpApprovalCode(pairing.credential, "full-access"),
420
+ );
421
+ expect(rejected).toMatchObject({
422
+ _tag: "ServerAuthMcpApprovalCodeError",
423
+ reason: "insufficient_scope",
424
+ });
425
+
426
+ const retry = Effect.result(
427
+ serverAuth.consumeMcpApprovalCode(pairing.credential, "read-only"),
428
+ );
429
+ const results = yield* Effect.all([retry, retry], { concurrency: "unbounded" });
430
+
431
+ expect(results.filter((result) => result._tag === "Success")).toHaveLength(1);
432
+ expect(results.filter((result) => result._tag === "Failure")).toMatchObject([
433
+ { failure: { _tag: "ServerAuthMcpApprovalCodeError", reason: "unknown_or_used" } },
434
+ ]);
435
+ }).pipe(Effect.provide(layerEnvironmentAuth())),
436
+ );
437
+
438
+ it.effect("narrows seeded desktop grants to the requested scopes", () =>
439
+ Effect.gen(function* () {
440
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
441
+ const token = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
442
+ "desktop-bootstrap-token",
443
+ ["orchestration:read"],
444
+ requestMetadata,
445
+ );
446
+ const session = yield* serverAuth.authenticateHttpRequest(
447
+ makeBearerRequest(token.access_token),
448
+ );
449
535
- expect(verified.scopes).toEqual(AuthStandardClientScopes);
536
- expect(verified.subject).toBe("administrative-bootstrap");
537
- }).pipe(Effect.provide(layerEnvironmentAuth())),
538
- );
450
+ expect(token.scope).toBe("orchestration:read");
451
+ expect(session.scopes).toEqual(["orchestration:read"]);
452
+ }).pipe(
453
+ Effect.provide(layerEnvironmentAuth({ desktopBootstrapToken: "desktop-bootstrap-token" })),
454
+ ),
455
+ );
456
540
- it.effect(
541
- "lists pairing links and revokes other sessions while keeping the administrative session",
542
- () =>
457
+ it.effect("rotates desktop bearer sessions without accumulating authorized clients", () =>
458
Effect.gen(function* () {
459
const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
460
const sessions = yield* SessionStore.SessionStore;
546
-
547
- const administrativeExchange = yield* serverAuth.createBrowserSession(
461
+ const browser = yield* serverAuth.createBrowserSession(
462
"desktop-bootstrap-token",
463
requestMetadata,
464
);
551
- const administrativeSession = yield* serverAuth.authenticateHttpRequest(
552
- makeCookieRequest(sessions.cookieName, administrativeExchange.sessionToken),
465
+ const browserSession = yield* serverAuth.authenticateHttpRequest(
466
+ makeCookieRequest(sessions.cookieName, browser.sessionToken),
467
);
554
- const pairingCredential = yield* serverAuth.issuePairingCredential({
555
- label: "Julius iPhone",
556
- });
557
- const listedPairingLinks = yield* serverAuth.listPairingLinks();
558
- const clientExchange = yield* serverAuth.createBrowserSession(
559
- pairingCredential.credential,
560
- {
561
- ...requestMetadata,
562
- deviceType: "mobile",
563
- os: "iOS",
564
- browser: "Safari",
565
- ipAddress: "192.168.1.88",
566
- },
468
+ const staleSessions = yield* Effect.forEach([1, 2, 3], () =>
469
+ sessions.issue({ subject: "desktop-bootstrap", method: "bearer-access-token" }),
470
);
568
- const clientSession = yield* serverAuth.authenticateHttpRequest(
569
- makeCookieRequest(sessions.cookieName, clientExchange.sessionToken),
471
+ const pairing = yield* serverAuth.issuePairingCredential();
472
+ const paired = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
473
+ pairing.credential,
474
+ undefined,
475
+ { ...requestMetadata, label: "T3 Code Desktop" },
476
);
571
- const clientsBeforeRevoke = yield* serverAuth.listClientSessions(
572
- administrativeSession.sessionId,
477
+ const first = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
478
+ "desktop-bootstrap-token",
479
+ undefined,
480
+ requestMetadata,
481
);
574
- const revokedCount = yield* serverAuth.revokeOtherClientSessions(
575
- administrativeSession.sessionId,
482
+ const firstSession = yield* serverAuth.authenticateHttpRequest(
483
+ makeBearerRequest(first.access_token),
484
);
577
- const clientsAfterRevoke = yield* serverAuth.listClientSessions(
578
- administrativeSession.sessionId,
485
+ const second = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
486
+ "desktop-bootstrap-token",
487
+ undefined,
488
+ requestMetadata,
489
);
490
581
- expect(listedPairingLinks.map((entry) => entry.id)).toContain(pairingCredential.id);
582
- expect(listedPairingLinks.find((entry) => entry.id === pairingCredential.id)?.label).toBe(
583
- "Julius iPhone",
491
+ const active = yield* serverAuth.listSessions();
492
+ const firstError = yield* serverAuth
493
+ .authenticateHttpRequest(makeBearerRequest(first.access_token))
494
+ .pipe(Effect.flip);
495
+ const secondSession = yield* serverAuth.authenticateHttpRequest(
496
+ makeBearerRequest(second.access_token),
497
);
585
- expect(clientsBeforeRevoke).toHaveLength(2);
586
- expect(
587
- clientsBeforeRevoke.find((entry) => entry.sessionId === administrativeSession.sessionId)
588
- ?.current,
589
- ).toBe(true);
590
- expect(
591
- clientsBeforeRevoke.find((entry) => entry.sessionId === clientSession.sessionId)?.current,
592
- ).toBe(false);
593
- expect(
594
- clientsBeforeRevoke.find((entry) => entry.sessionId === clientSession.sessionId)?.client
595
- .label,
596
- ).toBe("Julius iPhone");
597
- expect(
598
- clientsBeforeRevoke.find((entry) => entry.sessionId === clientSession.sessionId)?.client
599
- .deviceType,
600
- ).toBe("mobile");
601
- expect(revokedCount).toBe(1);
602
- expect(clientsAfterRevoke).toHaveLength(1);
603
- expect(clientsAfterRevoke[0]?.sessionId).toBe(administrativeSession.sessionId);
498
+
499
+ expect(active).toHaveLength(3);
500
+ expect(active.map((entry) => entry.sessionId)).toContain(browserSession.sessionId);
501
+ expect(active.map((entry) => entry.sessionId)).toContain(secondSession.sessionId);
502
+ expect(active.map((entry) => entry.sessionId)).not.toContain(firstSession.sessionId);
503
+ expect(firstError._tag).toBe("ServerAuthInvalidCredentialError");
504
+ for (const stale of staleSessions) {
505
+ const error = yield* sessions.verify(stale.token).pipe(Effect.flip);
506
+ expect(error._tag).toBe("SessionTokenRevokedError");
507
+ }
508
+ const pairedSession = yield* serverAuth.authenticateHttpRequest(
509
+ makeBearerRequest(paired.access_token),
510
+ );
511
+ expect(pairedSession.subject).toBe("one-time-token");
512
+ expect(active.map((entry) => entry.sessionId)).toContain(pairedSession.sessionId);
513
}).pipe(
514
Effect.provide(
515
layerEnvironmentAuth({
@@ -608,202 +517,310 @@ it.layer(NodeServices.layer)("EnvironmentAuth.layer", (it) => {
517
}),
518
),
519
),
611
- );
520
+ );
521
613
- it.effect("accepts cookie sessions on socket upgrades only from the app's own origins", () =>
614
- Effect.gen(function* () {
615
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
616
- const sessions = yield* SessionStore.SessionStore;
617
- const pairing = yield* serverAuth.issuePairingCredential();
618
- const exchanged = yield* serverAuth.createBrowserSession(pairing.credential, requestMetadata);
619
- const upgrade = (headers: Record<string, string>) =>
620
- serverAuth.authenticateWebSocketUpgrade(
621
- {
622
- url: "/ws",
623
- cookies: { [sessions.cookieName]: exchanged.sessionToken },
624
- headers: { host: "192.168.1.50:3773", ...headers },
625
- } as never,
626
- "rpc",
627
- );
522
+ it.effect("issues startup pairing URLs that bootstrap administrative sessions", () =>
523
+ Effect.gen(function* () {
524
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
525
+ const sessions = yield* SessionStore.SessionStore;
526
629
- yield* upgrade({ origin: "http://192.168.1.50:3773" });
630
- yield* upgrade({
631
- origin: "https://box.tail1234.ts.net",
632
- "x-forwarded-host": "box.tail1234.ts.net",
633
- });
634
- yield* upgrade({ origin: "t3code://app" });
635
- yield* upgrade({ origin: "http://localhost:5733" });
636
- yield* upgrade({});
637
-
638
- const otherPort = yield* Effect.flip(upgrade({ origin: "http://192.168.1.50:8080" }));
639
- expect(otherPort._tag).toBe("ServerAuthInvalidCredentialError");
640
- const opaque = yield* Effect.flip(upgrade({ origin: "null" }));
641
- expect(opaque._tag).toBe("ServerAuthInvalidCredentialError");
642
- }).pipe(
643
- Effect.provide(
644
- layerEnvironmentAuth({
645
- mode: "web",
646
- host: "192.168.1.50",
647
- devUrl: new URL("http://localhost:5733"),
648
- }),
649
- ),
650
- ),
651
- );
527
+ const pairingUrl = yield* serverAuth.issueStartupPairingUrl("http://127.0.0.1:3773");
528
+ const token = new URLSearchParams(new URL(pairingUrl).hash.slice(1)).get("token");
529
+ const listedPairingLinks = yield* serverAuth.listPairingLinks();
530
+ expect(token).toBeTruthy();
531
+ expect(
532
+ listedPairingLinks.some(
533
+ (pairingLink) => pairingLink.subject === "administrative-bootstrap",
534
+ ),
535
+ ).toBe(false);
536
653
- it.effect("accepts cookie sessions on HTTP requests only from the app's own origins", () =>
654
- Effect.gen(function* () {
655
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
656
- const sessions = yield* SessionStore.SessionStore;
657
- const pairing = yield* serverAuth.issuePairingCredential();
658
- const exchanged = yield* serverAuth.createBrowserSession(pairing.credential, requestMetadata);
659
- const post = (headers: Record<string, string>) =>
660
- serverAuth.authenticateHttpRequest({
661
- cookies: { [sessions.cookieName]: exchanged.sessionToken },
662
- headers: { host: "localhost:13773", ...headers },
663
- } as never);
537
+ const exchanged = yield* serverAuth.createBrowserSession(token ?? "", requestMetadata);
538
+ const verified = yield* serverAuth.authenticateHttpRequest(
539
+ makeCookieRequest(sessions.cookieName, exchanged.sessionToken),
540
+ );
541
665
- yield* post({ origin: "http://192.168.1.50:5733", "sec-fetch-site": "same-origin" });
666
- yield* post({ origin: "http://localhost:13773" });
667
-
668
- const otherPort = yield* Effect.flip(
669
- post({ origin: "http://localhost:3000", "sec-fetch-site": "same-site" }),
670
- );
671
- expect(otherPort._tag).toBe("ServerAuthInvalidCredentialError");
672
- const state = yield* serverAuth.getSessionState({
673
- cookies: { [sessions.cookieName]: exchanged.sessionToken },
674
- headers: { host: "localhost:13773", origin: "http://localhost:3000" },
675
- } as never);
676
- expect(state.authenticated).toBe(false);
677
- }).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web" }))),
678
- );
542
+ expect(verified.scopes).toEqual(AuthStandardClientScopes);
543
+ expect(verified.subject).toBe("administrative-bootstrap");
544
+ }).pipe(Effect.provide(layerEnvironmentAuth())),
545
+ );
546
+
547
+ it.effect(
548
+ "lists pairing links and revokes other sessions while keeping the administrative session",
549
+ () =>
550
+ Effect.gen(function* () {
551
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
552
+ const sessions = yield* SessionStore.SessionStore;
553
+
554
+ const administrativeExchange = yield* serverAuth.createBrowserSession(
555
+ "desktop-bootstrap-token",
556
+ requestMetadata,
557
+ );
558
+ const administrativeSession = yield* serverAuth.authenticateHttpRequest(
559
+ makeCookieRequest(sessions.cookieName, administrativeExchange.sessionToken),
560
+ );
561
+ const pairingCredential = yield* serverAuth.issuePairingCredential({
562
+ label: "Julius iPhone",
563
+ });
564
+ const listedPairingLinks = yield* serverAuth.listPairingLinks();
565
+ const clientExchange = yield* serverAuth.createBrowserSession(
566
+ pairingCredential.credential,
567
+ {
568
+ ...requestMetadata,
569
+ deviceType: "mobile",
570
+ os: "iOS",
571
+ browser: "Safari",
572
+ ipAddress: "192.168.1.88",
573
+ },
574
+ );
575
+ const clientSession = yield* serverAuth.authenticateHttpRequest(
576
+ makeCookieRequest(sessions.cookieName, clientExchange.sessionToken),
577
+ );
578
+ const clientsBeforeRevoke = yield* serverAuth.listClientSessions(
579
+ administrativeSession.sessionId,
580
+ );
581
+ const revokedCount = yield* serverAuth.revokeOtherClientSessions(
582
+ administrativeSession.sessionId,
583
+ );
584
+ const clientsAfterRevoke = yield* serverAuth.listClientSessions(
585
+ administrativeSession.sessionId,
586
+ );
587
+
588
+ expect(listedPairingLinks.map((entry) => entry.id)).toContain(pairingCredential.id);
589
+ expect(listedPairingLinks.find((entry) => entry.id === pairingCredential.id)?.label).toBe(
590
+ "Julius iPhone",
591
+ );
592
+ expect(clientsBeforeRevoke).toHaveLength(2);
593
+ expect(
594
+ clientsBeforeRevoke.find((entry) => entry.sessionId === administrativeSession.sessionId)
595
+ ?.current,
596
+ ).toBe(true);
597
+ expect(
598
+ clientsBeforeRevoke.find((entry) => entry.sessionId === clientSession.sessionId)
599
+ ?.current,
600
+ ).toBe(false);
601
+ expect(
602
+ clientsBeforeRevoke.find((entry) => entry.sessionId === clientSession.sessionId)?.client
603
+ .label,
604
+ ).toBe("Julius iPhone");
605
+ expect(
606
+ clientsBeforeRevoke.find((entry) => entry.sessionId === clientSession.sessionId)?.client
607
+ .deviceType,
608
+ ).toBe("mobile");
609
+ expect(revokedCount).toBe(1);
610
+ expect(clientsAfterRevoke).toHaveLength(1);
611
+ expect(clientsAfterRevoke[0]?.sessionId).toBe(administrativeSession.sessionId);
612
+ }).pipe(
613
+ Effect.provide(
614
+ layerEnvironmentAuth({
615
+ desktopBootstrapToken: "desktop-bootstrap-token",
616
+ }),
617
+ ),
618
+ ),
619
+ );
620
680
- it.effect.each(["Bearer", "bearer", "bEaReR"])(
681
- "accepts %s for HTTP and socket upgrades regardless of page origin",
682
- (scheme) =>
621
+ it.effect("accepts cookie sessions on socket upgrades only from the app's own origins", () =>
622
Effect.gen(function* () {
623
const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
685
- const bearer = yield* serverAuth.issueSession();
686
- const request = {
687
- url: "/ws",
688
- cookies: {},
689
- headers: {
690
- host: "192.168.1.50:3773",
691
- origin: "http://192.168.1.50:8080",
692
- authorization: `${scheme} ${bearer.token}`,
693
- },
694
- } as never;
695
- const verified = yield* serverAuth.authenticateWebSocketUpgrade(request, "rpc");
696
- expect(verified.sessionId).toBe(bearer.sessionId);
697
- expect((yield* serverAuth.authenticateHttpRequest(request)).sessionId).toBe(
698
- bearer.sessionId,
624
+ const sessions = yield* SessionStore.SessionStore;
625
+ const pairing = yield* serverAuth.issuePairingCredential();
626
+ const exchanged = yield* serverAuth.createBrowserSession(
627
+ pairing.credential,
628
+ requestMetadata,
629
);
700
- }).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web", host: "192.168.1.50" }))),
701
- );
630
+ const upgrade = (headers: Record<string, string>) =>
631
+ serverAuth.authenticateWebSocketUpgrade(
632
+ {
633
+ url: "/ws",
634
+ cookies: { [sessions.cookieName]: exchanged.sessionToken },
635
+ headers: { host: "192.168.1.50:3773", ...headers },
636
+ } as never,
637
+ "rpc",
638
+ );
639
+
640
+ yield* upgrade({ origin: "http://192.168.1.50:3773" });
641
+ yield* upgrade({
642
+ origin: "https://box.tail1234.ts.net",
643
+ "x-forwarded-host": "box.tail1234.ts.net",
644
+ });
645
+ yield* upgrade({ origin: "t3code://app" });
646
+ yield* upgrade({ origin: "http://localhost:5733" });
647
+ yield* upgrade({});
648
+
649
+ const otherPort = yield* Effect.flip(upgrade({ origin: "http://192.168.1.50:8080" }));
650
+ expect(otherPort._tag).toBe("ServerAuthInvalidCredentialError");
651
+ const opaque = yield* Effect.flip(upgrade({ origin: "null" }));
652
+ expect(opaque._tag).toBe("ServerAuthInvalidCredentialError");
653
+ }).pipe(
654
+ Effect.provide(
655
+ layerEnvironmentAuth({
656
+ mode: "web",
657
+ host: "192.168.1.50",
658
+ devUrl: new URL("http://localhost:5733"),
659
+ }),
660
+ ),
661
+ ),
662
+ );
663
703
- it.effect("binds a DPoP session's RPC socket ticket to its proof key", () =>
704
- Effect.gen(function* () {
705
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
706
- const sessions = yield* SessionStore.SessionStore;
707
- const key = makeDpopKey();
708
- const other = makeDpopKey();
709
- const exchanged = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
710
- "desktop-bootstrap-token",
711
- ["orchestration:read"],
712
- requestMetadata,
713
- { proofKeyThumbprint: key.thumbprint },
714
- );
715
- const session = yield* sessions.verify(exchanged.access_token);
716
- const host = "192.168.1.50:3773";
717
- const socketUrl = `http://${host}/ws`;
718
- const iat = Math.floor((yield* DateTime.now).epochMilliseconds / 1_000);
719
- const upgrade = (ticket: string, use: "rpc" | "media", proof?: string) =>
720
- serverAuth.authenticateWebSocketUpgrade(
721
- {
722
- method: "GET",
723
- url: `/ws?orchestrationProtocol=2&wsTicket=${ticket}${proof ? `&dpop=${proof}` : ""}`,
664
+ it.effect("accepts cookie sessions on HTTP requests only from the app's own origins", () =>
665
+ Effect.gen(function* () {
666
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
667
+ const sessions = yield* SessionStore.SessionStore;
668
+ const pairing = yield* serverAuth.issuePairingCredential();
669
+ const exchanged = yield* serverAuth.createBrowserSession(
670
+ pairing.credential,
671
+ requestMetadata,
672
+ );
673
+ const post = (headers: Record<string, string>) =>
674
+ serverAuth.authenticateHttpRequest({
675
+ cookies: { [sessions.cookieName]: exchanged.sessionToken },
676
+ headers: { host: "localhost:13773", ...headers },
677
+ } as never);
678
+
679
+ yield* post({ origin: "http://192.168.1.50:5733", "sec-fetch-site": "same-origin" });
680
+ yield* post({ origin: "http://localhost:13773" });
681
+
682
+ const otherPort = yield* Effect.flip(
683
+ post({ origin: "http://localhost:3000", "sec-fetch-site": "same-site" }),
684
+ );
685
+ expect(otherPort._tag).toBe("ServerAuthInvalidCredentialError");
686
+ const state = yield* serverAuth.getSessionState({
687
+ cookies: { [sessions.cookieName]: exchanged.sessionToken },
688
+ headers: { host: "localhost:13773", origin: "http://localhost:3000" },
689
+ } as never);
690
+ expect(state.authenticated).toBe(false);
691
+ }).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web" }))),
692
+ );
693
+
694
+ it.effect.each(["Bearer", "bearer", "bEaReR"])(
695
+ "accepts %s for HTTP and socket upgrades regardless of page origin",
696
+ (scheme) =>
697
+ Effect.gen(function* () {
698
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
699
+ const bearer = yield* serverAuth.issueSession();
700
+ const request = {
701
+ url: "/ws",
702
cookies: {},
725
- headers: { host },
726
- } as never,
727
- use,
728
- );
729
-
730
- const rpc = yield* serverAuth.issueWebSocketTicket(session, { use: "rpc" });
731
- const bare = yield* Effect.flip(upgrade(Redacted.value(rpc.ticket), "rpc"));
732
- expect(bare._tag).toBe("ServerAuthInvalidCredentialError");
733
- const signed = yield* upgrade(
734
- Redacted.value(rpc.ticket),
735
- "rpc",
736
- key.sign({ method: "GET", url: socketUrl, token: Redacted.value(rpc.ticket), iat }),
737
- );
738
- expect(signed.sessionId).toBe(session.sessionId);
739
-
740
- const wrongKey = yield* Effect.flip(
741
- upgrade(
703
+ headers: {
704
+ host: "192.168.1.50:3773",
705
+ origin: "http://192.168.1.50:8080",
706
+ authorization: `${scheme} ${bearer.token}`,
707
+ },
708
+ } as never;
709
+ const verified = yield* serverAuth.authenticateWebSocketUpgrade(request, "rpc");
710
+ expect(verified.sessionId).toBe(bearer.sessionId);
711
+ expect((yield* serverAuth.authenticateHttpRequest(request)).sessionId).toBe(
712
+ bearer.sessionId,
713
+ );
714
+ }).pipe(Effect.provide(layerEnvironmentAuth({ mode: "web", host: "192.168.1.50" }))),
715
+ );
716
+
717
+ it.effect("binds a DPoP session's RPC socket ticket to its proof key", () =>
718
+ Effect.gen(function* () {
719
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
720
+ const sessions = yield* SessionStore.SessionStore;
721
+ const key = makeDpopKey();
722
+ const other = makeDpopKey();
723
+ const exchanged = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
724
+ "desktop-bootstrap-token",
725
+ ["orchestration:read"],
726
+ requestMetadata,
727
+ { proofKeyThumbprint: key.thumbprint },
728
+ );
729
+ const session = yield* sessions.verify(exchanged.access_token);
730
+ const host = "192.168.1.50:3773";
731
+ const socketUrl = `http://${host}/ws`;
732
+ const iat = Math.floor((yield* DateTime.now).epochMilliseconds / 1_000);
733
+ const upgrade = (ticket: string, use: "rpc" | "media", proof?: string) =>
734
+ serverAuth.authenticateWebSocketUpgrade(
735
+ {
736
+ method: "GET",
737
+ url: `/ws?orchestrationProtocol=2&wsTicket=${ticket}${proof ? `&dpop=${proof}` : ""}`,
738
+ cookies: {},
739
+ headers: { host },
740
+ } as never,
741
+ use,
742
+ );
743
+
744
+ const rpc = yield* serverAuth.issueWebSocketTicket(session, { use: "rpc" });
745
+ const bare = yield* Effect.flip(upgrade(Redacted.value(rpc.ticket), "rpc"));
746
+ expect(bare._tag).toBe("ServerAuthInvalidCredentialError");
747
+ const signed = yield* upgrade(
748
Redacted.value(rpc.ticket),
749
"rpc",
744
- other.sign({ method: "GET", url: socketUrl, token: Redacted.value(rpc.ticket), iat }),
745
- ),
746
- );
747
- expect(wrongKey._tag).toBe("ServerAuthInvalidCredentialError");
748
- const onMedia = yield* Effect.flip(
749
- upgrade(
750
- Redacted.value(rpc.ticket),
751
- "media",
750
key.sign({ method: "GET", url: socketUrl, token: Redacted.value(rpc.ticket), iat }),
753
- ),
754
- );
755
- expect(onMedia._tag).toBe("ServerAuthInvalidCredentialError");
756
-
757
- const media = yield* serverAuth.issueWebSocketTicket(session, { use: "media" });
758
- expect((yield* upgrade(Redacted.value(media.ticket), "media")).sessionId).toBe(
759
- session.sessionId,
760
- );
761
- const mediaOnRpc = yield* Effect.flip(upgrade(Redacted.value(media.ticket), "rpc"));
762
- expect(mediaOnRpc._tag).toBe("ServerAuthInvalidCredentialError");
763
-
764
- // Clients that predate ticket binding still connect with the unbound ticket they mint.
765
- const legacy = yield* serverAuth.issueWebSocketTicket(session);
766
- expect((yield* upgrade(Redacted.value(legacy.ticket), "rpc")).sessionId).toBe(
767
- session.sessionId,
768
- );
769
- }).pipe(
770
- Effect.provide(layerEnvironmentAuth({ desktopBootstrapToken: "desktop-bootstrap-token" })),
771
- ),
772
- );
751
+ );
752
+ expect(signed.sessionId).toBe(session.sessionId);
753
+
754
+ const wrongKey = yield* Effect.flip(
755
+ upgrade(
756
+ Redacted.value(rpc.ticket),
757
+ "rpc",
758
+ other.sign({ method: "GET", url: socketUrl, token: Redacted.value(rpc.ticket), iat }),
759
+ ),
760
+ );
761
+ expect(wrongKey._tag).toBe("ServerAuthInvalidCredentialError");
762
+ const onMedia = yield* Effect.flip(
763
+ upgrade(
764
+ Redacted.value(rpc.ticket),
765
+ "media",
766
+ key.sign({ method: "GET", url: socketUrl, token: Redacted.value(rpc.ticket), iat }),
767
+ ),
768
+ );
769
+ expect(onMedia._tag).toBe("ServerAuthInvalidCredentialError");
770
774
- it.effect("rejects a replayed proof on a bound RPC socket ticket", () =>
775
- Effect.gen(function* () {
776
- const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
777
- const sessions = yield* SessionStore.SessionStore;
778
- const key = makeDpopKey();
779
- const exchanged = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
780
- "desktop-bootstrap-token",
781
- ["orchestration:read"],
782
- requestMetadata,
783
- { proofKeyThumbprint: key.thumbprint },
784
- );
785
- const session = yield* sessions.verify(exchanged.access_token);
786
- const rpc = yield* serverAuth.issueWebSocketTicket(session, { use: "rpc" });
787
- const request = {
788
- method: "GET",
789
- url: `/ws?wsTicket=${Redacted.value(rpc.ticket)}&dpop=${key.sign({
771
+ const media = yield* serverAuth.issueWebSocketTicket(session, { use: "media" });
772
+ expect((yield* upgrade(Redacted.value(media.ticket), "media")).sessionId).toBe(
773
+ session.sessionId,
774
+ );
775
+ const mediaOnRpc = yield* Effect.flip(upgrade(Redacted.value(media.ticket), "rpc"));
776
+ expect(mediaOnRpc._tag).toBe("ServerAuthInvalidCredentialError");
777
+
778
+ // Clients that predate ticket binding still connect with the unbound ticket they mint.
779
+ const legacy = yield* serverAuth.issueWebSocketTicket(session);
780
+ expect((yield* upgrade(Redacted.value(legacy.ticket), "rpc")).sessionId).toBe(
781
+ session.sessionId,
782
+ );
783
+ }).pipe(
784
+ Effect.provide(layerEnvironmentAuth({ desktopBootstrapToken: "desktop-bootstrap-token" })),
785
+ ),
786
+ );
787
+
788
+ it.effect("rejects a replayed proof on a bound RPC socket ticket", () =>
789
+ Effect.gen(function* () {
790
+ const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
791
+ const sessions = yield* SessionStore.SessionStore;
792
+ const key = makeDpopKey();
793
+ const exchanged = yield* serverAuth.exchangeBootstrapCredentialForAccessToken(
794
+ "desktop-bootstrap-token",
795
+ ["orchestration:read"],
796
+ requestMetadata,
797
+ { proofKeyThumbprint: key.thumbprint },
798
+ );
799
+ const session = yield* sessions.verify(exchanged.access_token);
800
+ const rpc = yield* serverAuth.issueWebSocketTicket(session, { use: "rpc" });
801
+ const request = {
802
method: "GET",
791
- url: "http://192.168.1.50:3773/ws",
792
- token: Redacted.value(rpc.ticket),
793
- iat: Math.floor((yield* DateTime.now).epochMilliseconds / 1_000),
794
- })}`,
795
- cookies: {},
796
- headers: { host: "192.168.1.50:3773" },
797
- } as never;
798
-
799
- yield* serverAuth.authenticateWebSocketUpgrade(request, "rpc");
800
- const replayed = yield* Effect.flip(serverAuth.authenticateWebSocketUpgrade(request, "rpc"));
801
- expect(replayed._tag).toBe("ServerAuthInvalidCredentialError");
802
- if (replayed._tag === "ServerAuthInvalidCredentialError") {
803
- expect(replayed.dpopFailureReason).toBe("replay");
804
- }
805
- }).pipe(
806
- Effect.provide(layerEnvironmentAuth({ desktopBootstrapToken: "desktop-bootstrap-token" })),
807
- ),
808
- );
809
-});
803
+ url: `/ws?wsTicket=${Redacted.value(rpc.ticket)}&dpop=${key.sign({
804
+ method: "GET",
805
+ url: "http://192.168.1.50:3773/ws",
806
+ token: Redacted.value(rpc.ticket),
807
+ iat: Math.floor((yield* DateTime.now).epochMilliseconds / 1_000),
808
+ })}`,
809
+ cookies: {},
810
+ headers: { host: "192.168.1.50:3773" },
811
+ } as never;
812
+
813
+ yield* serverAuth.authenticateWebSocketUpgrade(request, "rpc");
814
+ const replayed = yield* Effect.flip(
815
+ serverAuth.authenticateWebSocketUpgrade(request, "rpc"),
816
+ );
817
+ expect(replayed._tag).toBe("ServerAuthInvalidCredentialError");
818
+ if (replayed._tag === "ServerAuthInvalidCredentialError") {
819
+ expect(replayed.dpopFailureReason).toBe("replay");
820
+ }
821
+ }).pipe(
822
+ Effect.provide(layerEnvironmentAuth({ desktopBootstrapToken: "desktop-bootstrap-token" })),
823
+ ),
824
+ );
825
+ },
826
+);
apps/server/src/auth/EnvironmentAuth.ts
+8
-7
@@ -26,7 +26,7 @@ import {
26
import { isLocalLoopbackHost } from "@t3tools/shared/hostClassification";
27
import { encodeOAuthScope } from "@t3tools/shared/oauthScope";
28
import * as Context from "effect/Context";
29
-import * as Crypto from "effect/Crypto";
29
+import * as Digest from "effect/crypto/Digest";
30
import * as DateTime from "effect/DateTime";
31
import * as Duration from "effect/Duration";
32
import * as Effect from "effect/Effect";
@@ -48,6 +48,7 @@ import { DESKTOP_RENDERER_ORIGINS } from "../httpCors.ts";
48
import * as SqlitePersistence from "../persistence/Sqlite.ts";
49
import * as ManagedLimits from "../policy/managedLimits.ts";
50
import * as ManagedPolicy from "../policy/ManagedPolicy.ts";
51
+import { requestUrl } from "../requestUrl.ts";
52
53
const DEFAULT_SESSION_SUBJECT = "cli-issued-session";
54
export const INTERNAL_ADMINISTRATIVE_BOOTSTRAP_SUBJECT = "administrative-bootstrap";
@@ -713,7 +714,7 @@ export const make = Effect.gen(function* () {
714
const bootstrapCredentials = yield* PairingGrantStore.PairingGrantStore;
715
const sessions = yield* SessionStore.SessionStore;
716
const secretStore = yield* ServerSecretStore.ServerSecretStore;
716
- const crypto = yield* Crypto.Crypto;
717
+ const digest = yield* Digest.Digest;
718
const descriptor = yield* policy.getDescriptor();
719
const config = yield* ServerConfig.ServerConfig;
720
const managedPolicy = yield* ManagedPolicy.ManagedPolicy;
@@ -805,7 +806,7 @@ export const make = Effect.gen(function* () {
806
expectedAccessToken: dpopToken,
807
}).pipe(
808
Effect.provideService(ServerSecretStore.ServerSecretStore, secretStore),
808
- Effect.provideService(Crypto.Crypto, crypto),
809
+ Effect.provideService(Digest.Digest, digest),
810
Effect.as(session),
811
);
812
}
@@ -1242,10 +1243,10 @@ export const make = Effect.gen(function* () {
1243
1244
const authenticateWebSocketUpgrade: EnvironmentAuth["Service"]["authenticateWebSocketUpgrade"] =
1245
Effect.fn("EnvironmentAuth.authenticateWebSocketUpgrade")(function* (request, use) {
1245
- const requestUrl = HttpServerRequest.toURL(request);
1246
- if (Option.isSome(requestUrl)) {
1246
+ const url = requestUrl(request);
1247
+ if (Option.isSome(url)) {
1248
const query = yield* decodeWebSocketUpgradeQuery(
1248
- Object.fromEntries(requestUrl.value.searchParams),
1249
+ Object.fromEntries(url.value.searchParams),
1250
).pipe(Effect.orDie);
1251
const websocketTicket = query.wsTicket && Redacted.value(query.wsTicket);
1252
if (websocketTicket && websocketTicket.trim().length > 0) {
@@ -1275,7 +1276,7 @@ export const make = Effect.gen(function* () {
1276
expectedAccessToken: websocketTicket,
1277
}).pipe(
1278
Effect.provideService(ServerSecretStore.ServerSecretStore, secretStore),
1278
- Effect.provideService(Crypto.Crypto, crypto),
1279
+ Effect.provideService(Digest.Digest, digest),
1280
);
1281
}
1282
return {
apps/server/src/auth/EnvironmentAuthAdmin.test.ts
+127
-123
@@ -1,4 +1,5 @@
1
import { AuthStandardClientScopes, type ManagedPolicyDocument } from "@t3tools/contracts";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import { assert, expect, it } from "@effect/vitest";
5
import * as Effect from "effect/Effect";
@@ -51,127 +52,130 @@ const desktopAndLocalOnly: ManagedPolicyDocument = {
52
limits: { clients: ["desktop", "local-browser"] },
53
};
54
54
-it.layer(NodeServices.layer)("EnvironmentAuth administrative operations", (it) => {
55
- it.effect("refuses pairing links when the policy does not allow remote clients", () =>
56
- Effect.gen(function* () {
57
- const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
58
-
59
- const error = yield* environmentAuth.issuePairingCredential().pipe(Effect.flip);
60
- const startup = yield* environmentAuth.issueStartupPairingCredential();
61
-
62
- assert.equal(
63
- error.message,
64
- "Example Corp's policy does not allow remote clients, so this server cannot create pairing links.",
65
- );
66
- assert.isAbove(startup.credential.length, 0);
67
- }).pipe(Effect.provide(layerEnvironmentAuth(undefined, desktopAndLocalOnly))),
68
- );
69
-
70
- it.effect("revokes link-paired clients on startup under a policy without remote clients", () =>
71
- Effect.gen(function* () {
72
- const sessions = yield* SessionStore.SessionStore;
73
- const pairingLinks = yield* PairingGrantStore.PairingGrantStore;
74
- const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
75
- const phone = yield* sessions.issue({ subject: "one-time-token" });
76
- const bot = yield* sessions.issue({ subject: "cli-issued-session" });
77
- const startup = (ipAddress: string) =>
78
- sessions.issue({
79
- subject: EnvironmentAuth.INTERNAL_ADMINISTRATIVE_BOOTSTRAP_SUBJECT,
80
- client: { deviceType: "unknown", ipAddress },
81
- });
82
- const startupPhone = yield* startup("192.168.1.20");
83
- const startupBrowser = yield* startup("127.0.0.1");
84
- yield* environmentAuth.createPairingLink({ subject: "one-time-token" });
85
-
86
- yield* EnvironmentAuth.make.pipe(
87
- Effect.provide(
88
- Layer.merge(ManagedPolicy.layerTest(desktopAndLocalOnly), layerServerConfig()),
89
- ),
90
- );
91
-
92
- const remaining = (yield* sessions.listActive()).map((session) => session.sessionId);
93
- assert.notInclude(remaining, phone.sessionId);
94
- assert.notInclude(remaining, startupPhone.sessionId);
95
- assert.include(remaining, startupBrowser.sessionId);
96
- assert.include(remaining, bot.sessionId);
97
- assert.lengthOf(yield* pairingLinks.listActive(), 0);
98
- }).pipe(Effect.provide(layerEnvironmentAuth())),
99
- );
100
-
101
- it.effect("revokes only T3 Connect clients when the policy keeps remote clients", () =>
102
- Effect.gen(function* () {
103
- const sessions = yield* SessionStore.SessionStore;
104
- const phone = yield* sessions.issue({ subject: "one-time-token" });
105
- const connect = yield* sessions.issue({ subject: "cloud-connect" });
106
-
107
- yield* EnvironmentAuth.make.pipe(
108
- Effect.provide(
109
- Layer.merge(
110
- ManagedPolicy.layerTest({
111
- schemaVersion: 1,
112
- organization: "Example Corp",
113
- limits: { connect: false },
114
- }),
115
- layerServerConfig(),
55
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))(
56
+ "EnvironmentAuth administrative operations",
57
+ (it) => {
58
+ it.effect("refuses pairing links when the policy does not allow remote clients", () =>
59
+ Effect.gen(function* () {
60
+ const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
61
+
62
+ const error = yield* environmentAuth.issuePairingCredential().pipe(Effect.flip);
63
+ const startup = yield* environmentAuth.issueStartupPairingCredential();
64
+
65
+ assert.equal(
66
+ error.message,
67
+ "Example Corp's policy does not allow remote clients, so this server cannot create pairing links.",
68
+ );
69
+ assert.isAbove(startup.credential.length, 0);
70
+ }).pipe(Effect.provide(layerEnvironmentAuth(undefined, desktopAndLocalOnly))),
71
+ );
72
+
73
+ it.effect("revokes link-paired clients on startup under a policy without remote clients", () =>
74
+ Effect.gen(function* () {
75
+ const sessions = yield* SessionStore.SessionStore;
76
+ const pairingLinks = yield* PairingGrantStore.PairingGrantStore;
77
+ const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
78
+ const phone = yield* sessions.issue({ subject: "one-time-token" });
79
+ const bot = yield* sessions.issue({ subject: "cli-issued-session" });
80
+ const startup = (ipAddress: string) =>
81
+ sessions.issue({
82
+ subject: EnvironmentAuth.INTERNAL_ADMINISTRATIVE_BOOTSTRAP_SUBJECT,
83
+ client: { deviceType: "unknown", ipAddress },
84
+ });
85
+ const startupPhone = yield* startup("192.168.1.20");
86
+ const startupBrowser = yield* startup("127.0.0.1");
87
+ yield* environmentAuth.createPairingLink({ subject: "one-time-token" });
88
+
89
+ yield* EnvironmentAuth.make.pipe(
90
+ Effect.provide(
91
+ Layer.merge(ManagedPolicy.layerTest(desktopAndLocalOnly), layerServerConfig()),
92
),
117
- ),
118
- );
119
-
120
- const remaining = (yield* sessions.listActive()).map((session) => session.sessionId);
121
- assert.include(remaining, phone.sessionId);
122
- assert.notInclude(remaining, connect.sessionId);
123
- }).pipe(Effect.provide(layerEnvironmentAuth())),
124
- );
125
-
126
- it.effect("creates, lists, and revokes client pairing links", () =>
127
- Effect.gen(function* () {
128
- const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
129
-
130
- const created = yield* environmentAuth.createPairingLink({
131
- scopes: ["orchestration:read"],
132
- subject: "one-time-token",
133
- label: "CI phone",
134
- });
135
- const listedBeforeRevoke = yield* environmentAuth.listPairingLinks();
136
- const revoked = yield* environmentAuth.revokePairingLink(created.id);
137
- const listedAfterRevoke = yield* environmentAuth.listPairingLinks();
138
-
139
- expect(created.scopes).toEqual(["orchestration:read"]);
140
- expect(created.credential.length).toBeGreaterThan(0);
141
- expect(listedBeforeRevoke).toHaveLength(1);
142
- expect(listedBeforeRevoke[0]?.id).toBe(created.id);
143
- expect(listedBeforeRevoke[0]?.label).toBe("CI phone");
144
- expect(listedBeforeRevoke[0]).not.toHaveProperty("credential");
145
- expect(revoked).toBe(true);
146
- expect(listedAfterRevoke).toHaveLength(0);
147
- }).pipe(Effect.provide(layerEnvironmentAuth())),
148
- );
149
-
150
- it.effect("issues bearer access token sessions without exposing raw tokens", () =>
151
- Effect.gen(function* () {
152
- const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
153
- const sessionCredentials = yield* SessionStore.SessionStore;
154
-
155
- const issued = yield* environmentAuth.issueSession({
156
- label: "deploy-bot",
157
- });
158
- const verified = yield* sessionCredentials.verify(issued.token);
159
- const listedBeforeRevoke = yield* environmentAuth.listSessions();
160
- const revoked = yield* environmentAuth.revokeSession(issued.sessionId);
161
- const listedAfterRevoke = yield* environmentAuth.listSessions();
162
-
163
- expect(issued.method).toBe("bearer-access-token");
164
- expect(issued.scopes).toEqual(AuthStandardClientScopes);
165
- expect(issued.client.deviceType).toBe("bot");
166
- expect(issued.client.label).toBe("deploy-bot");
167
- expect(verified.sessionId).toBe(issued.sessionId);
168
- expect(verified.scopes).toEqual(AuthStandardClientScopes);
169
- expect(verified.method).toBe("bearer-access-token");
170
- expect(listedBeforeRevoke).toHaveLength(1);
171
- expect(listedBeforeRevoke[0]?.sessionId).toBe(issued.sessionId);
172
- expect("token" in (listedBeforeRevoke[0] ?? {})).toBe(false);
173
- expect(revoked).toBe(true);
174
- expect(listedAfterRevoke).toHaveLength(0);
175
- }).pipe(Effect.provide(layerEnvironmentAuth())),
176
- );
177
-});
93
+ );
94
+
95
+ const remaining = (yield* sessions.listActive()).map((session) => session.sessionId);
96
+ assert.notInclude(remaining, phone.sessionId);
97
+ assert.notInclude(remaining, startupPhone.sessionId);
98
+ assert.include(remaining, startupBrowser.sessionId);
99
+ assert.include(remaining, bot.sessionId);
100
+ assert.lengthOf(yield* pairingLinks.listActive(), 0);
101
+ }).pipe(Effect.provide(layerEnvironmentAuth())),
102
+ );
103
+
104
+ it.effect("revokes only T3 Connect clients when the policy keeps remote clients", () =>
105
+ Effect.gen(function* () {
106
+ const sessions = yield* SessionStore.SessionStore;
107
+ const phone = yield* sessions.issue({ subject: "one-time-token" });
108
+ const connect = yield* sessions.issue({ subject: "cloud-connect" });
109
+
110
+ yield* EnvironmentAuth.make.pipe(
111
+ Effect.provide(
112
+ Layer.merge(
113
+ ManagedPolicy.layerTest({
114
+ schemaVersion: 1,
115
+ organization: "Example Corp",
116
+ limits: { connect: false },
117
+ }),
118
+ layerServerConfig(),
119
+ ),
120
+ ),
121
+ );
122
+
123
+ const remaining = (yield* sessions.listActive()).map((session) => session.sessionId);
124
+ assert.include(remaining, phone.sessionId);
125
+ assert.notInclude(remaining, connect.sessionId);
126
+ }).pipe(Effect.provide(layerEnvironmentAuth())),
127
+ );
128
+
129
+ it.effect("creates, lists, and revokes client pairing links", () =>
130
+ Effect.gen(function* () {
131
+ const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
132
+
133
+ const created = yield* environmentAuth.createPairingLink({
134
+ scopes: ["orchestration:read"],
135
+ subject: "one-time-token",
136
+ label: "CI phone",
137
+ });
138
+ const listedBeforeRevoke = yield* environmentAuth.listPairingLinks();
139
+ const revoked = yield* environmentAuth.revokePairingLink(created.id);
140
+ const listedAfterRevoke = yield* environmentAuth.listPairingLinks();
141
+
142
+ expect(created.scopes).toEqual(["orchestration:read"]);
143
+ expect(created.credential.length).toBeGreaterThan(0);
144
+ expect(listedBeforeRevoke).toHaveLength(1);
145
+ expect(listedBeforeRevoke[0]?.id).toBe(created.id);
146
+ expect(listedBeforeRevoke[0]?.label).toBe("CI phone");
147
+ expect(listedBeforeRevoke[0]).not.toHaveProperty("credential");
148
+ expect(revoked).toBe(true);
149
+ expect(listedAfterRevoke).toHaveLength(0);
150
+ }).pipe(Effect.provide(layerEnvironmentAuth())),
151
+ );
152
+
153
+ it.effect("issues bearer access token sessions without exposing raw tokens", () =>
154
+ Effect.gen(function* () {
155
+ const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
156
+ const sessionCredentials = yield* SessionStore.SessionStore;
157
+
158
+ const issued = yield* environmentAuth.issueSession({
159
+ label: "deploy-bot",
160
+ });
161
+ const verified = yield* sessionCredentials.verify(issued.token);
162
+ const listedBeforeRevoke = yield* environmentAuth.listSessions();
163
+ const revoked = yield* environmentAuth.revokeSession(issued.sessionId);
164
+ const listedAfterRevoke = yield* environmentAuth.listSessions();
165
+
166
+ expect(issued.method).toBe("bearer-access-token");
167
+ expect(issued.scopes).toEqual(AuthStandardClientScopes);
168
+ expect(issued.client.deviceType).toBe("bot");
169
+ expect(issued.client.label).toBe("deploy-bot");
170
+ expect(verified.sessionId).toBe(issued.sessionId);
171
+ expect(verified.scopes).toEqual(AuthStandardClientScopes);
172
+ expect(verified.method).toBe("bearer-access-token");
173
+ expect(listedBeforeRevoke).toHaveLength(1);
174
+ expect(listedBeforeRevoke[0]?.sessionId).toBe(issued.sessionId);
175
+ expect("token" in (listedBeforeRevoke[0] ?? {})).toBe(false);
176
+ expect(revoked).toBe(true);
177
+ expect(listedAfterRevoke).toHaveLength(0);
178
+ }).pipe(Effect.provide(layerEnvironmentAuth())),
179
+ );
180
+ },
181
+);
apps/server/src/auth/EnvironmentAuthPolicy.test.ts
+50
-46
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { expect, it } from "@effect/vitest";
4
import * as Effect from "effect/Effect";
@@ -26,57 +27,60 @@ const layerEnvironmentAuthPolicy = (overrides?: Partial<ServerConfig.ServerConfi
27
),
28
);
29
29
-it.layer(NodeServices.layer)("EnvironmentAuthPolicy.layer", (it) => {
30
- it.effect("keeps desktop cookies port-scoped on the port a second instance lands on", () =>
31
- Effect.gen(function* () {
32
- const policy = yield* EnvironmentAuthPolicy.EnvironmentAuthPolicy;
33
- const descriptor = yield* policy.getDescriptor();
30
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))(
31
+ "EnvironmentAuthPolicy.layer",
32
+ (it) => {
33
+ it.effect("keeps desktop cookies port-scoped on the port a second instance lands on", () =>
34
+ Effect.gen(function* () {
35
+ const policy = yield* EnvironmentAuthPolicy.EnvironmentAuthPolicy;
36
+ const descriptor = yield* policy.getDescriptor();
37
35
- expect(descriptor.sessionCookieName).toBe("t3_session_3774");
36
- }).pipe(
37
- Effect.provide(
38
- layerEnvironmentAuthPolicy({
39
- mode: "desktop",
40
- port: 3774,
41
- }),
38
+ expect(descriptor.sessionCookieName).toBe("t3_session_3774");
39
+ }).pipe(
40
+ Effect.provide(
41
+ layerEnvironmentAuthPolicy({
42
+ mode: "desktop",
43
+ port: 3774,
44
+ }),
45
+ ),
46
),
43
- ),
44
- );
47
+ );
48
46
- it.effect("uses remote-reachable policy for desktop mode when bound beyond loopback", () =>
47
- Effect.gen(function* () {
48
- const policy = yield* EnvironmentAuthPolicy.EnvironmentAuthPolicy;
49
- const descriptor = yield* policy.getDescriptor();
49
+ it.effect("uses remote-reachable policy for desktop mode when bound beyond loopback", () =>
50
+ Effect.gen(function* () {
51
+ const policy = yield* EnvironmentAuthPolicy.EnvironmentAuthPolicy;
52
+ const descriptor = yield* policy.getDescriptor();
53
51
- expect(descriptor.policy).toBe("remote-reachable");
52
- expect(descriptor.bootstrapMethods).toEqual(["desktop-bootstrap", "one-time-token"]);
53
- }).pipe(
54
- Effect.provide(
55
- layerEnvironmentAuthPolicy({
56
- mode: "desktop",
57
- host: "0.0.0.0",
58
- }),
54
+ expect(descriptor.policy).toBe("remote-reachable");
55
+ expect(descriptor.bootstrapMethods).toEqual(["desktop-bootstrap", "one-time-token"]);
56
+ }).pipe(
57
+ Effect.provide(
58
+ layerEnvironmentAuthPolicy({
59
+ mode: "desktop",
60
+ host: "0.0.0.0",
61
+ }),
62
+ ),
63
),
60
- ),
61
- );
64
+ );
65
63
- it.effect("uses loopback-browser policy for loopback web hosts", () =>
64
- Effect.gen(function* () {
65
- const policy = yield* EnvironmentAuthPolicy.EnvironmentAuthPolicy;
66
- const descriptor = yield* policy.getDescriptor();
66
+ it.effect("uses loopback-browser policy for loopback web hosts", () =>
67
+ Effect.gen(function* () {
68
+ const policy = yield* EnvironmentAuthPolicy.EnvironmentAuthPolicy;
69
+ const descriptor = yield* policy.getDescriptor();
70
68
- expect(descriptor.policy).toBe("loopback-browser");
69
- expect(descriptor.bootstrapMethods).toEqual(["one-time-token"]);
70
- expect(descriptor.serverUpdateScope).toBe("environment:maintain");
71
- expect(descriptor.sessionCookieName).toMatch(/^t3_session_3773_[a-f0-9]{12}$/);
72
- }).pipe(
73
- Effect.provide(
74
- layerEnvironmentAuthPolicy({
75
- mode: "web",
76
- host: "127.0.0.1",
77
- port: 3773,
78
- }),
71
+ expect(descriptor.policy).toBe("loopback-browser");
72
+ expect(descriptor.bootstrapMethods).toEqual(["one-time-token"]);
73
+ expect(descriptor.serverUpdateScope).toBe("environment:maintain");
74
+ expect(descriptor.sessionCookieName).toMatch(/^t3_session_3773_[a-f0-9]{12}$/);
75
+ }).pipe(
76
+ Effect.provide(
77
+ layerEnvironmentAuthPolicy({
78
+ mode: "web",
79
+ host: "127.0.0.1",
80
+ port: 3773,
81
+ }),
82
+ ),
83
),
80
- ),
81
- );
82
-});
84
+ );
85
+ },
86
+);
apps/server/src/auth/McpOAuth.test.ts
+7
-6
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import {
4
AuthMcpClientAccess,
@@ -8,7 +9,7 @@ import {
9
} from "@t3tools/contracts";
10
import { expect, it } from "@effect/vitest";
11
import * as Context from "effect/Context";
11
-import * as Crypto from "effect/Crypto";
12
+import * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as Effect from "effect/Effect";
14
import * as Layer from "effect/Layer";
15
import * as Etag from "effect/http/Etag";
@@ -62,11 +63,11 @@ const makeLayerRoutes = (capture: (auth: EnvironmentAuth.EnvironmentAuth["Servic
63
Layer.provide(layerConfig),
64
Layer.provideMerge(
65
HttpPlatform.layer.pipe(
65
- Layer.provideMerge(NodeServices.layer),
66
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
67
Layer.provideMerge(Etag.layerWeak),
68
),
69
),
69
- Layer.provide(NodeServices.layer),
70
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
71
);
72
73
const encodeJson = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
@@ -92,8 +93,8 @@ const withRoutes = <A, E>(
93
use: (handler: Handler, auth: EnvironmentAuth.EnvironmentAuth["Service"]) => Effect.Effect<A, E>,
94
) =>
95
Effect.gen(function* () {
95
- const crypto = yield* Crypto.Crypto;
96
- const context = Context.make(Crypto.Crypto, crypto);
96
+ const random = yield* SecureRandom.SecureRandom;
97
+ const context = Context.make(SecureRandom.SecureRandom, random);
98
let routerAuth: EnvironmentAuth.EnvironmentAuth["Service"] | undefined;
99
const layerRoutes = makeLayerRoutes((auth) => {
100
routerAuth = auth;
@@ -108,7 +109,7 @@ const withRoutes = <A, E>(
109
}),
110
(web) => Effect.promise(() => web.dispose()),
111
);
111
- }).pipe(Effect.provide(NodeServices.layer));
112
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
113
114
const json = <A>(response: Response) => Effect.promise(() => response.json() as Promise<A>);
115
apps/server/src/auth/McpOAuth.ts
+8
-7
@@ -20,7 +20,8 @@ import {
20
import { encodeOAuthScope } from "@t3tools/shared/oauthScope";
21
import * as Clock from "effect/Clock";
22
import * as Context from "effect/Context";
23
-import * as Crypto from "effect/Crypto";
23
+import * as Digest from "effect/crypto/Digest";
24
+import * as SecureRandom from "effect/crypto/SecureRandom";
25
import * as Effect from "effect/Effect";
26
import * as Layer from "effect/Layer";
27
import * as Option from "effect/Option";
@@ -42,6 +43,7 @@ import {
43
signPayload,
44
timingSafeEqualBase64Url,
45
} from "./utils.ts";
46
+import { requestUrl } from "../requestUrl.ts";
47
48
// Request-derived origins support loopback, Tailscale and tunnels.
49
// Signed client metadata keeps unauthenticated registration stateless.
@@ -64,7 +66,7 @@ export interface McpOAuthUrls {
66
}
67
68
export const requestUrls = (request: HttpServerRequest.HttpServerRequest): McpOAuthUrls => {
67
- const origin = Option.match(HttpServerRequest.toURL(request), {
69
+ const origin = Option.match(requestUrl(request), {
70
onNone: () => "http://localhost",
71
onSome: (url) => url.origin,
72
});
@@ -250,7 +252,8 @@ export const redirectForError = (error: McpOAuthRedirectError, issuer: string) =
252
const make = Effect.gen(function* () {
253
const environmentAuth = yield* EnvironmentAuth.EnvironmentAuth;
254
const secretStore = yield* ServerSecretStore.ServerSecretStore;
253
- const crypto = yield* Crypto.Crypto;
255
+ const random = yield* SecureRandom.SecureRandom;
256
+ const digester = yield* Digest.Digest;
257
const serverSettings = yield* ServerSettings.ServerSettingsService;
258
const linksEnabled = serverSettings.getSettings.pipe(
259
Effect.map((settings) => settings.linkedEnvironmentsEnabled),
@@ -294,7 +297,7 @@ const make = Effect.gen(function* () {
297
298
const pkceVerifies = (verifier: string, challenge: string) =>
299
CODE_VERIFIER_PATTERN.test(verifier)
297
- ? crypto.digest("SHA-256", new TextEncoder().encode(verifier)).pipe(
300
+ ? digester.digest(Digest.sha256, new TextEncoder().encode(verifier)).pipe(
301
Effect.orDie,
302
Effect.map((digest) => timingSafeEqualBase64Url(base64UrlEncode(digest), challenge)),
303
)
@@ -420,9 +423,7 @@ const make = Effect.gen(function* () {
423
access: AuthMcpClientAccess,
424
) {
425
const now = yield* Clock.currentTimeMillis;
423
- const code = Buffer.from(yield* crypto.randomBytes(32).pipe(Effect.orDie)).toString(
424
- "base64url",
425
- );
426
+ const code = Buffer.from(yield* random.randomBytes(32)).toString("base64url");
427
yield* Ref.update(codes, (current) => {
428
const next = new Map(Array.from(current).filter(([, pending]) => pending.expiresAtMs > now));
429
next.set(code, {
apps/server/src/auth/PairingGrantStore.test.ts
+6
-8
@@ -1,7 +1,8 @@
1
import { AuthStandardClientScopes } from "@t3tools/contracts";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import { expect, it } from "@effect/vitest";
4
-import * as Crypto from "effect/Crypto";
5
+import * as SecureRandom from "effect/crypto/SecureRandom";
6
import * as Duration from "effect/Duration";
7
import * as Effect from "effect/Effect";
8
import * as Layer from "effect/Layer";
@@ -45,7 +46,7 @@ const layerPairingGrantStore = (
46
Layer.provide(layerServerConfig(overrides)),
47
);
48
48
-it.layer(NodeServices.layer)("PairingGrantStore.layer", (it) => {
49
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("PairingGrantStore.layer", (it) => {
50
it.effect("accepts lowercase one-time tokens exactly once", () =>
51
Effect.gen(function* () {
52
const bootstrapCredentials = yield* PairingGrantStore.PairingGrantStore;
@@ -62,12 +63,9 @@ it.layer(NodeServices.layer)("PairingGrantStore.layer", (it) => {
63
expect(second.message).toContain("Unknown bootstrap credential");
64
}).pipe(
65
Effect.provide(layerPairingGrantStore()),
65
- Effect.provideServiceEffect(
66
- Crypto.Crypto,
67
- Effect.map(Crypto.Crypto, (crypto) => ({
68
- ...crypto,
69
- randomBytes: (size) => Effect.succeed(new Uint8Array(size).fill(8)),
70
- })),
66
+ Effect.provideService(
67
+ SecureRandom.SecureRandom,
68
+ SecureRandom.make((size) => new Uint8Array(size).fill(8)),
69
),
70
),
71
);
apps/server/src/auth/PairingGrantStore.ts
+5
-5
@@ -9,7 +9,7 @@ import {
9
isValidDesktopBootstrapToken,
10
} from "@t3tools/shared/desktopBootstrapToken";
11
import * as Context from "effect/Context";
12
-import * as Crypto from "effect/Crypto";
12
+import * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as DateTime from "effect/DateTime";
14
import * as Duration from "effect/Duration";
15
import * as Effect from "effect/Effect";
@@ -262,7 +262,7 @@ const PAIRING_TOKEN_PATTERN = new RegExp(
262
);
263
264
const make = Effect.gen(function* () {
265
- const crypto = yield* Crypto.Crypto;
265
+ const random = yield* SecureRandom.SecureRandom;
266
const config = yield* ServerConfig.ServerConfig;
267
const pairingLinks = yield* AuthPairingLinks.AuthPairingLinkRepository;
268
const seededGrantsRef = yield* Ref.make(new Map<string, StoredBootstrapGrant>());
@@ -270,7 +270,7 @@ const make = Effect.gen(function* () {
270
const generatePairingToken = Effect.gen(function* () {
271
let credential = "";
272
while (credential.length < PAIRING_TOKEN_LENGTH) {
273
- const bytes = yield* crypto
273
+ const bytes = yield* random
274
.randomBytes(PAIRING_TOKEN_LENGTH)
275
.pipe(
276
Effect.mapError(
@@ -378,8 +378,8 @@ const make = Effect.gen(function* () {
378
const issueOneTimeToken: PairingGrantStore["Service"]["issueOneTimeToken"] = Effect.fn(
379
"PairingGrantStore.issueOneTimeToken",
380
)(function* (input) {
381
- const id = yield* crypto
382
- .randomUUIDv4()
381
+ const id = yield* random
382
+ .uuidV4()
383
.pipe(
384
Effect.mapError(
385
(cause) =>
apps/server/src/auth/ServerSecretStore.test.ts
+5
-4
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import * as Cause from "effect/Cause";
@@ -36,7 +37,7 @@ const layerPermissionDeniedFileSystem = Layer.effect(
37
),
38
} satisfies FileSystem.FileSystem;
39
}),
39
-).pipe(Layer.provide(NodeServices.layer));
40
+).pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
41
42
const layerPermissionDeniedSecretStore = () =>
43
ServerSecretStore.layer.pipe(
@@ -63,7 +64,7 @@ const layerRenameFailureFileSystem = Layer.effect(
64
),
65
} satisfies FileSystem.FileSystem;
66
}),
66
-).pipe(Layer.provide(NodeServices.layer));
67
+).pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
68
69
const layerRenameFailureSecretStore = () =>
70
ServerSecretStore.layer.pipe(
@@ -109,7 +110,7 @@ const layerConcurrentReadMissFileSystem = Layer.effect(
110
: fileSystem.readFile(path),
111
} satisfies FileSystem.FileSystem;
112
}),
112
-).pipe(Layer.provide(NodeServices.layer));
113
+).pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
114
115
const layerConcurrentCreateSecretStore = () =>
116
ServerSecretStore.layer.pipe(
@@ -117,7 +118,7 @@ const layerConcurrentCreateSecretStore = () =>
118
Layer.provideMerge(layerConcurrentReadMissFileSystem),
119
);
120
120
-it.layer(NodeServices.layer)("ServerSecretStore.layer", (it) => {
121
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("ServerSecretStore.layer", (it) => {
122
it.effect("reuses an existing secret instead of regenerating it", () =>
123
Effect.gen(function* () {
124
const secretStore = yield* ServerSecretStore.ServerSecretStore;
apps/server/src/auth/ServerSecretStore.ts
+4
-4
@@ -1,5 +1,5 @@
1
import * as Context from "effect/Context";
2
-import * as Crypto from "effect/Crypto";
2
+import * as SecureRandom from "effect/crypto/SecureRandom";
3
import * as Effect from "effect/Effect";
4
import * as FileSystem from "effect/FileSystem";
5
import * as Layer from "effect/Layer";
@@ -152,7 +152,7 @@ export class ServerSecretStore extends Context.Service<
152
153
/** @public */
154
export const make = Effect.gen(function* () {
155
- const crypto = yield* Crypto.Crypto;
155
+ const crypto = yield* SecureRandom.SecureRandom;
156
const fileSystem = yield* FileSystem.FileSystem;
157
const path = yield* Path.Path;
158
const serverConfig = yield* ServerConfig.ServerConfig;
@@ -188,7 +188,7 @@ export const make = Effect.gen(function* () {
188
189
const set: ServerSecretStore["Service"]["set"] = (name, value) => {
190
const secretPath = resolveSecretPath(name);
191
- return crypto.randomUUIDv4().pipe(
191
+ return crypto.uuidV4().pipe(
192
Effect.mapError(
193
(cause) =>
194
new SecretStoreTemporaryPathError({
@@ -227,7 +227,7 @@ export const make = Effect.gen(function* () {
227
// AlreadyExists, so a concurrent reader never observes a partially written secret.
228
const create: ServerSecretStore["Service"]["create"] = (name, value) => {
229
const secretPath = resolveSecretPath(name);
230
- return crypto.randomUUIDv4().pipe(
230
+ return crypto.uuidV4().pipe(
231
Effect.mapError(
232
(cause) =>
233
new SecretStoreTemporaryPathError({
apps/server/src/auth/SessionStore.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { EnvironmentId } from "@t3tools/contracts";
4
import { expect, it } from "@effect/vitest";
@@ -82,7 +83,7 @@ const makeDiskSessionStoreLayer = Effect.fn("makeDiskSessionStoreLayer")(functio
83
);
84
});
85
85
-it.layer(NodeServices.layer)("SessionStore.layer", (it) => {
86
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("SessionStore.layer", (it) => {
87
it.effect.each(["revoke", "revokeAllExcept", "replace"] as const)(
88
"invalidates every connection for a session on %s and leaves other sessions active",
89
(operation) =>
apps/server/src/auth/SessionStore.ts
+4
-4
@@ -10,7 +10,7 @@ import {
10
type ServerAuthSessionMethod,
11
} from "@t3tools/contracts";
12
import * as Context from "effect/Context";
13
-import * as Crypto from "effect/Crypto";
13
+import * as SecureRandom from "effect/crypto/SecureRandom";
14
import * as DateTime from "effect/DateTime";
15
import * as Duration from "effect/Duration";
16
import * as Effect from "effect/Effect";
@@ -491,7 +491,7 @@ function toAuthClientSession(input: Omit<AuthClientSession, "current">): AuthCli
491
}
492
493
const make = Effect.gen(function* () {
494
- const crypto = yield* Crypto.Crypto;
494
+ const random = yield* SecureRandom.SecureRandom;
495
const serverConfig = yield* ServerConfig.ServerConfig;
496
const serverEnvironment = yield* ServerEnvironment.ServerEnvironmentIdentity;
497
const secretStore = yield* ServerSecretStore.ServerSecretStore;
@@ -643,8 +643,8 @@ const make = Effect.gen(function* () {
643
const issue: SessionStore["Service"]["issue"] = Effect.fn("SessionStore.issue")(
644
function* (input) {
645
const sessionId = AuthSessionId.make(
646
- yield* crypto
647
- .randomUUIDv4()
646
+ yield* random
647
+ .uuidV4()
648
.pipe(Effect.mapError((cause) => new SessionCredentialIssueError({ cause }))),
649
);
650
const issuedAt = yield* DateTime.now;
apps/server/src/auth/dpop.ts
+6
-5
@@ -3,7 +3,7 @@ import {
3
verifyDpopProof,
4
} from "@t3tools/shared/dpop";
5
import type { DpopFailureReason } from "@t3tools/contracts";
6
-import * as Crypto from "effect/Crypto";
6
+import * as Digest from "effect/crypto/Digest";
7
import * as DateTime from "effect/DateTime";
8
import * as Effect from "effect/Effect";
9
import * as Base64Url from "effect/encoding/Base64Url";
@@ -17,6 +17,7 @@ import {
17
type ServerAuthInternalError,
18
} from "./EnvironmentAuth.ts";
19
import * as ServerSecretStore from "./ServerSecretStore.ts";
20
+import { requestUrl } from "../requestUrl.ts";
21
22
export const DPOP_REPLAY_MARKER_PREFIX = "dpop-proof-";
23
@@ -60,7 +61,7 @@ export const verifyRequestDpopProof = Effect.fn("dpop.verifyRequestDpopProof")(f
61
readonly expectedAccessToken?: string;
62
}) {
63
const proof = input.proof ?? input.request.headers.dpop;
63
- const url = HttpServerRequest.toURL(input.request);
64
+ const url = requestUrl(input.request);
65
if (Option.isNone(url)) {
66
return yield* new ServerAuthInvalidCredentialError({
67
diagnostic: "Invalid DPoP request URL.",
@@ -85,9 +86,9 @@ export const verifyRequestDpopProof = Effect.fn("dpop.verifyRequestDpopProof")(f
86
});
87
}
88
const secretStore = yield* ServerSecretStore.ServerSecretStore;
88
- const replayKey = yield* Crypto.Crypto.pipe(
89
- Effect.flatMap((crypto) =>
90
- crypto.digest("SHA-256", new TextEncoder().encode(`${result.thumbprint}:${result.jti}`)),
89
+ const replayKey = yield* Digest.Digest.pipe(
90
+ Effect.flatMap((digest) =>
91
+ digest.digest(Digest.sha256, new TextEncoder().encode(`${result.thumbprint}:${result.jti}`)),
92
),
93
Effect.map(Base64Url.encode),
94
Effect.mapError(
apps/server/src/auth/http.test.ts
+7
-6
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import {
4
AuthTokenExchangeGrantType,
@@ -7,7 +8,7 @@ import {
8
} from "@t3tools/contracts";
9
import { expect, it } from "@effect/vitest";
10
import * as Context from "effect/Context";
10
-import * as Crypto from "effect/Crypto";
11
+import * as SecureRandom from "effect/crypto/SecureRandom";
12
import * as Effect from "effect/Effect";
13
import * as Layer from "effect/Layer";
14
import * as Redacted from "effect/Redacted";
@@ -56,11 +57,11 @@ const layerRoutes = HttpApiBuilder.layer(AuthTestApi).pipe(
57
Layer.provide(layerConfig),
58
Layer.provideMerge(
59
HttpPlatform.layer.pipe(
59
- Layer.provideMerge(NodeServices.layer),
60
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
61
Layer.provideMerge(Etag.layerWeak),
62
),
63
),
63
- Layer.provide(NodeServices.layer),
64
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
65
);
66
67
const encodeJson = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
@@ -73,7 +74,7 @@ const postJson = (path: string, body: unknown, headers?: Readonly<Record<string,
74
75
it.effect("sets the selected browser session cookies through the HTTP route", () =>
76
Effect.gen(function* () {
76
- const crypto = yield* Crypto.Crypto;
77
+ const random = yield* SecureRandom.SecureRandom;
78
const unusedSecretStore = ServerSecretStore.ServerSecretStore.of({
79
get: () => Effect.succeedNone,
80
set: () => Effect.void,
@@ -81,7 +82,7 @@ it.effect("sets the selected browser session cookies through the HTTP route", ()
82
getOrCreateRandom: () => Effect.die("Not used by these routes."),
83
remove: () => Effect.void,
84
});
84
- const requestContext = Context.make(Crypto.Crypto, crypto).pipe(
85
+ const requestContext = Context.make(SecureRandom.SecureRandom, random).pipe(
86
Context.add(ServerSecretStore.ServerSecretStore, unusedSecretStore),
87
);
88
return yield* Effect.acquireUseRelease(
@@ -155,5 +156,5 @@ it.effect("sets the selected browser session cookies through the HTTP route", ()
156
([environmentA, environmentB]) =>
157
Effect.promise(() => Promise.all([environmentA.dispose(), environmentB.dispose()])),
158
);
158
- }).pipe(Effect.provide(NodeServices.layer)),
159
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
160
);
apps/server/src/auth/http.ts
+2
-1
@@ -36,6 +36,7 @@ import * as SessionStore from "./SessionStore.ts";
36
import { traceAuthenticatedRelayRequest, traceRelayRequest } from "../cloud/traceRelayRequest.ts";
37
import { deriveAuthClientMetadata } from "./utils.ts";
38
import { verifyRequestDpopProof } from "./dpop.ts";
39
+import { requestUrl } from "../requestUrl.ts";
40
41
const CREDENTIAL_RESPONSE_HEADERS = {
42
"cache-control": "no-store",
@@ -72,7 +73,7 @@ export const annotateEnvironmentRequest =
73
/* Request instrumentation already owns the span; keep this helper in that context. */
74
Effect.fnUntraced(function* (endpoint: string) {
75
const request = yield* HttpServerRequest.HttpServerRequest;
75
- const url = HttpServerRequest.toURL(request);
76
+ const url = requestUrl(request);
77
const traceId = yield* currentEnvironmentTraceId;
78
79
yield* Effect.addFinalizer((exit) =>
apps/server/src/auth/replayMarkers.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import * as DateTime from "effect/DateTime";
@@ -33,7 +34,7 @@ const REAL_SECRET_NAMES = [
34
"usage-limit-source-aHVi",
35
];
36
36
-it.layer(NodeServices.layer)("replayMarkers", (it) => {
37
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("replayMarkers", (it) => {
38
it.effect("prunes only replay markers older than the max age", () =>
39
Effect.gen(function* () {
40
const secretStore = yield* ServerSecretStore.ServerSecretStore;
apps/server/src/binCli.ts
+2
-1
@@ -1,6 +1,7 @@
1
import { doctorCommand } from "./cli/doctor.ts";
2
import { policyCommand } from "./cli/policy.ts";
3
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
4
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
5
import * as NodeServices from "@effect/platform-node/NodeServices";
6
import * as Effect from "effect/Effect";
7
import * as Layer from "effect/Layer";
@@ -33,7 +34,7 @@ import { traceCommand } from "./cli/trace.ts";
34
import { triageCommand } from "./cli/triage.ts";
35
import { connectCommand, statusCommand, upCommand } from "./cli/up.ts";
36
36
-const layerCliRuntime = Layer.mergeAll(NodeServices.layer, NetService.layer);
37
+const layerCliRuntime = Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer);
38
39
const connectPublicConfigMissingMessage =
40
"T3 Connect commands are unavailable: this build is missing T3 Connect public configuration.";
apps/server/src/checkpointing/CheckpointDiffQuery.ts
+3
-3
@@ -7,7 +7,7 @@ import {
7
type ThreadId,
8
} from "@t3tools/contracts";
9
import * as Context from "effect/Context";
10
-import * as Crypto from "effect/Crypto";
10
+import * as Digest from "effect/crypto/Digest";
11
import * as Effect from "effect/Effect";
12
import * as Layer from "effect/Layer";
13
import * as Schema from "effect/Schema";
@@ -84,7 +84,7 @@ function buildTurnDiffResult(
84
export const make = Effect.gen(function* () {
85
const threads = yield* ThreadManagement.ThreadManagementService;
86
const checkpointStore = yield* CheckpointStore.CheckpointStore;
87
- const crypto = yield* Crypto.Crypto;
87
+ const digest = yield* Digest.Digest;
88
89
const getTurnDiff: CheckpointDiffQuery["Service"]["getTurnDiff"] = Effect.fn("getTurnDiff")(
90
function* (input) {
@@ -186,7 +186,7 @@ export const make = Effect.gen(function* () {
186
: yield* checkpointRefForScopeOrdinal({
187
scopeId: firstScope.id,
188
ordinalWithinScope: 0,
189
- }).pipe(Effect.provideService(Crypto.Crypto, crypto))
189
+ }).pipe(Effect.provideService(Digest.Digest, digest))
190
: (
191
parentCheckpoint ??
192
readyCheckpoints.find(
apps/server/src/checkpointing/CheckpointStore.test.ts
+6
-3
@@ -1,6 +1,7 @@
1
// @effect-diagnostics nodeBuiltinImport:off
2
import * as NodePath from "node:path";
3
4
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
5
import * as NodeServices from "@effect/platform-node/NodeServices";
6
import { it } from "@effect/vitest";
7
import { CheckpointRef, ThreadId, type VcsError } from "@t3tools/contracts";
@@ -26,17 +27,19 @@ function checkpointRefForThreadTurn(threadId: ThreadId, turnCount: number): Chec
27
const layerServerConfig = ServerConfig.ServerConfig.layerTest(process.cwd(), {
28
prefix: "t3-checkpoint-store-test-",
29
});
29
-const layerVcsProcessTest = VcsProcess.layer.pipe(Layer.provide(NodeServices.layer));
30
+const layerVcsProcessTest = VcsProcess.layer.pipe(
31
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
32
+);
33
const layerVcsDriverTest = VcsDriverRegistry.layer.pipe(Layer.provide(layerVcsProcessTest));
34
const layerCheckpointStoreTest = CheckpointStore.layer.pipe(
35
Layer.provideMerge(layerVcsDriverTest),
33
- Layer.provideMerge(NodeServices.layer),
36
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
37
);
38
const layerTest = layerCheckpointStoreTest.pipe(
39
Layer.provideMerge(layerVcsProcessTest),
40
Layer.provideMerge(layerVcsDriverTest),
41
Layer.provideMerge(layerServerConfig),
39
- Layer.provideMerge(NodeServices.layer),
42
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
43
);
44
45
function makeTmpDir(
apps/server/src/cli/app.test.ts
+2
@@ -6,6 +6,7 @@ import * as NodeNet from "node:net";
6
import * as NodeOS from "node:os";
7
import * as NodePath from "node:path";
8
9
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
10
import * as NodeServices from "@effect/platform-node/NodeServices";
11
import { assert, it } from "@effect/vitest";
12
import type { DesktopAppActivationRequest } from "@t3tools/contracts";
@@ -45,6 +46,7 @@ const runCli = (args: ReadonlyArray<string>, env: Record<string, string> = {}) =
46
Effect.provide(
47
Layer.mergeAll(
48
NodeServices.layer,
49
+ NodeCrypto.layer,
50
NetService.layer,
51
ConfigProvider.layer(ConfigProvider.fromEnv({ env })),
52
),
apps/server/src/cli/app.ts
+3
-3
@@ -18,7 +18,7 @@ import {
18
import * as HostProcess from "@t3tools/shared/HostProcess";
19
import * as Config from "effect/Config";
20
import * as Console from "effect/Console";
21
-import * as Crypto from "effect/Crypto";
21
+import * as SecureRandom from "effect/crypto/SecureRandom";
22
import * as Effect from "effect/Effect";
23
import * as Option from "effect/Option";
24
import * as Path from "effect/Path";
@@ -226,8 +226,8 @@ const runAppCommand = Effect.fn("cli.app")(function* (flags: {
226
userId,
227
joinPath: path.join,
228
});
229
- const crypto = yield* Crypto.Crypto;
230
- const requestId = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
229
+ const random = yield* SecureRandom.SecureRandom;
230
+ const requestId = yield* random.uuidV4();
231
const request: DesktopAppActivationRequest = {
232
version: DESKTOP_APP_ACTIVATION_PROTOCOL_VERSION,
233
requestId,
apps/server/src/cli/connect.ts
+2
-2
@@ -15,7 +15,7 @@ import * as Cause from "effect/Cause";
15
import * as Clock from "effect/Clock";
16
import * as Config from "effect/Config";
17
import * as Console from "effect/Console";
18
-import * as Crypto from "effect/Crypto";
18
+import * as SecureRandom from "effect/crypto/SecureRandom";
19
import * as Duration from "effect/Duration";
20
import * as Effect from "effect/Effect";
21
import * as Exit from "effect/Exit";
@@ -518,7 +518,7 @@ export const runCloudCommand = Effect.fn("cloud.cli.run_cloud_command")(function
518
| RelayClient.RelayClient
519
| EnvironmentAuth.EnvironmentAuth
520
| BootService.BootService
521
- | Crypto.Crypto
521
+ | SecureRandom.SecureRandom
522
| FileSystem.FileSystem
523
| Path.Path
524
| HttpClient.HttpClient
apps/server/src/cli/deferredImports.test.ts
+2
-1
@@ -1,6 +1,7 @@
1
// @effect-diagnostics nodeBuiltinImport:off - CLI integration uses temporary Node paths.
2
import * as NodePath from "node:path";
3
4
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
5
import * as NodeServices from "@effect/platform-node/NodeServices";
6
import { assert, it } from "@effect/vitest";
7
import * as NetService from "@t3tools/shared/Net";
@@ -45,7 +46,7 @@ const layerCliRuntime = Layer.mergeAll(NodeServices.layer, NetService.layer);
46
const runCli = (args: ReadonlyArray<string>) =>
47
Command.runWith(cli, { version: "0.0.0" })(args).pipe(Effect.provide(layerCliRuntime));
48
48
-it.layer(NodeServices.layer)("CLI deferred imports", (it) => {
49
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CLI deferred imports", (it) => {
50
it.effect("runs commands that do not need them without loading them", () =>
51
Effect.gen(function* () {
52
hooks.importsAttempted.length = 0;
apps/server/src/cli/pair.test.ts
+10
-9
@@ -4,6 +4,7 @@ import * as NodeFS from "node:fs";
4
import * as NodeOS from "node:os";
5
import * as NodePath from "node:path";
6
7
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
8
import * as NodeServices from "@effect/platform-node/NodeServices";
9
import { AuthStandardClientScopes, ORCHESTRATION_PROTOCOL_VERSION } from "@t3tools/contracts";
10
import * as NetService from "@t3tools/shared/Net";
@@ -38,7 +39,7 @@ import { DevServerNotProxiableError, resolveTailscaleLocalTarget } from "./pair.
39
import packageJson from "../../package.json" with { type: "json" };
40
import { buildPairingAppLink } from "@t3tools/shared/remote";
41
41
-const layerCliRuntime = Layer.mergeAll(NodeServices.layer, NetService.layer);
42
+const layerCliRuntime = Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer);
43
44
const baseState = {
45
version: 1,
@@ -135,7 +136,7 @@ describe("t3 pair", () => {
136
if (!ChildProcess.isStandardCommand(command))
137
return yield* Effect.die("Unexpected pipeline");
138
if (command.args[0] === "serve") {
138
- const target = command.args.at(-1)!;
139
+ const target = String(command.args.at(-1));
140
const descriptor = yield* Effect.promise(async () =>
141
(await fetch(new URL("/.well-known/t3/environment", target))).json(),
142
);
@@ -189,7 +190,7 @@ describe("t3 pair", () => {
190
assert.include(output, "Pairing URL: https://pair-test.tail.ts.net/pair#token=");
191
}),
192
"::1",
192
- ).pipe(Effect.provide(NodeServices.layer)),
193
+ ).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
194
);
195
196
it.effect("mints a token and prints a QR pairing URL for a live server", () =>
@@ -229,7 +230,7 @@ describe("t3 pair", () => {
230
assert.deepEqual(credentials[0]?.scopes, AuthStandardClientScopes);
231
}),
232
).pipe(
232
- Effect.provide(NodeServices.layer),
233
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
234
Effect.provideService(HostProcess.Environment, {
235
...process.env,
236
[SERVICE_LAUNCHER_CONTEXT_ENV]: JSON.stringify({
@@ -264,7 +265,7 @@ describe("t3 pair", () => {
265
266
assert.include(output, "Pairing URL: http://localhost:5733/pair#token=");
267
}),
267
- ).pipe(Effect.provide(NodeServices.layer)),
268
+ ).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
269
);
270
271
it.effect("refuses --tailscale before turning on Serve when the policy keeps clients local", () =>
@@ -334,7 +335,7 @@ describe("t3 pair", () => {
335
);
336
assert.include(rendered, "No running T3 Code server found.");
337
}),
337
- ).pipe(Effect.provide(NodeServices.layer)),
338
+ ).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
339
);
340
341
// regression: #10516 minting opens the target database with this checkout's
@@ -374,7 +375,7 @@ describe("t3 pair", () => {
375
"server-runtime.json",
376
]);
377
}),
377
- ).pipe(Effect.provide(NodeServices.layer)),
378
+ ).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
379
);
380
381
// regression: #15492 an older CLI minted into a V1 database the protocol 2
@@ -408,7 +409,7 @@ describe("t3 pair", () => {
409
}),
410
"127.0.0.1",
411
{ ...testDescriptor, serverVersion: "0.0.45", orchestrationProtocolVersion: 1 },
411
- ).pipe(Effect.provide(NodeServices.layer)),
412
+ ).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
413
);
414
415
// Without the capability `tailscale serve` blocks on an enablement URL, so
@@ -460,7 +461,7 @@ describe("t3 pair", () => {
461
assert.include(String(error), "https://login.tailscale.com/admin/dns");
462
assert.deepEqual(tailscaleCalls, [["status", "--json"]]);
463
}),
463
- ).pipe(Effect.provide(NodeServices.layer)),
464
+ ).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
465
);
466
});
467
apps/server/src/cli/policy.test.ts
+3
-1
@@ -1,6 +1,8 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import * as Effect from "effect/Effect";
5
+import * as Layer from "effect/Layer";
6
import * as FileSystem from "effect/FileSystem";
7
import * as Path from "effect/Path";
8
import * as Schema from "effect/Schema";
@@ -14,7 +16,7 @@ import { describeRunningServer } from "./policy.ts";
16
17
const encodeState = Schema.encodeEffect(Schema.fromJsonString(PersistedServerRuntimeState));
18
17
-it.layer(NodeServices.layer)((it) =>
19
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))((it) =>
20
it.effect("tells whether the running server loaded the installed policy", () =>
21
Effect.gen(function* () {
22
const fs = yield* FileSystem.FileSystem;
apps/server/src/cli/project.test.ts
+163
-154
@@ -5,6 +5,7 @@ import * as NodeFS from "node:fs";
5
import * as NodeOS from "node:os";
6
import * as NodePath from "node:path";
7
8
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
9
import * as NodeServices from "@effect/platform-node/NodeServices";
10
import { assert, it } from "@effect/vitest";
11
import {
@@ -48,7 +49,7 @@ import * as ServerSettings from "../serverSettings.ts";
49
import * as ManagedPolicy from "../policy/ManagedPolicy.ts";
50
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
51
51
-const layerCliRuntime = Layer.mergeAll(NodeServices.layer, NetService.layer);
52
+const layerCliRuntime = Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer);
53
const runCli = (args: ReadonlyArray<string>) =>
54
Command.runWith(cli, { version: "0.0.0" })(args).pipe(Effect.provide(layerCliRuntime));
55
@@ -103,7 +104,7 @@ const readProjects = (baseDir: string) =>
104
),
105
),
106
Layer.provideMerge(SqlitePersistence.layerConfig),
106
- Layer.provideMerge(NodeServices.layer),
107
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
108
Layer.provide(ServerConfig.layer(config)),
109
Layer.provide(Layer.succeed(References.MinimumLogLevel, config.logLevel)),
110
);
@@ -130,7 +131,7 @@ it.effect("adds, renames, and removes projects through the V2 project CLI domain
131
132
yield* runCli(["project", "remove", added?.id ?? "", "--base-dir", baseDir]);
133
assert.deepEqual((yield* readProjects(baseDir)).projects, []);
133
- }).pipe(Effect.provide(NodeServices.layer)),
134
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
135
);
136
137
it.effect.each(["snapshot", "mutation"] as const)(
@@ -214,7 +215,7 @@ const makeThreadPersistenceLayer = Effect.fn("ProjectCliTest.makeThreadPersisten
215
EventStore.layer,
216
).pipe(
217
Layer.provideMerge(SqlitePersistence.layerConfig),
217
- Layer.provideMerge(NodeServices.layer),
218
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
219
Layer.provide(ServerConfig.layer(config)),
220
Layer.provide(Layer.succeed(References.MinimumLogLevel, config.logLevel)),
221
);
@@ -288,177 +289,185 @@ const readNativeThreadState = Effect.fn("ProjectCliTest.readNativeThreadState")(
289
}).pipe(Effect.provide(layer));
290
});
291
291
-it.layer(NodeServices.layer)("project deletion with native V2 threads", (it) => {
292
- it.effect.each([
293
- { label: "an active thread", archived: false, missing: false },
294
- {
295
- label: "an archived thread after its workspace disappears",
296
- archived: true,
297
- missing: true,
298
- },
299
- ])("rejects unforced removal of a project with $label", ({ archived, missing }) =>
300
- Effect.gen(function* () {
301
- const fs = yield* FileSystem.FileSystem;
302
- const { baseDir, workspaceRoot, project } = yield* makeProjectLookupFixture();
303
- const threadId = ThreadId.make("project-cli-preserved-thread");
304
- yield* seedNativeThreads(baseDir, [{ id: threadId, projectId: project.id, archived }]);
305
- const before = yield* readNativeThreadState(baseDir, threadId);
306
- if (missing) yield* fs.rename(workspaceRoot, `${workspaceRoot}-removed`);
307
-
308
- const error = yield* runCli([
309
- "project",
310
- "remove",
311
- missing ? workspaceRoot : project.id,
312
- "--base-dir",
313
- baseDir,
314
- ]).pipe(
315
- Effect.match({
316
- onFailure: (error) => error,
317
- onSuccess: () => assert.fail("Removing a nonempty project must require --force."),
318
- }),
319
- );
320
-
321
- assert.include(error.message, "not empty");
322
- assert.deepEqual(
323
- (yield* readProjects(baseDir)).projects.map((entry) => entry.id),
324
- [project.id],
325
- );
326
- assert.deepEqual(yield* readNativeThreadState(baseDir, threadId), before);
327
- assert.equal(yield* fs.exists(workspaceRoot), !missing);
328
- }),
329
- );
330
-
331
- it.effect.each(["present", "missing"] as const)(
332
- "force-removes active and archived V2 threads with the workspace %s, preserving unrelated projects",
333
- (workspace) =>
292
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))(
293
+ "project deletion with native V2 threads",
294
+ (it) => {
295
+ it.effect.each([
296
+ { label: "an active thread", archived: false, missing: false },
297
+ {
298
+ label: "an archived thread after its workspace disappears",
299
+ archived: true,
300
+ missing: true,
301
+ },
302
+ ])("rejects unforced removal of a project with $label", ({ archived, missing }) =>
303
Effect.gen(function* () {
304
const fs = yield* FileSystem.FileSystem;
305
const { baseDir, workspaceRoot, project } = yield* makeProjectLookupFixture();
337
- const otherWorkspace = `${workspaceRoot}-other`;
338
- yield* fs.makeDirectory(otherWorkspace);
339
- yield* runCli(["project", "add", otherWorkspace, "--base-dir", baseDir]);
340
- const otherProject = (yield* readProjects(baseDir)).projects.find(
341
- (entry) => entry.workspaceRoot === otherWorkspace,
342
- );
343
- assert.isDefined(otherProject);
344
- const activeId = ThreadId.make("project-cli-deleted-active");
345
- const archivedId = ThreadId.make("project-cli-deleted-archived");
346
- const unrelatedId = ThreadId.make("project-cli-unrelated-thread");
347
- yield* seedNativeThreads(baseDir, [
348
- { id: activeId, projectId: project.id, archived: false },
349
- { id: archivedId, projectId: project.id, archived: true },
350
- { id: unrelatedId, projectId: otherProject!.id, archived: false },
351
- ]);
352
- const unrelatedBefore = yield* readNativeThreadState(baseDir, unrelatedId);
353
- if (workspace === "missing") {
354
- yield* fs.rename(workspaceRoot, `${workspaceRoot}-removed`);
355
- }
306
+ const threadId = ThreadId.make("project-cli-preserved-thread");
307
+ yield* seedNativeThreads(baseDir, [{ id: threadId, projectId: project.id, archived }]);
308
+ const before = yield* readNativeThreadState(baseDir, threadId);
309
+ if (missing) yield* fs.rename(workspaceRoot, `${workspaceRoot}-removed`);
310
357
- yield* runCli([
311
+ const error = yield* runCli([
312
"project",
313
"remove",
360
- workspace === "missing" ? workspaceRoot : project.id,
361
- "--force",
314
+ missing ? workspaceRoot : project.id,
315
"--base-dir",
316
baseDir,
364
- ]);
317
+ ]).pipe(
318
+ Effect.match({
319
+ onFailure: (error) => error,
320
+ onSuccess: () => assert.fail("Removing a nonempty project must require --force."),
321
+ }),
322
+ );
323
324
+ assert.include(error.message, "not empty");
325
assert.deepEqual(
326
(yield* readProjects(baseDir)).projects.map((entry) => entry.id),
368
- [otherProject!.id],
327
+ [project.id],
328
);
370
- for (const threadId of [activeId, archivedId]) {
371
- const state = yield* readNativeThreadState(baseDir, threadId);
372
- assert.isNotNull(state.thread.deletedAt);
373
- assert.lengthOf(
374
- state.events.filter((record) => record.event.type === "thread.deleted"),
375
- 1,
376
- );
377
- }
378
- assert.deepEqual(yield* readNativeThreadState(baseDir, unrelatedId), unrelatedBefore);
379
- assert.equal(yield* fs.exists(workspaceRoot), workspace === "present");
380
- assert.isTrue(yield* fs.exists(otherWorkspace));
329
+ assert.deepEqual(yield* readNativeThreadState(baseDir, threadId), before);
330
+ assert.equal(yield* fs.exists(workspaceRoot), !missing);
331
}),
382
- );
383
-});
332
+ );
333
+
334
+ it.effect.each(["present", "missing"] as const)(
335
+ "force-removes active and archived V2 threads with the workspace %s, preserving unrelated projects",
336
+ (workspace) =>
337
+ Effect.gen(function* () {
338
+ const fs = yield* FileSystem.FileSystem;
339
+ const { baseDir, workspaceRoot, project } = yield* makeProjectLookupFixture();
340
+ const otherWorkspace = `${workspaceRoot}-other`;
341
+ yield* fs.makeDirectory(otherWorkspace);
342
+ yield* runCli(["project", "add", otherWorkspace, "--base-dir", baseDir]);
343
+ const otherProject = (yield* readProjects(baseDir)).projects.find(
344
+ (entry) => entry.workspaceRoot === otherWorkspace,
345
+ );
346
+ assert.isDefined(otherProject);
347
+ const activeId = ThreadId.make("project-cli-deleted-active");
348
+ const archivedId = ThreadId.make("project-cli-deleted-archived");
349
+ const unrelatedId = ThreadId.make("project-cli-unrelated-thread");
350
+ yield* seedNativeThreads(baseDir, [
351
+ { id: activeId, projectId: project.id, archived: false },
352
+ { id: archivedId, projectId: project.id, archived: true },
353
+ { id: unrelatedId, projectId: otherProject!.id, archived: false },
354
+ ]);
355
+ const unrelatedBefore = yield* readNativeThreadState(baseDir, unrelatedId);
356
+ if (workspace === "missing") {
357
+ yield* fs.rename(workspaceRoot, `${workspaceRoot}-removed`);
358
+ }
359
+
360
+ yield* runCli([
361
+ "project",
362
+ "remove",
363
+ workspace === "missing" ? workspaceRoot : project.id,
364
+ "--force",
365
+ "--base-dir",
366
+ baseDir,
367
+ ]);
368
+
369
+ assert.deepEqual(
370
+ (yield* readProjects(baseDir)).projects.map((entry) => entry.id),
371
+ [otherProject!.id],
372
+ );
373
+ for (const threadId of [activeId, archivedId]) {
374
+ const state = yield* readNativeThreadState(baseDir, threadId);
375
+ assert.isNotNull(state.thread.deletedAt);
376
+ assert.lengthOf(
377
+ state.events.filter((record) => record.event.type === "thread.deleted"),
378
+ 1,
379
+ );
380
+ }
381
+ assert.deepEqual(yield* readNativeThreadState(baseDir, unrelatedId), unrelatedBefore);
382
+ assert.equal(yield* fs.exists(workspaceRoot), workspace === "present");
383
+ assert.isTrue(yield* fs.exists(otherWorkspace));
384
+ }),
385
+ );
386
+ },
387
+);
388
+
389
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))(
390
+ "project lookup with unavailable workspaces",
391
+ (it) => {
392
+ it.effect.each(["id", "stored path"] as const)(
393
+ "removes an empty project by %s after its directory is gone",
394
+ (identifier) =>
395
+ Effect.gen(function* () {
396
+ const fs = yield* FileSystem.FileSystem;
397
+ const { baseDir, workspaceRoot, project } = yield* makeProjectLookupFixture();
398
+ yield* fs.rename(workspaceRoot, `${workspaceRoot}-removed`);
399
+ yield* runCli([
400
+ "project",
401
+ "remove",
402
+ identifier === "id" ? project.id : workspaceRoot,
403
+ "--base-dir",
404
+ baseDir,
405
+ ]);
406
+ assert.deepEqual((yield* readProjects(baseDir)).projects, []);
407
+ assert.isFalse(yield* fs.exists(workspaceRoot));
408
+ }),
409
+ );
410
385
-it.layer(NodeServices.layer)("project lookup with unavailable workspaces", (it) => {
386
- it.effect.each(["id", "stored path"] as const)(
387
- "removes an empty project by %s after its directory is gone",
388
- (identifier) =>
411
+ it.effect("does not resolve another environment's project ID in an empty database", () =>
412
Effect.gen(function* () {
413
const fs = yield* FileSystem.FileSystem;
414
const { baseDir, workspaceRoot, project } = yield* makeProjectLookupFixture();
415
yield* fs.rename(workspaceRoot, `${workspaceRoot}-removed`);
393
- yield* runCli([
416
+ const replacementDir = yield* fs.makeTempDirectoryScoped({
417
+ prefix: "t3-v2-project-empty-",
418
+ });
419
+ const error = yield* runCli([
420
"project",
421
"remove",
396
- identifier === "id" ? project.id : workspaceRoot,
422
+ project.id,
423
+ "--force",
424
+ "--base-dir",
425
+ replacementDir,
426
+ ]).pipe(Effect.flip);
427
+ assert.include(error.message, "No active project found");
428
+ assert.deepEqual(
429
+ (yield* readProjects(baseDir)).projects.map((entry) => entry.id),
430
+ [project.id],
431
+ );
432
+ assert.deepEqual((yield* readProjects(replacementDir)).projects, []);
433
+ }),
434
+ );
435
+
436
+ it.effect("normalizes existing paths without conflating separately registered symlinks", () =>
437
+ Effect.gen(function* () {
438
+ const { baseDir, workspaceRoot, project } = yield* makeProjectLookupFixture();
439
+ yield* runCli([
440
+ "project",
441
+ "rename",
442
+ `${workspaceRoot}${NodePath.sep}.`,
443
+ "Normalized",
444
"--base-dir",
445
baseDir,
446
]);
400
- assert.deepEqual((yield* readProjects(baseDir)).projects, []);
401
- assert.isFalse(yield* fs.exists(workspaceRoot));
447
+ assert.equal((yield* readProjects(baseDir)).projects[0]?.title, "Normalized");
448
+ const aliasPath = `${workspaceRoot}-alias`;
449
+ NodeFS.symlinkSync(workspaceRoot, aliasPath, "junction");
450
+ const unknownAlias = yield* runCli([
451
+ "project",
452
+ "remove",
453
+ aliasPath,
454
+ "--base-dir",
455
+ baseDir,
456
+ ]).pipe(Effect.flip);
457
+ assert.include(unknownAlias.message, "No active project found");
458
+ yield* runCli(["project", "add", aliasPath, "--base-dir", baseDir]);
459
+ const added = (yield* readProjects(baseDir)).projects;
460
+ assert.equal(added.length, 2);
461
+ const aliasProject = added.find((entry) => entry.workspaceRoot === aliasPath);
462
+ assert.isDefined(aliasProject);
463
+ assert.notEqual(aliasProject?.id, project.id);
464
+ yield* runCli(["project", "remove", `${aliasPath}${NodePath.sep}.`, "--base-dir", baseDir]);
465
+ assert.deepEqual(
466
+ (yield* readProjects(baseDir)).projects.map((entry) => entry.id),
467
+ [project.id],
468
+ );
469
+ assert.isTrue(NodeFS.existsSync(workspaceRoot));
470
}),
403
- );
404
-
405
- it.effect("does not resolve another environment's project ID in an empty database", () =>
406
- Effect.gen(function* () {
407
- const fs = yield* FileSystem.FileSystem;
408
- const { baseDir, workspaceRoot, project } = yield* makeProjectLookupFixture();
409
- yield* fs.rename(workspaceRoot, `${workspaceRoot}-removed`);
410
- const replacementDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-v2-project-empty-" });
411
- const error = yield* runCli([
412
- "project",
413
- "remove",
414
- project.id,
415
- "--force",
416
- "--base-dir",
417
- replacementDir,
418
- ]).pipe(Effect.flip);
419
- assert.include(error.message, "No active project found");
420
- assert.deepEqual(
421
- (yield* readProjects(baseDir)).projects.map((entry) => entry.id),
422
- [project.id],
423
- );
424
- assert.deepEqual((yield* readProjects(replacementDir)).projects, []);
425
- }),
426
- );
427
-
428
- it.effect("normalizes existing paths without conflating separately registered symlinks", () =>
429
- Effect.gen(function* () {
430
- const { baseDir, workspaceRoot, project } = yield* makeProjectLookupFixture();
431
- yield* runCli([
432
- "project",
433
- "rename",
434
- `${workspaceRoot}${NodePath.sep}.`,
435
- "Normalized",
436
- "--base-dir",
437
- baseDir,
438
- ]);
439
- assert.equal((yield* readProjects(baseDir)).projects[0]?.title, "Normalized");
440
- const aliasPath = `${workspaceRoot}-alias`;
441
- NodeFS.symlinkSync(workspaceRoot, aliasPath, "junction");
442
- const unknownAlias = yield* runCli([
443
- "project",
444
- "remove",
445
- aliasPath,
446
- "--base-dir",
447
- baseDir,
448
- ]).pipe(Effect.flip);
449
- assert.include(unknownAlias.message, "No active project found");
450
- yield* runCli(["project", "add", aliasPath, "--base-dir", baseDir]);
451
- const added = (yield* readProjects(baseDir)).projects;
452
- assert.equal(added.length, 2);
453
- const aliasProject = added.find((entry) => entry.workspaceRoot === aliasPath);
454
- assert.isDefined(aliasProject);
455
- assert.notEqual(aliasProject?.id, project.id);
456
- yield* runCli(["project", "remove", `${aliasPath}${NodePath.sep}.`, "--base-dir", baseDir]);
457
- assert.deepEqual(
458
- (yield* readProjects(baseDir)).projects.map((entry) => entry.id),
459
- [project.id],
460
- );
461
- assert.isTrue(NodeFS.existsSync(workspaceRoot));
462
- }),
463
- );
464
-});
471
+ );
472
+ },
473
+);
apps/server/src/cli/project.ts
+4
-4
@@ -8,7 +8,7 @@ import {
8
ProjectId,
9
} from "@t3tools/contracts";
10
import * as Console from "effect/Console";
11
-import * as Crypto from "effect/Crypto";
11
+import * as SecureRandom from "effect/crypto/SecureRandom";
12
import * as Duration from "effect/Duration";
13
import * as Effect from "effect/Effect";
14
import * as FileSystem from "effect/FileSystem";
@@ -190,8 +190,8 @@ function projectCommandErrorFromLiveServerRequest(cause: unknown): ProjectComman
190
return new ProjectLiveServerRequestError({ operation: "callLiveServer", cause });
191
}
192
193
-const projectCommandUuid = Crypto.Crypto.pipe(
194
- Effect.flatMap((crypto) => crypto.randomUUIDv4()),
193
+const projectCommandUuid = SecureRandom.SecureRandom.pipe(
194
+ Effect.flatMap((random) => random.uuidV4()),
195
Effect.mapError(
196
(cause) =>
197
new ProjectCommandIdGenerationError({
@@ -397,7 +397,7 @@ const runProjectMutation = Effect.fn("runProjectMutation")(function* (
397
}) => Effect.Effect<
398
string,
399
Error,
400
- | Crypto.Crypto
400
+ | SecureRandom.SecureRandom
401
| FileSystem.FileSystem
402
| HttpClient.HttpClient
403
| Path.Path
apps/server/src/cli/theme.test.ts
+4
-1
@@ -3,6 +3,7 @@ import * as NodeFS from "node:fs";
3
import * as NodeOS from "node:os";
4
import * as NodePath from "node:path";
5
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import * as NetService from "@t3tools/shared/Net";
9
import { assert, describe, it } from "@effect/vitest";
@@ -20,7 +21,9 @@ const windowsHost = HostProcess.Platform.defaultValue() === "win32";
21
22
const runCli = (args: ReadonlyArray<string>) =>
23
Command.runWith(cli, { version: "0.0.0" })(args).pipe(
23
- Effect.provide(Layer.mergeAll(NodeServices.layer, NetService.layer, TestConsole.layer)),
24
+ Effect.provide(
25
+ Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer, TestConsole.layer),
26
+ ),
27
);
28
29
const makeBaseDir = () => NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3code-theme-cli-"));
apps/server/src/cli/up.connect.test.ts
+68
-64
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { expect, it } from "@effect/vitest";
4
import * as HostProcess from "@t3tools/shared/HostProcess";
@@ -56,71 +57,74 @@ vi.mock("./connect.ts", async (importOriginal) => {
57
};
58
});
59
59
-it.layer(Layer.mergeAll(NodeServices.layer, NetService.layer))("t3 up with T3 Connect", (it) => {
60
- it.effect.each([
61
- { label: "no link", prior: null, events: ["link", "restart", "unlink", "restart"] },
62
- // The publish-only link comes back, with its activity publishing.
63
- {
64
- label: "a publish-only link",
65
- prior: "publish_only" as const,
66
- events: ["link", "restart", "restart"],
67
- },
68
- ])("a failed restart after --connect undoes it, then restarts: $label before", (input) =>
69
- Effect.gen(function* () {
70
- events.length = 0;
71
- link.desired = input.prior !== null;
72
- link.mode = input.prior ?? "managed";
73
- const fs = yield* FileSystem.FileSystem;
74
- const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-up-connect-test-" });
75
- yield* fs.writeFileString(`${baseDir}/service.env`, "T3CODE_LAN=false\n");
76
- const status = {
77
- supported: true,
78
- installed: true,
79
- current: true,
80
- unitPath: "/home/me/.config/systemd/user/t3code.service",
81
- logPath: "/home/me/.t3/userdata/logs/boot-service.log",
82
- };
83
- vi.spyOn(BootService, "layer").mockReturnValue(
84
- Layer.succeed(
85
- BootService.BootService,
86
- BootService.BootService.of({
87
- status: Effect.succeed(status),
88
- withStopped: (operation) => operation,
89
- restart: Effect.sync(() => events.push("restart")).pipe(
90
- Effect.andThen(
91
- Effect.fail(new BootService.BootServiceCommandError({ step: "restart" })),
60
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer))(
61
+ "t3 up with T3 Connect",
62
+ (it) => {
63
+ it.effect.each([
64
+ { label: "no link", prior: null, events: ["link", "restart", "unlink", "restart"] },
65
+ // The publish-only link comes back, with its activity publishing.
66
+ {
67
+ label: "a publish-only link",
68
+ prior: "publish_only" as const,
69
+ events: ["link", "restart", "restart"],
70
+ },
71
+ ])("a failed restart after --connect undoes it, then restarts: $label before", (input) =>
72
+ Effect.gen(function* () {
73
+ events.length = 0;
74
+ link.desired = input.prior !== null;
75
+ link.mode = input.prior ?? "managed";
76
+ const fs = yield* FileSystem.FileSystem;
77
+ const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-up-connect-test-" });
78
+ yield* fs.writeFileString(`${baseDir}/service.env`, "T3CODE_LAN=false\n");
79
+ const status = {
80
+ supported: true,
81
+ installed: true,
82
+ current: true,
83
+ unitPath: "/home/me/.config/systemd/user/t3code.service",
84
+ logPath: "/home/me/.t3/userdata/logs/boot-service.log",
85
+ };
86
+ vi.spyOn(BootService, "layer").mockReturnValue(
87
+ Layer.succeed(
88
+ BootService.BootService,
89
+ BootService.BootService.of({
90
+ status: Effect.succeed(status),
91
+ withStopped: (operation) => operation,
92
+ restart: Effect.sync(() => events.push("restart")).pipe(
93
+ Effect.andThen(
94
+ Effect.fail(new BootService.BootServiceCommandError({ step: "restart" })),
95
+ ),
96
),
93
- ),
94
- install: () => Effect.die("an installed, current service is not reinstalled"),
95
- uninstall: Effect.succeed(false),
96
- }),
97
- ),
98
- );
97
+ install: () => Effect.die("an installed, current service is not reinstalled"),
98
+ uninstall: Effect.succeed(false),
99
+ }),
100
+ ),
101
+ );
102
100
- const exit = yield* Command.runWith(upCommand, { version: packageJson.version })([
101
- "--base-dir",
102
- baseDir,
103
- "--connect",
104
- ]).pipe(
105
- Effect.provideService(HostProcess.Environment, {}),
106
- Effect.provide(
107
- Layer.mergeAll(
108
- ConfigProvider.layer(ConfigProvider.fromEnv({ env: {} })),
109
- Layer.fresh(TestConsole.layer),
103
+ const exit = yield* Command.runWith(upCommand, { version: packageJson.version })([
104
+ "--base-dir",
105
+ baseDir,
106
+ "--connect",
107
+ ]).pipe(
108
+ Effect.provideService(HostProcess.Environment, {}),
109
+ Effect.provide(
110
+ Layer.mergeAll(
111
+ ConfigProvider.layer(ConfigProvider.fromEnv({ env: {} })),
112
+ Layer.fresh(TestConsole.layer),
113
+ ),
114
),
111
- ),
112
- Effect.exit,
113
- );
115
+ Effect.exit,
116
+ );
117
115
- expect(exit._tag).toBe("Failure");
116
- // Any unlink comes before the restart on the old settings.
117
- expect(events).toEqual(input.events);
118
- expect(link).toEqual(
119
- input.prior === null
120
- ? { desired: false, mode: "managed" }
121
- : { desired: true, mode: input.prior },
122
- );
123
- expect(yield* fs.readFileString(`${baseDir}/service.env`)).toBe("T3CODE_LAN=false\n");
124
- }),
125
- );
126
-});
118
+ expect(exit._tag).toBe("Failure");
119
+ // Any unlink comes before the restart on the old settings.
120
+ expect(events).toEqual(input.events);
121
+ expect(link).toEqual(
122
+ input.prior === null
123
+ ? { desired: false, mode: "managed" }
124
+ : { desired: true, mode: input.prior },
125
+ );
126
+ expect(yield* fs.readFileString(`${baseDir}/service.env`)).toBe("T3CODE_LAN=false\n");
127
+ }),
128
+ );
129
+ },
130
+);
apps/server/src/cli/up.test.ts
+3
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { expect, it } from "@effect/vitest";
4
import * as HostProcess from "@t3tools/shared/HostProcess";
@@ -139,6 +140,7 @@ const answering = (text: string) =>
140
Terminal.make({
141
columns: Effect.succeed(80),
142
rows: Effect.succeed(24),
143
+ size: Queue.unbounded<Terminal.Size, Cause.Done>(),
144
readInput: Effect.gen(function* () {
145
const input = yield* Queue.unbounded<Terminal.UserInput, Cause.Done>();
146
yield* Queue.offer(input, {
@@ -151,7 +153,7 @@ const answering = (text: string) =>
153
display: () => Effect.void,
154
});
155
154
-it.layer(Layer.mergeAll(NodeServices.layer, NetService.layer))("t3 up", (it) => {
156
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer))("t3 up", (it) => {
157
afterEach(() => vi.restoreAllMocks());
158
159
it.effect.each<{
apps/server/src/cloud/CliState.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import * as Effect from "effect/Effect";
@@ -39,7 +40,7 @@ const layerTest = () =>
40
),
41
);
42
42
-it.layer(NodeServices.layer)("CliState", (it) => {
43
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CliState", (it) => {
44
it.effect("persists desired exposure and clears provisioned relay state", () =>
45
Effect.gen(function* () {
46
const secrets = yield* ServerSecretStore.ServerSecretStore;
apps/server/src/cloud/CliTokenManager.test.ts
+68
-60
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import * as ConfigProvider from "effect/ConfigProvider";
@@ -124,6 +125,7 @@ const provideRefreshManager = (
125
secrets,
126
Layer.mock(ExternalLauncher.ExternalLauncher)({}),
127
NodeServices.layer,
128
+ NodeCrypto.layer,
129
),
130
),
131
Layer.provideMerge(ConfigProvider.layer(ConfigProvider.fromEnv({ env: TEST_ENV }))),
@@ -248,71 +250,77 @@ it.effect.each([
250
),
251
);
252
251
-it.layer(NodeServices.layer)("CliTokenManager.deviceAuthorizationLogin", (it) => {
252
- it.effect("requests a device code, shows it, and polls until Clerk grants the token", () =>
253
- Effect.gen(function* () {
254
- const server: DeviceFlowServer = {
255
- requests: [],
256
- tokenReplies: [oauthError("authorization_pending"), tokenGranted],
257
- };
258
- const prompts: Array<CliTokenManager.DeviceAuthorizationPrompt> = [];
253
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))(
254
+ "CliTokenManager.deviceAuthorizationLogin",
255
+ (it) => {
256
+ it.effect("requests a device code, shows it, and polls until Clerk grants the token", () =>
257
+ Effect.gen(function* () {
258
+ const server: DeviceFlowServer = {
259
+ requests: [],
260
+ tokenReplies: [oauthError("authorization_pending"), tokenGranted],
261
+ };
262
+ const prompts: Array<CliTokenManager.DeviceAuthorizationPrompt> = [];
263
260
- const fiber = yield* CliTokenManager.deviceAuthorizationLogin((prompt) =>
261
- Effect.sync(() => {
262
- prompts.push(prompt);
263
- }),
264
- ).pipe(Effect.provide(layerDeviceFlow(server)), provideTestEnv, Effect.forkChild);
264
+ const fiber = yield* CliTokenManager.deviceAuthorizationLogin((prompt) =>
265
+ Effect.sync(() => {
266
+ prompts.push(prompt);
267
+ }),
268
+ ).pipe(Effect.provide(layerDeviceFlow(server)), provideTestEnv, Effect.forkChild);
269
266
- yield* TestClock.adjust(Duration.seconds(10));
267
- const { token, identity } = yield* Fiber.join(fiber);
270
+ yield* TestClock.adjust(Duration.seconds(10));
271
+ const { token, identity } = yield* Fiber.join(fiber);
272
269
- assert.deepEqual(prompts, [
270
- {
271
- verificationUri: "https://accounts.example.test/device",
272
- verificationUriComplete: "https://accounts.example.test/device?user_code=BCDF-GHJK",
273
- userCode: "BCDF-GHJK",
274
- expiresIn: Duration.seconds(600),
275
- },
276
- ]);
277
- assert.equal(token.accessToken, "access-token-1");
278
- assert.equal(token.refreshToken, "refresh-token-1");
279
- assert.equal(token.identity, "theo@example.test");
280
- assert.equal(identity, "theo@example.test");
273
+ assert.deepEqual(prompts, [
274
+ {
275
+ verificationUri: "https://accounts.example.test/device",
276
+ verificationUriComplete: "https://accounts.example.test/device?user_code=BCDF-GHJK",
277
+ userCode: "BCDF-GHJK",
278
+ expiresIn: Duration.seconds(600),
279
+ },
280
+ ]);
281
+ assert.equal(token.accessToken, "access-token-1");
282
+ assert.equal(token.refreshToken, "refresh-token-1");
283
+ assert.equal(token.identity, "theo@example.test");
284
+ assert.equal(identity, "theo@example.test");
285
282
- const authorization = server.requests[0]!;
283
- assert.equal(authorization.url, "https://clerk.example.test/oauth/device_authorization");
284
- assert.equal(authorization.params.get("client_id"), "oauth_client_test");
285
- assert.equal(authorization.params.get("scope"), "openid profile email offline_access");
286
+ const authorization = server.requests[0]!;
287
+ assert.equal(authorization.url, "https://clerk.example.test/oauth/device_authorization");
288
+ assert.equal(authorization.params.get("client_id"), "oauth_client_test");
289
+ assert.equal(authorization.params.get("scope"), "openid profile email offline_access");
290
287
- const polls = tokenRequests(server.requests);
288
- assert.lengthOf(polls, 2);
289
- for (const poll of polls) {
290
- assert.equal(poll.url, "https://clerk.example.test/oauth/token");
291
- assert.equal(poll.params.get("grant_type"), "urn:ietf:params:oauth:grant-type:device_code");
292
- assert.equal(poll.params.get("device_code"), "device-code-1");
293
- assert.equal(poll.params.get("client_id"), "oauth_client_test");
294
- }
295
- }),
296
- );
291
+ const polls = tokenRequests(server.requests);
292
+ assert.lengthOf(polls, 2);
293
+ for (const poll of polls) {
294
+ assert.equal(poll.url, "https://clerk.example.test/oauth/token");
295
+ assert.equal(
296
+ poll.params.get("grant_type"),
297
+ "urn:ietf:params:oauth:grant-type:device_code",
298
+ );
299
+ assert.equal(poll.params.get("device_code"), "device-code-1");
300
+ assert.equal(poll.params.get("client_id"), "oauth_client_test");
301
+ }
302
+ }),
303
+ );
304
298
- it.effect("fails with a denied error when the user rejects the request", () =>
299
- Effect.gen(function* () {
300
- const server: DeviceFlowServer = {
301
- requests: [],
302
- tokenReplies: [oauthError("access_denied")],
303
- };
305
+ it.effect("fails with a denied error when the user rejects the request", () =>
306
+ Effect.gen(function* () {
307
+ const server: DeviceFlowServer = {
308
+ requests: [],
309
+ tokenReplies: [oauthError("access_denied")],
310
+ };
311
305
- const fiber = yield* CliTokenManager.deviceAuthorizationLogin(() => Effect.void).pipe(
306
- Effect.provide(layerDeviceFlow(server)),
307
- provideTestEnv,
308
- Effect.flip,
309
- Effect.forkChild,
310
- );
311
- yield* TestClock.adjust(Duration.seconds(5));
312
- const result = yield* Fiber.join(fiber);
312
+ const fiber = yield* CliTokenManager.deviceAuthorizationLogin(() => Effect.void).pipe(
313
+ Effect.provide(layerDeviceFlow(server)),
314
+ provideTestEnv,
315
+ Effect.flip,
316
+ Effect.forkChild,
317
+ );
318
+ yield* TestClock.adjust(Duration.seconds(5));
319
+ const result = yield* Fiber.join(fiber);
320
314
- assert.instanceOf(result, CliTokenManager.CloudCliAuthorizationDeniedError);
315
- assert.lengthOf(tokenRequests(server.requests), 1);
316
- }),
317
- );
318
-});
321
+ assert.instanceOf(result, CliTokenManager.CloudCliAuthorizationDeniedError);
322
+ assert.lengthOf(tokenRequests(server.requests), 1);
323
+ }),
324
+ );
325
+ },
326
+);
apps/server/src/cloud/CliTokenManager.ts
+11
-7
@@ -6,7 +6,8 @@ import * as Clock from "effect/Clock";
6
import * as Cause from "effect/Cause";
7
import * as Console from "effect/Console";
8
import * as Context from "effect/Context";
9
-import * as Crypto from "effect/Crypto";
9
+import * as Digest from "effect/crypto/Digest";
10
+import * as SecureRandom from "effect/crypto/SecureRandom";
11
import * as Deferred from "effect/Deferred";
12
import * as Duration from "effect/Duration";
13
import * as Effect from "effect/Effect";
@@ -366,12 +367,13 @@ const exchangeToken = Effect.fn("cloud.cli_token.exchange")(function* (
367
});
368
369
const makePkceRequest = Effect.gen(function* () {
369
- const crypto = yield* Crypto.Crypto;
370
- const verifier = Base64Url.encode(yield* crypto.randomBytes(32));
370
+ const random = yield* SecureRandom.SecureRandom;
371
+ const digest = yield* Digest.Digest;
372
+ const verifier = Base64Url.encode(yield* random.randomBytes(32));
373
const challenge = Base64Url.encode(
372
- yield* crypto.digest("SHA-256", new TextEncoder().encode(verifier)),
374
+ yield* digest.digest(Digest.sha256, new TextEncoder().encode(verifier)),
375
);
374
- const state = Base64Url.encode(yield* crypto.randomBytes(16));
376
+ const state = Base64Url.encode(yield* random.randomBytes(16));
377
return { verifier, challenge, state };
378
});
379
@@ -468,9 +470,11 @@ export const deviceAuthorizationLogin = Effect.fn("cloud.cli_token.device_author
470
471
/** @public */
472
export const make = Effect.gen(function* () {
471
- const crypto = yield* Crypto.Crypto;
473
+ const random = yield* SecureRandom.SecureRandom;
474
+ const digest = yield* Digest.Digest;
475
const httpClient = yield* HttpClient.HttpClient;
473
- const services = Context.make(Crypto.Crypto, crypto).pipe(
476
+ const services = Context.make(SecureRandom.SecureRandom, random).pipe(
477
+ Context.add(Digest.Digest, digest),
478
Context.add(HttpClient.HttpClient, httpClient),
479
);
480
const secrets = yield* ServerSecretStore.ServerSecretStore;
apps/server/src/cloud/CloudLink.lifecycle.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { describe, expect, it } from "@effect/vitest";
4
import * as Effect from "effect/Effect";
@@ -236,7 +237,7 @@ describe("releaseManagedTunnelOnShutdown", () => {
237
238
Effect.provide(
239
ServerConfigModule.layerTest("/", { prefix: "t3-http-release-test-" }).pipe(
239
- Layer.provideMerge(NodeServices.layer),
240
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
241
),
242
),
243
Effect.scoped,
apps/server/src/cloud/CloudLink.test.ts
+3
@@ -7,6 +7,7 @@ import * as Option from "effect/Option";
7
import * as FetchHttpClient from "effect/http/FetchHttpClient";
8
import { HttpClient, HttpServer } from "effect/http";
9
import * as NetAddress from "effect/net/NetAddress";
10
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
11
import * as NodeServices from "@effect/platform-node/NodeServices";
12
13
import * as EnvironmentAuth from "../auth/EnvironmentAuth.ts";
@@ -112,6 +113,7 @@ const withService = <A, E>(
113
HttpClient.make(() => Effect.die("unused")),
114
),
115
NodeServices.layer,
116
+ NodeCrypto.layer,
117
);
118
return yield* Effect.gen(function* () {
119
const link = yield* CloudLink.CloudLink;
@@ -288,6 +290,7 @@ it.effect("unlinks on startup and refuses to link when the policy turns Connect
290
HttpClient.make(() => Effect.die("unused")),
291
),
292
NodeServices.layer,
293
+ NodeCrypto.layer,
294
);
295
yield* Effect.gen(function* () {
296
const link = yield* CloudLink.CloudLink;
apps/server/src/cloud/CloudLink.ts
+6
-10
@@ -43,7 +43,7 @@ import {
43
} from "@t3tools/shared/relayJwt";
44
import { isSecureRelayUrl } from "@t3tools/shared/relayUrl";
45
import * as Context from "effect/Context";
46
-import * as Crypto from "effect/Crypto";
46
+import * as SecureRandom from "effect/crypto/SecureRandom";
47
import * as DateTime from "effect/DateTime";
48
import * as Duration from "effect/Duration";
49
import * as Effect from "effect/Effect";
@@ -531,7 +531,7 @@ const make = Effect.gen(function* () {
531
const httpClient = yield* HttpClient.HttpClient;
532
const httpServer = yield* HttpServer.HttpServer;
533
const awarenessRelay = yield* AgentAwarenessRelay.AgentAwarenessRelay;
534
- const crypto = yield* Crypto.Crypto;
534
+ const random = yield* SecureRandom.SecureRandom;
535
const config = yield* ServerConfig.ServerConfig;
536
const fileSystem = yield* FileSystem.FileSystem;
537
const path = yield* Path.Path;
@@ -607,7 +607,7 @@ const make = Effect.gen(function* () {
607
iss: `t3-env:${descriptor.environmentId}`,
608
aud: normalizeRelayIssuer(request.relayIssuer),
609
sub: descriptor.environmentId,
610
- jti: yield* crypto.randomUUIDv4(),
610
+ jti: yield* random.uuidV4(),
611
iat: nowSeconds,
612
exp: Math.floor(expiresAt.epochMilliseconds / 1_000),
613
challenge: request.challenge,
@@ -647,7 +647,6 @@ const make = Effect.gen(function* () {
647
);
648
},
649
Effect.catchIf(ServerSecretStore.isSecretStoreError, internalError("generate-link-proof")),
650
- Effect.catchTags({ PlatformError: internalError("generate-link-proof") }),
650
);
651
652
const activateManagedTunnel = Effect.fn("environment.cloud.activateManagedTunnel")(
@@ -940,7 +939,7 @@ const make = Effect.gen(function* () {
939
Option.isSome(configuredIssuer) ? bytesToString(configuredIssuer.value) : input.relayUrl,
940
),
941
sub: input.environmentId,
943
- jti: yield* crypto.randomUUIDv4(),
942
+ jti: yield* random.uuidV4(),
943
iat: issuedAt,
944
exp: issuedAt + 60,
945
environmentId: input.environmentId,
@@ -1206,7 +1205,6 @@ const make = Effect.gen(function* () {
1205
Effect.catchIf(ServerSecretStore.isSecretStoreError, internalError("persist-relay-config")),
1206
Effect.catchTags({
1207
SchemaError: internalError("persist-relay-config"),
1209
- PlatformError: internalError("register-endpoint-origin"),
1208
}),
1209
);
1210
@@ -1485,7 +1483,7 @@ const make = Effect.gen(function* () {
1483
iss: `t3-env:${environmentId}`,
1484
aud: normalizeRelayIssuer(relayIssuer),
1485
sub: environmentId,
1488
- jti: yield* crypto.randomUUIDv4(),
1486
+ jti: yield* random.uuidV4(),
1487
iat: nowSeconds,
1488
exp: Math.floor(responseExpiresAt.epochMilliseconds / 1_000),
1489
environmentId,
@@ -1515,7 +1513,6 @@ const make = Effect.gen(function* () {
1513
} satisfies RelayEnvironmentHealthResponse;
1514
},
1515
Effect.catchIf(ServerSecretStore.isSecretStoreError, internalError("answer-health")),
1518
- Effect.catchTags({ PlatformError: internalError("answer-health") }),
1516
);
1517
1518
const mintCredential = Effect.fn("environment.cloud.mintCredential")(
@@ -1595,7 +1592,7 @@ const make = Effect.gen(function* () {
1592
iss: `t3-env:${environmentId}`,
1593
aud: normalizeRelayIssuer(relayIssuer),
1594
sub: environmentId,
1598
- jti: yield* crypto.randomUUIDv4(),
1595
+ jti: yield* random.uuidV4(),
1596
iat: nowSeconds,
1597
exp: Math.floor(issued.expiresAt.epochMilliseconds / 1_000),
1598
environmentId,
@@ -1622,7 +1619,6 @@ const make = Effect.gen(function* () {
1619
} satisfies RelayEnvironmentMintResponse;
1620
},
1621
Effect.catchIf(ServerSecretStore.isSecretStoreError, internalError("issue-credential")),
1625
- Effect.catchTags({ PlatformError: internalError("issue-credential") }),
1622
);
1623
1624
if (!ManagedLimits.allowsConnect(managedPolicy)) {
apps/server/src/cloud/ManagedEndpointRuntime.test.ts
+4
-3
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { describe, expect, it } from "@effect/vitest";
4
import * as Context from "effect/Context";
@@ -72,7 +73,7 @@ const runtimeDependencies = (
73
relayClientLayer,
74
secretStoreLayer,
75
ServerConfig.layerTest(process.cwd(), { prefix: "t3-managed-endpoint-" }),
75
- ).pipe(Layer.provideMerge(NodeServices.layer));
76
+ ).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
77
78
const buildCloudManagedEndpointRuntime = (
79
spawner: ReturnType<typeof ChildProcessSpawner.make>,
@@ -433,7 +434,7 @@ describe("CloudManagedEndpointRuntime", () => {
434
const context = yield* Layer.build(
435
ServerSecretStore.layer.pipe(
436
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-transport-test-" })),
436
- Layer.provide(NodeServices.layer),
437
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
438
),
439
);
440
const secretStoreLayer = Layer.succeed(
@@ -644,7 +645,7 @@ describe("CloudManagedEndpointRuntime", () => {
645
),
646
).toBe(true);
647
}
647
- }).pipe(Effect.provide(NodeServices.layer)),
648
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
649
);
650
651
it.effect("discards a pending fallback when its connector is replaced or removed", () =>
apps/server/src/cloud/environmentKeys.test.ts
+70
-63
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import * as Effect from "effect/Effect";
@@ -16,75 +17,81 @@ const layerServerSecretStore = () =>
17
18
const unusedSecretStoreOperation = () => Effect.die("unused secret-store operation");
19
19
-it.layer(NodeServices.layer)("getOrCreateEnvironmentKeyPairFromSecretStore", (it) => {
20
- it.effect("persists one atomic keypair secret and reuses it", () =>
21
- Effect.gen(function* () {
22
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
20
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))(
21
+ "getOrCreateEnvironmentKeyPairFromSecretStore",
22
+ (it) => {
23
+ it.effect("persists one atomic keypair secret and reuses it", () =>
24
+ Effect.gen(function* () {
25
+ const secretStore = yield* ServerSecretStore.ServerSecretStore;
26
24
- const first = yield* getOrCreateEnvironmentKeyPairFromSecretStore(secretStore);
25
- const second = yield* getOrCreateEnvironmentKeyPairFromSecretStore(secretStore);
27
+ const first = yield* getOrCreateEnvironmentKeyPairFromSecretStore(secretStore);
28
+ const second = yield* getOrCreateEnvironmentKeyPairFromSecretStore(secretStore);
29
27
- assert.deepEqual(second, first);
28
- assert.isTrue(Option.isSome(yield* secretStore.get("cloud-link-ed25519-key-pair")));
29
- assert.isTrue(Option.isNone(yield* secretStore.get("cloud-link-ed25519-private-key")));
30
- assert.isTrue(Option.isNone(yield* secretStore.get("cloud-link-ed25519-public-key")));
31
- }).pipe(Effect.provide(layerServerSecretStore())),
32
- );
30
+ assert.deepEqual(second, first);
31
+ assert.isTrue(Option.isSome(yield* secretStore.get("cloud-link-ed25519-key-pair")));
32
+ assert.isTrue(Option.isNone(yield* secretStore.get("cloud-link-ed25519-private-key")));
33
+ assert.isTrue(Option.isNone(yield* secretStore.get("cloud-link-ed25519-public-key")));
34
+ }).pipe(Effect.provide(layerServerSecretStore())),
35
+ );
36
34
- it.effect("migrates a legacy keypair into the atomic secret", () =>
35
- Effect.gen(function* () {
36
- const secretStore = yield* ServerSecretStore.ServerSecretStore;
37
- yield* secretStore.set("cloud-link-ed25519-private-key", new TextEncoder().encode("private"));
38
- yield* secretStore.set("cloud-link-ed25519-public-key", new TextEncoder().encode("public"));
37
+ it.effect("migrates a legacy keypair into the atomic secret", () =>
38
+ Effect.gen(function* () {
39
+ const secretStore = yield* ServerSecretStore.ServerSecretStore;
40
+ yield* secretStore.set(
41
+ "cloud-link-ed25519-private-key",
42
+ new TextEncoder().encode("private"),
43
+ );
44
+ yield* secretStore.set("cloud-link-ed25519-public-key", new TextEncoder().encode("public"));
45
40
- assert.deepEqual(yield* getOrCreateEnvironmentKeyPairFromSecretStore(secretStore), {
41
- privateKey: "private",
42
- publicKey: "public",
43
- });
44
- assert.isTrue(Option.isSome(yield* secretStore.get("cloud-link-ed25519-key-pair")));
45
- }).pipe(Effect.provide(layerServerSecretStore())),
46
- );
46
+ assert.deepEqual(yield* getOrCreateEnvironmentKeyPairFromSecretStore(secretStore), {
47
+ privateKey: "private",
48
+ publicKey: "public",
49
+ });
50
+ assert.isTrue(Option.isSome(yield* secretStore.get("cloud-link-ed25519-key-pair")));
51
+ }).pipe(Effect.provide(layerServerSecretStore())),
52
+ );
53
48
- it.effect("uses the persisted keypair when a concurrent creator wins", () =>
49
- Effect.gen(function* () {
50
- const winner = new TextEncoder().encode(
51
- '{"privateKey":"winner-private","publicKey":"winner-public"}',
52
- );
53
- let createAttempted = false;
54
- const secretStore = {
55
- get: (name) =>
56
- Effect.sync(() =>
57
- name === "cloud-link-ed25519-key-pair" && createAttempted
58
- ? Option.some(winner)
59
- : Option.none(),
60
- ),
61
- set: unusedSecretStoreOperation,
62
- create: () =>
63
- Effect.sync(() => {
64
- createAttempted = true;
65
- }).pipe(
66
- Effect.flatMap(() =>
67
- Effect.fail(
68
- new ServerSecretStore.SecretStorePersistError({
69
- resource: "environment signing key pair",
70
- cause: PlatformError.systemError({
71
- _tag: "AlreadyExists",
72
- module: "FileSystem",
73
- method: "open",
74
- pathOrDescriptor: "cloud-link-ed25519-key-pair.bin",
54
+ it.effect("uses the persisted keypair when a concurrent creator wins", () =>
55
+ Effect.gen(function* () {
56
+ const winner = new TextEncoder().encode(
57
+ '{"privateKey":"winner-private","publicKey":"winner-public"}',
58
+ );
59
+ let createAttempted = false;
60
+ const secretStore = {
61
+ get: (name) =>
62
+ Effect.sync(() =>
63
+ name === "cloud-link-ed25519-key-pair" && createAttempted
64
+ ? Option.some(winner)
65
+ : Option.none(),
66
+ ),
67
+ set: unusedSecretStoreOperation,
68
+ create: () =>
69
+ Effect.sync(() => {
70
+ createAttempted = true;
71
+ }).pipe(
72
+ Effect.flatMap(() =>
73
+ Effect.fail(
74
+ new ServerSecretStore.SecretStorePersistError({
75
+ resource: "environment signing key pair",
76
+ cause: PlatformError.systemError({
77
+ _tag: "AlreadyExists",
78
+ module: "FileSystem",
79
+ method: "open",
80
+ pathOrDescriptor: "cloud-link-ed25519-key-pair.bin",
81
+ }),
82
}),
76
- }),
83
+ ),
84
),
85
),
79
- ),
80
- getOrCreateRandom: unusedSecretStoreOperation,
81
- remove: unusedSecretStoreOperation,
82
- } satisfies ServerSecretStore.ServerSecretStore["Service"];
86
+ getOrCreateRandom: unusedSecretStoreOperation,
87
+ remove: unusedSecretStoreOperation,
88
+ } satisfies ServerSecretStore.ServerSecretStore["Service"];
89
84
- assert.deepEqual(yield* getOrCreateEnvironmentKeyPairFromSecretStore(secretStore), {
85
- privateKey: "winner-private",
86
- publicKey: "winner-public",
87
- });
88
- }),
89
- );
90
-});
90
+ assert.deepEqual(yield* getOrCreateEnvironmentKeyPairFromSecretStore(secretStore), {
91
+ privateKey: "winner-private",
92
+ publicKey: "winner-public",
93
+ });
94
+ }),
95
+ );
96
+ },
97
+);
apps/server/src/cloud/http.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { describe, expect, it } from "@effect/vitest";
4
import {
@@ -108,7 +109,7 @@ const layerLinkProofRoutes = HttpApiBuilder.layer(LinkProofTestApi).pipe(
109
Layer.provideMerge(ServerSecretStore.layer),
110
Layer.provide(layerConfig),
111
Layer.provideMerge(HttpPlatform.layer.pipe(Layer.provideMerge(Etag.layerWeak))),
111
- Layer.provideMerge(NodeServices.layer),
112
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
113
);
114
115
const withLinkProofClient = async (
apps/server/src/desktopUpdate/DesktopAppUpdate.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { expect, it } from "@effect/vitest";
4
import type { DesktopUpdateState, DesktopUpdateStatusReport } from "@t3tools/contracts";
@@ -104,7 +105,7 @@ const makeHarness = Effect.fn("test.make_desktop_app_update_harness")(function*
105
return { service };
106
});
107
107
-it.layer(NodeServices.layer)("desktop app update", (it) => {
108
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("desktop app update", (it) => {
109
it.effect("collapses state reports into progress stages and succeeds on installing", () =>
110
Effect.gen(function* () {
111
const { service } = yield* makeHarness({
apps/server/src/desktopUpdate/DesktopAppUpdate.ts
+4
-4
@@ -6,7 +6,7 @@ import {
6
type ServerSelfUpdateResult,
7
} from "@t3tools/contracts";
8
import * as Context from "effect/Context";
9
-import * as Crypto from "effect/Crypto";
9
+import * as SecureRandom from "effect/crypto/SecureRandom";
10
import * as Duration from "effect/Duration";
11
import * as Effect from "effect/Effect";
12
import * as Layer from "effect/Layer";
@@ -56,7 +56,7 @@ export class DesktopAppUpdate extends Context.Service<
56
57
export const make = Effect.fn("desktopUpdate.desktopAppUpdate.make")(function* () {
58
const config = yield* ServerConfig.ServerConfig;
59
- const crypto = yield* Crypto.Crypto;
59
+ const random = yield* SecureRandom.SecureRandom;
60
const receiver = yield* DesktopTelemetryReceiver.DesktopTelemetryReceiver;
61
const inFlight = yield* Ref.make(false);
62
@@ -151,8 +151,8 @@ export const make = Effect.fn("desktopUpdate.desktopAppUpdate.make")(function* (
151
152
return yield* Effect.scoped(
153
Effect.gen(function* () {
154
- const requestId = yield* crypto
155
- .randomUUIDv4()
154
+ const requestId = yield* random
155
+ .uuidV4()
156
.pipe(
157
Effect.mapError((error) =>
158
failWith("Could not generate a desktop update request id.", error),
apps/server/src/device/AgentDeviceTarget.test.ts
+9
-7
@@ -4,7 +4,9 @@ import { describe, expect, it } from "@effect/vitest";
4
import * as NodeChildProcess from "node:child_process";
5
import * as NodeNet from "node:net";
6
import * as NodeUtil from "node:util";
7
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
8
import * as NodeServices from "@effect/platform-node/NodeServices";
9
+import * as Layer from "effect/Layer";
10
import * as Effect from "effect/Effect";
11
import * as FileSystem from "effect/FileSystem";
12
import * as Path from "effect/Path";
@@ -82,7 +84,7 @@ exec '${process.execPath.replaceAll("'", "'\"'\"'")}' "$@"
84
}),
85
).rejects.toMatchObject({ code: 23, stdout: `${JSON.stringify(args)}\n`, stderr: "" }),
86
);
85
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
87
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
88
);
89
90
it.effect("binds one device's flags into its launcher and leaves help alone", () =>
@@ -173,7 +175,7 @@ exec '${process.execPath.replaceAll("'", "'\"'\"'")}' "$@"
175
Effect.scoped,
176
Effect.provideService(HostProcess.IsExecutable, false),
177
Effect.provideService(HostProcess.ExecutablePath, process.execPath),
176
- Effect.provide(NodeServices.layer),
178
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
179
),
180
);
181
@@ -248,7 +250,7 @@ exec '${process.execPath.replaceAll("'", "'\"'\"'")}' "$@"
250
Effect.scoped,
251
Effect.provideService(HostProcess.IsExecutable, false),
252
Effect.provideService(HostProcess.ExecutablePath, process.execPath),
251
- Effect.provide(NodeServices.layer),
253
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
254
),
255
);
256
@@ -338,7 +340,7 @@ exec '${process.execPath.replaceAll("'", "'\"'\"'")}' "$@"
340
Effect.scoped,
341
Effect.provideService(HostProcess.IsExecutable, false),
342
Effect.provideService(HostProcess.ExecutablePath, process.execPath),
341
- Effect.provide(NodeServices.layer),
343
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
344
),
345
);
346
@@ -363,7 +365,7 @@ exec '${process.execPath.replaceAll("'", "'\"'\"'")}' "$@"
365
Effect.scoped,
366
Effect.provideService(HostProcess.IsExecutable, false),
367
Effect.provideService(HostProcess.ExecutablePath, process.execPath),
366
- Effect.provide(NodeServices.layer),
368
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
369
),
370
);
371
@@ -393,7 +395,7 @@ exec '${process.execPath.replaceAll("'", "'\"'\"'")}' "$@"
395
}).pipe(
396
Effect.scoped,
397
Effect.provideService(HostProcess.IsExecutable, false),
396
- Effect.provide(NodeServices.layer),
398
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
399
),
400
);
401
@@ -474,7 +476,7 @@ if (process.env.AGENT_DEVICE_DAEMON_BASE_URL) process.exit(2);`,
476
Effect.scoped,
477
Effect.provideService(HostProcess.IsExecutable, true),
478
Effect.provideService(HostProcess.ExecutablePath, "/packaged/t3"),
477
- Effect.provide(NodeServices.layer),
479
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
480
),
481
);
482
});
apps/server/src/device/AgentDeviceTarget.ts
+3
-3
@@ -1,5 +1,5 @@
1
import { DeviceOperationError } from "@t3tools/contracts";
2
-import * as Crypto from "effect/Crypto";
2
+import * as Digest from "effect/crypto/Digest";
3
import * as Duration from "effect/Duration";
4
import * as Effect from "effect/Effect";
5
import * as Hex from "effect/encoding/Hex";
@@ -21,9 +21,9 @@ const encodeEndpoint = Schema.encodeEffect(
21
);
22
23
const key = Effect.fn("AgentDeviceTarget.key")(function* (value: string) {
24
- const crypto = yield* Crypto.Crypto;
24
+ const crypto = yield* Digest.Digest;
25
const digest = yield* crypto
26
- .digest("SHA-256", new TextEncoder().encode(value))
26
+ .digest(Digest.sha256, new TextEncoder().encode(value))
27
.pipe(Effect.orDie);
28
return Hex.encode(digest).slice(0, 24);
29
});
apps/server/src/device/DeviceHubProxy.stream.test.ts
+1
-1
@@ -1,5 +1,5 @@
1
import { expect, it } from "@effect/vitest";
2
-import { NodeWS } from "@effect/platform-node/NodeSocket";
2
+import * as NodeWS from "@effect/platform-node/NodeWS";
3
import * as NodeNet from "node:net";
4
import * as Context from "effect/Context";
5
import * as Effect from "effect/Effect";
apps/server/src/device/DeviceHubProxy.ts
+6
-1
@@ -1,3 +1,4 @@
1
+import { requestUrl } from "../requestUrl.ts";
2
// Loopback-only hubs expose shell execution or unauthenticated actions.
3
// Proxy with environment read scope for streams and operate scope for input and tuning.
4
import { AuthOrchestrationReadScope, AuthOrchestrationOperateScope } from "@t3tools/contracts";
@@ -7,6 +8,7 @@ import * as Option from "effect/Option";
8
import {
9
HttpClient,
10
HttpClientRequest,
11
+ HttpMethod,
12
HttpRouter,
13
HttpServerRequest,
14
HttpServerResponse,
@@ -134,6 +136,9 @@ const proxyHttp = Effect.fn("DeviceHubProxy.proxyHttp")(function* (
136
) {
137
const httpClient = HttpClient.withScope(yield* HttpClient.HttpClient);
138
const method = request.method;
139
+ if (!HttpMethod.isHttpMethod(method)) {
140
+ return HttpServerResponse.text("Method Not Allowed", { status: 405 });
141
+ }
142
const upstreamRequest = HttpClientRequest.make(method)(upstreamUrl).pipe(
143
HttpClientRequest.setHeaders({
144
...forwardHeaders(request, new URL(upstreamUrl).origin),
@@ -175,7 +180,7 @@ const proxyHttp = Effect.fn("DeviceHubProxy.proxyHttp")(function* (
180
181
const handler = Effect.gen(function* () {
182
const request = yield* HttpServerRequest.HttpServerRequest;
178
- const url = HttpServerRequest.toURL(request);
183
+ const url = requestUrl(request);
184
if (Option.isNone(url)) {
185
return HttpServerResponse.text("Bad Request", { status: 400 });
186
}
apps/server/src/device/DeviceService.test.ts
+3
-1
@@ -1436,7 +1436,9 @@ it.effect("reconciles SSH host settings without publishing no-op changes", () =>
1436
expect(removedFiles).toHaveLength(1);
1437
}).pipe(
1438
Effect.scoped,
1439
- Effect.provide(Layer.mergeAll(ServerSettings.layerTest(), NodeServices.layer)),
1439
+ Effect.provide(
1440
+ Layer.mergeAll(ServerSettings.layerTest(), NodeServices.layer, NodeCrypto.layer),
1441
+ ),
1442
),
1443
);
1444
apps/server/src/device/DeviceService.ts
+9
-9
@@ -50,7 +50,7 @@ import {
50
writeAgentDeviceConfig,
51
} from "./AgentDeviceTarget.ts";
52
import * as Context from "effect/Context";
53
-import * as Crypto from "effect/Crypto";
53
+import * as Digest from "effect/crypto/Digest";
54
import * as DateTime from "effect/DateTime";
55
import * as Effect from "effect/Effect";
56
import * as Layer from "effect/Layer";
@@ -271,7 +271,7 @@ export const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function*
271
launchers?: AgentDeviceLaunchers,
272
) {
273
const settings = yield* ServerSettings.ServerSettingsService;
274
- const crypto = yield* Crypto.Crypto;
274
+ const digest = yield* Digest.Digest;
275
const lifecycleLock = yield* Semaphore.make(1);
276
const readDeviceSettings = settings.getSettings.pipe(
277
Effect.map((value) => ({
@@ -323,7 +323,7 @@ export const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function*
323
const live = new Set(
324
yield* Effect.forEach(state.sessions, (session) =>
325
agentDeviceSession(session.threadId, session.hostId, session.deviceId),
326
- ).pipe(Effect.provideService(Crypto.Crypto, crypto)),
326
+ ).pipe(Effect.provideService(Digest.Digest, digest)),
327
);
328
const retired = [...boundLaunchers].filter(([session]) => !live.has(session));
329
for (const [session] of retired) boundLaunchers.delete(session);
@@ -348,7 +348,7 @@ export const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function*
348
session.threadId,
349
session.hostId,
350
session.deviceId,
351
- ).pipe(Effect.provideService(Crypto.Crypto, crypto));
351
+ ).pipe(Effect.provideService(Digest.Digest, digest));
352
const launcher = boundLaunchers.get(name);
353
if (!launcher || hostSessionLaunchers.has(name) || !launchers?.release) return;
354
yield* launchers.release(launcher);
@@ -895,7 +895,7 @@ export const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function*
895
session.threadId,
896
session.hostId,
897
session.deviceId,
898
- ).pipe(Effect.provideService(Crypto.Crypto, crypto));
898
+ ).pipe(Effect.provideService(Digest.Digest, digest));
899
yield* ready.releaseAgentSession(name, session.deviceId);
900
}
901
}
@@ -1131,7 +1131,7 @@ export const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function*
1131
input.threadId,
1132
input.hostId,
1133
input.deviceId,
1134
- ).pipe(Effect.provideService(Crypto.Crypto, crypto));
1134
+ ).pipe(Effect.provideService(Digest.Digest, digest));
1135
if (boundSession) hostSessionLaunchers.add(ownSession);
1136
const session = boundSession ?? ownSession;
1137
return {
@@ -1154,7 +1154,7 @@ export const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function*
1154
target.threadId,
1155
target.hostId,
1156
target.deviceId,
1157
- ).pipe(Effect.provideService(Crypto.Crypto, crypto));
1157
+ ).pipe(Effect.provideService(Digest.Digest, digest));
1158
return yield* launcherLock.withPermit(
1159
Effect.gen(function* () {
1160
const { state } = yield* SynchronizedRef.get(stateRef);
@@ -1224,10 +1224,10 @@ export const make = Effect.gen(function* () {
1224
const hosts = new Map<DeviceHostId, DeviceHost.DeviceHost["Service"]>([
1225
[localHost.id, localHost],
1226
]);
1227
- const crypto = yield* Crypto.Crypto;
1227
+ const digest = yield* Digest.Digest;
1228
const configPath = (hostId: DeviceHostId, deviceId?: DeviceId) =>
1229
agentDeviceConfigPath(config.stateDir, hostId, path, deviceId).pipe(
1230
- Effect.provideService(Crypto.Crypto, crypto),
1230
+ Effect.provideService(Digest.Digest, digest),
1231
);
1232
const configureAgent = Effect.fn("DeviceService.configureAgent")(
1233
function* (
apps/server/src/device/SshDeviceHost.test.ts
+4
-3
@@ -1,4 +1,5 @@
1
import { expect, it } from "@effect/vitest";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as Net from "@t3tools/shared/Net";
5
import * as Effect from "effect/Effect";
@@ -31,7 +32,7 @@ it.effect("preserves installed status after probes and cleans failed agent activ
32
Effect.gen(function* () {
33
if (command._tag !== "StandardCommand") return yield* Effect.die("Unexpected command");
34
const forwarding = command.args.includes("-L");
34
- (forwarding ? tunnelArgs : commandArgs).push([...command.args]);
35
+ (forwarding ? tunnelArgs : commandArgs).push(command.args.map(String));
36
if (forwarding) tunnelStdins.push(command.options.stdin);
37
let output = "";
38
let exitCode = 0;
@@ -191,7 +192,7 @@ it.effect("preserves installed status after probes and cleans failed agent activ
192
}
193
yield* host.stop;
194
expect(forwards).toBe(0);
194
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
195
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
196
);
197
198
it.effect("lists Android devices without probing the host again once it reports Android", () =>
@@ -306,5 +307,5 @@ it.effect("lists Android devices without probing the host again once it reports
307
expect(yield* androidNames).toEqual(["Pixel_8"]);
308
expect(modes.splice(0)).toEqual([""]);
309
yield* host.stop;
309
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
310
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
311
);
apps/server/src/device/SshDeviceHost.ts
+10
-7
@@ -8,7 +8,7 @@ import {
8
import { runSshCommand, baseSshArgs, resolveSshCommand } from "@t3tools/ssh/command";
9
import * as NetService from "@t3tools/shared/Net";
10
import { waitForHttpReady } from "@t3tools/shared/httpReadiness";
11
-import * as Crypto from "effect/Crypto";
11
+import * as Digest from "effect/crypto/Digest";
12
import * as Exit from "effect/Exit";
13
import * as Effect from "effect/Effect";
14
import * as FileSystem from "effect/FileSystem";
@@ -82,9 +82,12 @@ const ownerFor = Effect.fn("SshDeviceHost.ownerFor")(function* (hostId: string)
82
const environmentId = yield* fs
83
.readFileString(server.environmentIdPath)
84
.pipe(Effect.orElseSucceed(() => server.stateDir));
85
- const crypto = yield* Crypto.Crypto;
86
- const owner = yield* crypto
87
- .digest("SHA-256", new TextEncoder().encode(`${environmentId}\0${server.stateDir}\0${hostId}`))
85
+ const digest = yield* Digest.Digest;
86
+ const owner = yield* digest
87
+ .digest(
88
+ Digest.sha256,
89
+ new TextEncoder().encode(`${environmentId}\0${server.stateDir}\0${hostId}`),
90
+ )
91
.pipe(Effect.map(Hex.encode), Effect.orDie);
92
return owner.slice(0, 24);
93
});
@@ -129,7 +132,7 @@ export const make = Effect.fn("SshDeviceHost.make")(function* (
132
const net = yield* NetService.NetService;
133
const http = yield* HttpClient.HttpClient;
134
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
132
- const crypto = yield* Crypto.Crypto;
135
+ const digest = yield* Digest.Digest;
136
const parentScope = yield* Scope.Scope;
137
const ssh = yield* resolveSshCommand;
138
const owner = yield* ownerFor(config.id);
@@ -140,7 +143,7 @@ export const make = Effect.fn("SshDeviceHost.make")(function* (
143
| FileSystem.FileSystem
144
| Path.Path
145
| ChildProcessSpawner.ChildProcessSpawner
143
- | Crypto.Crypto
146
+ | Digest.Digest
147
| ServerConfig.ServerConfig
148
>,
149
) =>
@@ -149,7 +152,7 @@ export const make = Effect.fn("SshDeviceHost.make")(function* (
152
Effect.provideService(Path.Path, path),
153
Effect.provideService(ServerConfig.ServerConfig, server),
154
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
152
- Effect.provideService(Crypto.Crypto, crypto),
155
+ Effect.provideService(Digest.Digest, digest),
156
);
157
const lock = yield* Semaphore.make(1);
158
let stopped = false;
apps/server/src/device/localSshDeviceHost.test.ts
+1
-1
@@ -21,7 +21,7 @@ const spawner = ChildProcessSpawner.make((command) =>
21
Effect.gen(function* () {
22
if (command._tag !== "StandardCommand") return yield* Effect.die("Unexpected command");
23
expect(command.args).toContain("-G");
24
- const target = command.args.at(-1);
24
+ const target = command.args.map(String).at(-1);
25
const configs: Record<string, string> = {
26
"mac-mini": "hostname 100.65.180.100\nport 22\n",
27
remote: "hostname 192.0.2.1\nport 22\n",
apps/server/src/environment/ServerEnvironment.test.ts
+9
-8
@@ -1,7 +1,8 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { ORCHESTRATION_PROTOCOL_VERSION } from "@t3tools/contracts";
4
import { expect, it } from "@effect/vitest";
4
-import * as Crypto from "effect/Crypto";
5
+import * as SecureRandom from "effect/crypto/SecureRandom";
6
import * as Deferred from "effect/Deferred";
7
import * as Effect from "effect/Effect";
8
import * as FileSystem from "effect/FileSystem";
@@ -73,7 +74,7 @@ const makeServerConfig = Effect.fn(function* (baseDir: string) {
74
} satisfies ServerConfig.ServerConfig["Service"];
75
});
76
76
-it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {
77
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("ServerEnvironmentLive", (it) => {
78
it.effect("publishes proven install ownership only for manually updated servers", () =>
79
Effect.gen(function* () {
80
const fs = yield* FileSystem.FileSystem;
@@ -129,7 +130,7 @@ it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {
130
])("concurrent initializers recover a $name environment id file", ({ content }) =>
131
Effect.gen(function* () {
132
const fileSystem = yield* FileSystem.FileSystem;
132
- const crypto = yield* Crypto.Crypto;
133
+ const random = yield* SecureRandom.SecureRandom;
134
const baseDir = yield* fileSystem.makeTempDirectoryScoped({
135
prefix: "t3-server-environment-concurrent-test-",
136
});
@@ -169,17 +170,17 @@ it.layer(NodeServices.layer)("ServerEnvironmentLive", (it) => {
170
),
171
),
172
}),
172
- Effect.provideService(Crypto.Crypto, {
173
- ...crypto,
174
- randomUUIDv4: (() =>
173
+ Effect.provideService(SecureRandom.SecureRandom, {
174
+ ...random,
175
+ uuidV4: (() =>
176
Effect.gen(function* () {
176
- const id = yield* crypto.randomUUIDv4();
177
+ const id = yield* random.uuidV4();
178
if (--remaining === 0) {
179
yield* Deferred.succeed(bothGenerated, undefined);
180
}
181
yield* Deferred.await(bothGenerated);
182
return id;
182
- })) as Crypto.Crypto["randomUUIDv4"],
183
+ })) as SecureRandom.SecureRandom["Service"]["uuidV4"],
184
}),
185
);
186
apps/server/src/environment/ServerEnvironment.ts
+3
-3
@@ -6,7 +6,7 @@ import {
6
} from "@t3tools/contracts";
7
import * as HostProcess from "@t3tools/shared/HostProcess";
8
import * as Context from "effect/Context";
9
-import * as Crypto from "effect/Crypto";
9
+import * as SecureRandom from "effect/crypto/SecureRandom";
10
import * as Effect from "effect/Effect";
11
import * as FileSystem from "effect/FileSystem";
12
import * as Layer from "effect/Layer";
@@ -85,7 +85,7 @@ function platformArch(
85
const makeIdentity = Effect.gen(function* () {
86
const fileSystem = yield* FileSystem.FileSystem;
87
const serverConfig = yield* ServerConfig.ServerConfig;
88
- const crypto = yield* Crypto.Crypto;
88
+ const random = yield* SecureRandom.SecureRandom;
89
90
const readPersistedEnvironmentId = Effect.gen(function* () {
91
const exists = yield* fileSystem.exists(serverConfig.environmentIdPath).pipe(
@@ -159,7 +159,7 @@ const makeIdentity = Effect.gen(function* () {
159
return persisted;
160
}
161
162
- const generated = yield* crypto.randomUUIDv4();
162
+ const generated = yield* random.uuidV4();
163
yield* persistEnvironmentId(generated, "create");
164
let winner = yield* readPersistedEnvironmentId;
165
if (winner === null) {
apps/server/src/git/GitManager.test.ts
+6
-5
@@ -6,6 +6,7 @@ import * as NodeFS from "node:fs";
6
import * as NodePath from "node:path";
7
import * as NodeChildProcess from "node:child_process";
8
9
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
10
import * as NodeServices from "@effect/platform-node/NodeServices";
11
import { it } from "@effect/vitest";
12
import * as Context from "effect/Context";
@@ -632,7 +633,7 @@ function makeManager(input?: {
633
const args =
634
command._tag === "StandardCommand" &&
635
NodePath.parse(command.command).name.toLowerCase() === "git"
635
- ? command.args
636
+ ? command.args.map(String)
637
: null;
638
if (args !== null) gitCommands?.push(args.join(" "));
639
if (args === null || gitSpawnGate === undefined || !gitSpawnGate.matches(args)) {
@@ -650,7 +651,7 @@ function makeManager(input?: {
651
);
652
});
653
}),
653
- ).pipe(Layer.provide(NodeServices.layer))
654
+ ).pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)))
655
: Layer.empty;
656
const gitVcsDriver = input?.gitConfigReads
657
? Layer.effect(
@@ -671,7 +672,7 @@ function makeManager(input?: {
672
const layerVcsDriver = (watchesGitSpawns ? Layer.fresh(gitVcsDriver) : gitVcsDriver).pipe(
673
Layer.provide(layerGitDriverSpawner),
674
Layer.provideMerge(VcsProcess.layer),
674
- Layer.provideMerge(NodeServices.layer),
675
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
676
Layer.provideMerge(layerServerConfig),
677
);
678
const layerSourceControlRegistry = Layer.effect(
@@ -713,7 +714,7 @@ function makeManager(input?: {
714
).pipe(
715
Layer.provideMerge(layerSourceControlRegistry),
716
Layer.provideMerge(layerVcsDriver),
716
- Layer.provideMerge(NodeServices.layer),
717
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
718
);
719
const layerStores = Layer.merge(ProjectionStore.layer, ProjectStore.layer).pipe(
720
Layer.provideMerge(SqlitePersistence.layerMemory),
@@ -737,7 +738,7 @@ const asThreadId = (threadId: string) => threadId as ThreadId;
738
const layerGitManagerTest = GitVcsDriver.layer.pipe(
739
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" })),
740
Layer.provideMerge(VcsProcess.layer),
740
- Layer.provideMerge(NodeServices.layer),
741
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
742
);
743
744
it.layer(layerGitManagerTest)("GitManager", (it) => {
apps/server/src/git/GitManager.ts
+3
-3
@@ -2,7 +2,7 @@ import * as Arr from "effect/Array";
2
import * as Cache from "effect/Cache";
3
import * as Clock from "effect/Clock";
4
import * as Context from "effect/Context";
5
-import * as Crypto from "effect/Crypto";
5
+import * as SecureRandom from "effect/crypto/SecureRandom";
6
import * as ByteSize from "effect/ByteSize";
7
import * as DateTime from "effect/DateTime";
8
import * as Duration from "effect/Duration";
@@ -653,7 +653,7 @@ export const make = Effect.gen(function* () {
653
const textGeneration = yield* TextGeneration.TextGeneration;
654
const providerRegistry = yield* ProviderRegistry.ProviderRegistry;
655
const projectSetupScriptRunner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
656
- const crypto = yield* Crypto.Crypto;
656
+ const random = yield* SecureRandom.SecureRandom;
657
const fileSystem = yield* FileSystem.FileSystem;
658
const path = yield* Path.Path;
659
@@ -854,7 +854,7 @@ export const make = Effect.gen(function* () {
854
}
855
});
856
const randomUUIDv4 = (cwd: string) =>
857
- crypto.randomUUIDv4().pipe(
857
+ random.uuidV4().pipe(
858
Effect.mapError(
859
(cause) =>
860
new GitManagerError({
apps/server/src/git/GitWorkflowService.test.ts
+4
-3
@@ -2,6 +2,7 @@ import { assert, it } from "@effect/vitest";
2
import * as Effect from "effect/Effect";
3
import * as Layer from "effect/Layer";
4
5
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
6
import * as NodeServices from "@effect/platform-node/NodeServices";
7
import * as FileSystem from "effect/FileSystem";
8
@@ -12,7 +13,7 @@ import * as GitWorkflowService from "./GitWorkflowService.ts";
13
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
14
import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
15
15
-it.layer(NodeServices.layer)("GitWorkflowService", (it) => {
16
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("GitWorkflowService", (it) => {
17
it.effect("finds a name among the refs of every namespace", () =>
18
Effect.gen(function* () {
19
const fileSystem = yield* FileSystem.FileSystem;
@@ -47,10 +48,10 @@ it.layer(NodeServices.layer)("GitWorkflowService", (it) => {
48
Layer.provideMerge(VcsProcess.layer),
49
Layer.provideMerge(
50
ServerConfig.layerTest(process.cwd(), { prefix: "t3-ref-named-" }).pipe(
50
- Layer.provide(NodeServices.layer),
51
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
52
),
53
),
53
- Layer.provideMerge(NodeServices.layer),
54
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
55
),
56
),
57
),
apps/server/src/guest/GuestShareService.test.ts
+6
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import {
@@ -109,7 +110,10 @@ const layerCleanup = Layer.effect(
110
),
111
};
112
}),
112
-).pipe(Layer.provide(layerConfig), Layer.provide(NodeServices.layer));
113
+).pipe(
114
+ Layer.provide(layerConfig),
115
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
116
+);
117
class RecordedAnalytics extends Context.Service<
118
RecordedAnalytics,
119
Ref.Ref<ReadonlyArray<Readonly<Record<string, unknown>>>>
@@ -142,7 +146,7 @@ const layerTest = GuestShareService.layer.pipe(
146
Layer.provideMerge(layerAnalytics),
147
Layer.provide(ServerSecretStore.layer),
148
Layer.provideMerge(layerConfig),
145
- Layer.provideMerge(NodeServices.layer),
149
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
150
);
151
152
const threadId = ThreadId.make("thread:guest-share-service");
apps/server/src/guest/GuestShareService.ts
+5
-7
@@ -23,7 +23,7 @@ import {
23
import { chatMarkdownImageSources } from "@t3tools/shared/markdownPipeline";
24
import { htmlRenderFromToolItem } from "@t3tools/shared/toolOutput";
25
import * as Context from "effect/Context";
26
-import * as Crypto from "effect/Crypto";
26
+import * as SecureRandom from "effect/crypto/SecureRandom";
27
import * as DateTime from "effect/DateTime";
28
import * as Duration from "effect/Duration";
29
import * as Effect from "effect/Effect";
@@ -239,7 +239,7 @@ const make = Effect.gen(function* () {
239
const managedEndpoint = yield* CloudManagedEndpointRuntime;
240
const { attachmentsDir } = yield* ServerConfig.ServerConfig;
241
const fileSystem = yield* FileSystem.FileSystem;
242
- const crypto = yield* Crypto.Crypto;
242
+ const random = yield* SecureRandom.SecureRandom;
243
const secretStore = yield* ServerSecretStore.ServerSecretStore;
244
const analytics = yield* AnalyticsService.AnalyticsService;
245
const signingKey = yield* Effect.cached(
@@ -308,7 +308,7 @@ const make = Effect.gen(function* () {
308
);
309
310
const commandId = (label: string) =>
311
- crypto.randomUUIDv4().pipe(
311
+ random.uuidV4().pipe(
312
Effect.map((uuid) => CommandId.make(`server:guest-share:${label}:${uuid}`)),
313
Effect.orDie,
314
);
@@ -350,9 +350,7 @@ const make = Effect.gen(function* () {
350
if (host === null) {
351
return yield* new GuestShareCreateError({ reason: "connect_unavailable" });
352
}
353
- const shareId = GuestShareId.make(
354
- base64UrlEncode(yield* crypto.randomBytes(SHARE_ID_BYTES).pipe(Effect.orDie)),
355
- );
353
+ const shareId = GuestShareId.make(base64UrlEncode(yield* random.randomBytes(SHARE_ID_BYTES)));
354
const now = yield* DateTime.now;
355
const expiresAt = DateTime.formatIso(DateTime.add(now, { milliseconds: GUEST_SHARE_TTL_MS }));
356
yield* orchestrator
@@ -472,7 +470,7 @@ const make = Effect.gen(function* () {
470
commandId: yield* commandId("submit"),
471
threadId: thread.id,
472
shareId: share.id,
475
- guestMessageId: GuestMessageId.make(yield* crypto.randomUUIDv4().pipe(Effect.orDie)),
473
+ guestMessageId: GuestMessageId.make(yield* random.uuidV4()),
474
text: request.text,
475
...(attachments.length === 0 ? {} : { attachments }),
476
}).pipe(Effect.onError(() => removeStored(attachments)));
apps/server/src/http.ts
+4
-3
@@ -54,6 +54,7 @@ import {
54
browserApiCorsAllowedMethods,
55
DESKTOP_RENDERER_ORIGINS,
56
} from "./httpCors.ts";
57
+import { requestUrl } from "./requestUrl.ts";
58
59
const OTLP_TRACES_PROXY_PATH = "/api/observability/v1/traces";
60
const LOOPBACK_HOSTNAMES = new Set(["127.0.0.1", "::1", "localhost"]);
@@ -407,7 +408,7 @@ export const layerAssetRoute = HttpRouter.add(
408
`${ASSET_ROUTE_PREFIX}/*`,
409
Effect.gen(function* () {
410
const request = yield* HttpServerRequest.HttpServerRequest;
410
- const url = HttpServerRequest.toURL(request);
411
+ const url = requestUrl(request);
412
if (Option.isNone(url)) {
413
return HttpServerResponse.text("Bad Request", { status: 400 });
414
}
@@ -465,7 +466,7 @@ export const layerAttachmentUploadRoute = HttpRouter.add(
466
`${ATTACHMENT_UPLOAD_ROUTE_PREFIX}/*`,
467
Effect.gen(function* () {
468
const request = yield* HttpServerRequest.HttpServerRequest;
468
- const url = HttpServerRequest.toURL(request);
469
+ const url = requestUrl(request);
470
if (Option.isNone(url)) {
471
return HttpServerResponse.text("Bad Request", { status: 400 });
472
}
@@ -566,7 +567,7 @@ const streamStaticFile = (file: FileSystem.File, size: bigint) =>
567
const handleStaticAndDevRequest = Effect.fn("handleStaticAndDevRequest")(
568
function* (immutableBuildAssets: ReadonlySet<string>) {
569
const request = yield* HttpServerRequest.HttpServerRequest;
569
- const url = HttpServerRequest.toURL(request);
570
+ const url = requestUrl(request);
571
572
if (Option.isNone(url)) {
573
return HttpServerResponse.text("Bad Request", { status: 400 });
apps/server/src/mcp/McpDeviceToolkit.test.ts
+4
-8
@@ -147,7 +147,7 @@ const layerDeviceServiceMock = Layer.mock(DeviceService.DeviceService)({
147
});
148
149
const layerTest = McpHttpServer.layerDeviceToolkit.pipe(
150
- Layer.provideMerge(McpServer.McpServer.layer),
150
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
151
Layer.provideMerge(McpToolAccessTestkit.liveThreadsLayer),
152
Layer.provideMerge(layerDeviceServiceMock),
153
Layer.provide(layerProjectsMock),
@@ -272,7 +272,7 @@ it.effect("rejects unavailable agent access before booting or opening a device",
272
Effect.scoped,
273
Effect.provide(
274
McpHttpServer.layerDeviceToolkit.pipe(
275
- Layer.provideMerge(McpServer.McpServer.layer),
275
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
276
Layer.provideMerge(McpToolAccessTestkit.liveThreadsLayer),
277
Layer.provide(layerUnavailable),
278
Layer.provide(layerProjectsMock),
@@ -345,11 +345,7 @@ describe("device targeting across hosts", () => {
345
readonly call: (
346
name: string,
347
args: Record<string, unknown>,
348
- ) => Effect.Effect<
349
- McpSchema.CallToolResult,
350
- McpSchema.InternalError | McpSchema.InvalidParams,
351
- McpServer.McpServer
352
- >;
348
+ ) => Effect.Effect<McpSchema.CallToolResult, McpSchema.McpErrorBase, McpServer.McpServer>;
349
}) => Effect.Effect<A, E, McpServer.McpServer>,
350
overrides: Partial<DeviceService.DeviceService["Service"]> = {},
351
) => {
@@ -416,7 +412,7 @@ describe("device targeting across hosts", () => {
412
Effect.scoped,
413
Effect.provide(
414
McpHttpServer.layerDeviceToolkit.pipe(
419
- Layer.provideMerge(McpServer.McpServer.layer),
415
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
416
Layer.provideMerge(McpToolAccessTestkit.liveThreadsLayer),
417
Layer.provide(layerDevices),
418
Layer.provide(layerProjectsMock),
apps/server/src/mcp/McpHttpServer.test.ts
+51
-49
@@ -3,6 +3,7 @@ import * as ProjectionStore from "../orchestration-v2/ProjectionStore.ts";
3
import * as ThreadManagementService from "../orchestration-v2/ThreadManagementService.ts";
4
import { expect, it } from "@effect/vitest";
5
import { NodeHttpServer } from "@effect/platform-node";
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import {
9
DeviceId,
@@ -79,14 +80,14 @@ const client = McpSchema.McpServerClient.of({
80
getClient: Effect.die("unused"),
81
});
82
const layerTest = McpHttpServer.layerPreviewToolkit.pipe(
82
- Layer.provideMerge(McpServer.McpServer.layer),
83
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
84
Layer.provideMerge(McpToolAccessTestkit.liveThreadsLayer),
85
Layer.provideMerge(PreviewAutomationBroker.layer),
86
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "t3-mcp-http-server-test-" })),
86
- Layer.provideMerge(NodeServices.layer),
87
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
88
);
89
const layerPullRequestsTest = McpHttpServer.layerPullRequestsToolkit.pipe(
89
- Layer.provideMerge(McpServer.McpServer.layer),
90
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
91
Layer.provideMerge(McpToolAccessTestkit.liveThreadsLayer),
92
Layer.provide(
93
Layer.mergeAll(
@@ -95,6 +96,7 @@ const layerPullRequestsTest = McpHttpServer.layerPullRequestsToolkit.pipe(
96
Layer.mock(Orchestrator.OrchestratorV2)({}),
97
Layer.mock(ProjectionStore.ProjectionStoreV2)({}),
98
NodeServices.layer,
99
+ NodeCrypto.layer,
100
),
101
),
102
);
@@ -192,7 +194,7 @@ it.effect.each([
194
}).pipe(
195
Effect.provide(
196
McpHttpServer.layerDeviceToolkit.pipe(
195
- Layer.provideMerge(McpServer.McpServer.layer),
197
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
198
Layer.provide(McpToolAccessTestkit.liveThreadsLayer),
199
Layer.provide(
200
Layer.mock(DeviceService.DeviceService)({
@@ -224,7 +226,7 @@ it.effect.each([
226
),
227
Layer.provide(Layer.mock(ProjectService.ProjectService)({})),
228
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-device-mcp-test-" })),
227
- Layer.provide(NodeServices.layer),
229
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
230
),
231
),
232
Effect.scoped,
@@ -254,13 +256,14 @@ const layerRecordingTools = (calls: Array<unknown>) => {
256
t3_project_update: record,
257
}),
258
).pipe(
257
- Layer.provideMerge(McpServer.McpServer.layer),
259
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
260
Layer.provide(
261
Layer.mergeAll(
262
McpToolAccessTestkit.liveThreadsLayer,
263
Layer.mock(OrchestratorMcpService.OrchestratorMcpService)({}),
264
Layer.mock(ProjectService.ProjectService)({}),
265
NodeServices.layer,
266
+ NodeCrypto.layer,
267
),
268
),
269
);
@@ -771,7 +774,7 @@ it.effect("terminates HTTP MCP sessions with DELETE", () =>
774
capabilities: new Set(["orchestration"]),
775
issuedAt: 1,
776
};
774
- const layerServer = McpHttpServer.layerMcpTransport.pipe(
777
+ const layerServer = McpHttpServer.layerMcpTransport(Layer.empty).pipe(
778
Layer.provide(ServerSettings.layerTest()),
779
Layer.provide(
780
Layer.mock(McpSessionRegistry.McpSessionRegistry)({
@@ -866,20 +869,20 @@ it.effect("admits provider and OAuth client credentials and points only clients
869
dependencies: [McpInvocationContext.McpInvocationContext],
870
}),
871
);
869
- const serverLayer = McpHttpServer.toolkitRegistration(
870
- ProbeToolkit,
871
- McpToolAccess.toLayer(ProbeToolkit, {
872
- probe: McpToolAccess.reads(() =>
873
- McpInvocationContext.McpInvocationContext.pipe(
874
- Effect.tap((scope) => Effect.sync(() => seen.push(scope))),
875
- Effect.as({ ok: true }),
872
+ const serverLayer = McpHttpServer.layerMcpTransport(
873
+ McpHttpServer.toolkitRegistration(
874
+ ProbeToolkit,
875
+ McpToolAccess.toLayer(ProbeToolkit, {
876
+ probe: McpToolAccess.reads(() =>
877
+ McpInvocationContext.McpInvocationContext.pipe(
878
+ Effect.tap((scope) => Effect.sync(() => seen.push(scope))),
879
+ Effect.as({ ok: true }),
880
+ ),
881
),
877
- ),
878
- }),
879
- ).pipe(
880
- Layer.provideMerge(
881
- McpHttpServer.layerMcpTransport.pipe(Layer.provide(ServerSettings.layerTest())),
882
+ }),
883
),
884
+ ).pipe(
885
+ Layer.provide(ServerSettings.layerTest()),
886
Layer.provide(
887
Layer.mock(McpSessionRegistry.McpSessionRegistry)({
888
resolve: (token) =>
@@ -968,7 +971,7 @@ it.effect("accepts case-insensitive MCP bearer schemes and diagnoses rejected cr
971
Layer.provide(ManagedPolicy.layerTest()),
972
Layer.provideMerge(ServerEnvironment.layerIdentity),
973
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-mcp-auth-header-test-" })),
971
- Layer.provideMerge(NodeServices.layer),
974
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
975
);
976
return Effect.scoped(
977
Effect.gen(function* () {
@@ -986,7 +989,7 @@ it.effect("accepts case-insensitive MCP bearer schemes and diagnoses rejected cr
989
client: { deviceType: "bot" },
990
});
991
yield* HttpRouter.serve(
989
- McpHttpServer.layerMcpTransport.pipe(
992
+ McpHttpServer.layerMcpTransport(Layer.empty).pipe(
993
Layer.provide(McpOAuth.layerMcpClientAuthenticator),
994
Layer.provide(ServerSettings.layerTest()),
995
),
@@ -1087,18 +1090,16 @@ it.effect("hides tools for links and refuses another environment while the beta
1090
);
1091
const settingsContext = yield* Layer.build(ServerSettings.layerTest());
1092
const settings = Context.get(settingsContext, ServerSettings.ServerSettingsService);
1090
- const serverLayer = McpHttpServer.toolkitRegistration(
1091
- LinksToolkit,
1092
- McpToolAccess.toLayer(LinksToolkit, {
1093
- links: McpToolAccess.reads(() => Effect.succeed({ links: 0 })),
1094
- where: McpToolAccess.reads(() => Effect.succeed({ ranIn: "here" })),
1095
- }),
1096
- ).pipe(
1097
- Layer.provideMerge(
1098
- McpHttpServer.layerMcpTransport.pipe(
1099
- Layer.provide(Layer.succeedContext(settingsContext)),
1100
- ),
1093
+ const serverLayer = McpHttpServer.layerMcpTransport(
1094
+ McpHttpServer.toolkitRegistration(
1095
+ LinksToolkit,
1096
+ McpToolAccess.toLayer(LinksToolkit, {
1097
+ links: McpToolAccess.reads(() => Effect.succeed({ links: 0 })),
1098
+ where: McpToolAccess.reads(() => Effect.succeed({ ranIn: "here" })),
1099
+ }),
1100
),
1101
+ ).pipe(
1102
+ Layer.provide(Layer.succeedContext(settingsContext)),
1103
Layer.provide(McpToolAccessTestkit.liveThreadsLayer),
1104
Layer.provide(
1105
Layer.mock(McpSessionRegistry.McpSessionRegistry)({
@@ -1201,10 +1202,10 @@ it.effect("lists pull request watch tools only to threads that are not delegated
1202
["parentToken", scopeFor("parentToken", false)],
1203
["childToken", scopeFor("childToken", true)],
1204
]);
1204
- const serverLayer = McpHttpServer.layerPullRequestsToolkit.pipe(
1205
- Layer.provideMerge(
1206
- McpHttpServer.layerMcpTransport.pipe(Layer.provide(ServerSettings.layerTest())),
1207
- ),
1205
+ const serverLayer = McpHttpServer.layerMcpTransport(
1206
+ McpHttpServer.layerPullRequestsToolkit,
1207
+ ).pipe(
1208
+ Layer.provide(ServerSettings.layerTest()),
1209
Layer.provide(
1210
Layer.mock(McpSessionRegistry.McpSessionRegistry)({
1211
resolve: (token) => Effect.succeed(scopes.get(token)),
@@ -1218,6 +1219,7 @@ it.effect("lists pull request watch tools only to threads that are not delegated
1219
Layer.mock(Orchestrator.OrchestratorV2)({}),
1220
Layer.mock(ProjectionStore.ProjectionStoreV2)({}),
1221
NodeServices.layer,
1222
+ NodeCrypto.layer,
1223
),
1224
),
1225
);
@@ -1298,20 +1300,20 @@ it.effect(
1300
],
1301
}),
1302
);
1301
- const serverLayer = McpHttpServer.toolkitRegistration(
1302
- StartsToolkit,
1303
- McpToolAccess.toLayer(StartsToolkit, {
1304
- starts: McpToolAccess.startsThreads(
1305
- (input) => input,
1306
- (_, modes) =>
1307
- Effect.succeed({ modes: `${modes.runtimeMode}/${modes.interactionMode}` }),
1308
- "stamped",
1309
- ),
1310
- }),
1311
- ).pipe(
1312
- Layer.provideMerge(
1313
- McpHttpServer.layerMcpTransport.pipe(Layer.provide(ServerSettings.layerTest())),
1303
+ const serverLayer = McpHttpServer.layerMcpTransport(
1304
+ McpHttpServer.toolkitRegistration(
1305
+ StartsToolkit,
1306
+ McpToolAccess.toLayer(StartsToolkit, {
1307
+ starts: McpToolAccess.startsThreads(
1308
+ (input) => input,
1309
+ (_, modes) =>
1310
+ Effect.succeed({ modes: `${modes.runtimeMode}/${modes.interactionMode}` }),
1311
+ "stamped",
1312
+ ),
1313
+ }),
1314
),
1315
+ ).pipe(
1316
+ Layer.provide(ServerSettings.layerTest()),
1317
Layer.provide(McpToolAccessTestkit.liveThreadsLayer),
1318
Layer.provide(
1319
Layer.mock(McpSessionRegistry.McpSessionRegistry)({
apps/server/src/mcp/McpHttpServer.ts
+61
-28
@@ -1,7 +1,7 @@
1
import * as Cause from "effect/Cause";
2
import * as Clock from "effect/Clock";
3
import * as Context from "effect/Context";
4
-import * as Crypto from "effect/Crypto";
4
+import * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as Effect from "effect/Effect";
6
import * as FileSystem from "effect/FileSystem";
7
import * as Layer from "effect/Layer";
@@ -78,9 +78,10 @@ import {
78
} from "./toolkits/device/tools.ts";
79
import * as HtmlHandlers from "./toolkits/html/handlers.ts";
80
import { HtmlPreviewTool, HtmlPreviewToolkit, HtmlRenderToolkit } from "./toolkits/html/tools.ts";
81
+import { requestUrl } from "../requestUrl.ts";
82
83
const mcpResourceMetadataUrl = (request: HttpServerRequest.HttpServerRequest) =>
83
- HttpServerRequest.toURL(request).pipe(
84
+ requestUrl(request).pipe(
85
Option.map((url) => `${url.origin}/.well-known/oauth-protected-resource/mcp`),
86
);
87
@@ -439,8 +440,8 @@ const saveScreenshot = Effect.fn("McpHttpServer.saveScreenshot")(function* (
440
const fileSystem = yield* FileSystem.FileSystem;
441
const path = yield* Path.Path;
442
const millis = yield* Clock.currentTimeMillis;
442
- const crypto = yield* Crypto.Crypto;
443
- const unique = (yield* crypto.randomUUIDv4().pipe(Effect.orDie)).slice(0, 8);
443
+ const random = yield* SecureRandom.SecureRandom;
444
+ const unique = (yield* random.uuidV4()).slice(0, 8);
445
const fileName = `browser-screenshot-${screenshotSiteSlug(pageUrl)}-${millis.toString(36)}-${unique}.png`;
446
const screenshotPath = path.join(config.browserArtifactsDir, fileName);
447
yield* fileSystem.makeDirectory(config.browserArtifactsDir, { recursive: true }).pipe(
@@ -504,7 +505,7 @@ const registerPreviewSnapshot = Effect.fn("McpHttpServer.registerPreviewSnapshot
505
const broker = yield* PreviewAutomationBroker.PreviewAutomationBroker;
506
const threads = yield* ThreadManagementService.ThreadManagementService;
507
const saveServices = yield* Effect.context<
507
- ServerConfig.ServerConfig | FileSystem.FileSystem | Path.Path | Crypto.Crypto
508
+ ServerConfig.ServerConfig | FileSystem.FileSystem | Path.Path | SecureRandom.SecureRandom
509
>();
510
const built = yield* decodeAsAdvertised(PreviewSnapshotToolkit);
511
const tool = PreviewSnapshotTool;
@@ -1046,29 +1047,40 @@ const withAdvertisedSchemas = Effect.fn("McpHttpServer.withAdvertisedSchemas")(f
1047
return yield* registration.pipe(Effect.provideService(McpServer.McpServer, advertisingServer));
1048
});
1049
1050
+/** Hands each call the services its registration was built with; the request's own still win. */
1051
+const provideRegistrationServices = <Services>() =>
1052
+ McpServer.middleware<{ provides: Services }>()(
1053
+ Effect.map(
1054
+ Effect.context<Services>(),
1055
+ (services) => (effect) =>
1056
+ Effect.updateContext(effect, (request: Context.Context<never>) =>
1057
+ Context.merge(services, request),
1058
+ ),
1059
+ ),
1060
+ );
1061
+
1062
/**
1050
- * `McpServer.toolkit` asks for every service its tools declare when it
1051
- * registers them, but the auth middleware provides `McpInvocationContext` to
1052
- * each request instead. Registration must not get one: the services it
1053
- * captures would replace the request's.
1063
+ * Tools declare their handler services as request-level dependencies. Those
1064
+ * built with the server are provided here; `McpInvocationContext` is left to
1065
+ * the transport, whose auth middleware resolves it per request.
1066
*/
1067
export const toolkitRegistration = <Tools extends Record<string, Tool.Any>, EX, RX>(
1068
toolkit: Toolkit.Toolkit<Tools>,
1069
handlers: McpToolAccess.HandlersLayer<Tools, EX, RX>,
1058
-) => {
1059
- const registration = Layer.effectDiscard(
1070
+) =>
1071
+ Layer.effectDiscard(
1072
withToolAnalytics(
1073
withAdvertisedSchemas(toolkit, McpServer.registerToolkit(decodeAsAdvertised(toolkit))),
1074
),
1063
- ).pipe(Layer.provide(McpServer.McpServer.layer));
1064
- // @effect-diagnostics-next-line unsafeEffectTypeAssertion:off - the auth middleware provides it per request.
1065
- const registered = registration as Layer.Layer<
1066
- never,
1067
- never,
1068
- Exclude<Layer.Services<typeof registration>, McpInvocationContext.McpInvocationContext>
1069
- >;
1070
- return registered.pipe(Layer.provide(McpToolAccess.HandlersLayer.layer(handlers)));
1071
-};
1075
+ ).pipe(
1076
+ Layer.provide(
1077
+ provideRegistrationServices<
1078
+ Exclude<Tool.Requirements<Tools[keyof Tools]>, McpInvocationContext.McpInvocationContext>
1079
+ >().layer,
1080
+ ),
1081
+ Layer.provide(McpServer.McpServer.layer),
1082
+ Layer.provide(McpToolAccess.HandlersLayer.layer(handlers)),
1083
+ );
1084
1085
const imageToolRegistration = <Tools extends Record<string, Tool.Any>, A, E, R, EX, RX>(
1086
register: Effect.Effect<A, E, R>,
@@ -1147,13 +1159,34 @@ export const layerDeviceToolkit = Layer.mergeAll(
1159
layerDeviceScreenshotRegistration,
1160
);
1161
1150
-export const layerMcpTransport = McpServer.layerHttp({
1151
- name: "T3 Code",
1152
- version: packageJson.version,
1153
- path: "/mcp",
1154
- protocols: [McpProtocol.v2025_06_18],
1155
- allowSessionTermination: true,
1156
-}).pipe(Layer.provide(layerMcpAuthMiddleware));
1162
+/**
1163
+ * `McpServer` for in-process calls, which provide `McpInvocationContext`
1164
+ * around `callTool` as the auth middleware does for each /mcp request.
1165
+ */
1166
+export const layerInProcessMcpServer = McpServer.middleware<{
1167
+ provides: McpInvocationContext.McpInvocationContext;
1168
+}>()(
1169
+ (effect) =>
1170
+ Effect.flatMap(
1171
+ Effect.serviceOption(McpInvocationContext.McpInvocationContext),
1172
+ Option.match({
1173
+ onNone: () => Effect.die("Provide McpInvocationContext around the in-process MCP call."),
1174
+ onSome: (scope) =>
1175
+ Effect.provideService(effect, McpInvocationContext.McpInvocationContext, scope),
1176
+ }),
1177
+ ),
1178
+ { global: true },
1179
+).pipe(Layer.provideMerge(McpServer.McpServer.layer));
1180
+
1181
+export const layerMcpTransport = <RA, RE, RR>(registrations: Layer.Layer<RA, RE, RR>) =>
1182
+ McpServer.layerHttp({
1183
+ name: "T3 Code",
1184
+ version: packageJson.version,
1185
+ path: "/mcp",
1186
+ protocols: [McpProtocol.v2025_06_18],
1187
+ allowSessionTermination: true,
1188
+ registrations,
1189
+ }).pipe(Layer.provide(layerMcpAuthMiddleware));
1190
1191
/** Every tool the T3 MCP server advertises. AgentContextBudget.test.ts measures this set. */
1192
export const layerTools = Layer.mergeAll(
@@ -1170,4 +1203,4 @@ export const layerTools = Layer.mergeAll(
1203
layerHtmlToolkit,
1204
);
1205
1173
-export const layer = layerTools.pipe(Layer.provideMerge(layerMcpTransport));
1206
+export const layer = layerMcpTransport(layerTools);
apps/server/src/mcp/McpSessionRegistry.test.ts
+3
-1
@@ -1,4 +1,6 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { expect, it } from "@effect/vitest";
5
import { EnvironmentId, ProviderInstanceId, ThreadId } from "@t3tools/contracts";
6
import * as Effect from "effect/Effect";
@@ -29,7 +31,7 @@ const makeRegistry = (now: () => number, httpServer = fakeHttpServer) =>
31
.pipe(
32
Effect.provideService(HttpServer.HttpServer, httpServer),
33
Effect.provideService(ServerEnvironment.ServerEnvironment, fakeEnvironment),
32
- Effect.provide(NodeServices.layer),
34
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
35
);
36
37
it.effect("stores only a token hash, resolves the bearer token, and revokes by thread", () =>
apps/server/src/mcp/McpSessionRegistry.ts
+8
-6
@@ -1,7 +1,8 @@
1
import { ProviderInstanceId, ThreadId } from "@t3tools/contracts";
2
import * as Clock from "effect/Clock";
3
import * as Context from "effect/Context";
4
-import * as Crypto from "effect/Crypto";
4
+import * as Digest from "effect/crypto/Digest";
5
+import * as SecureRandom from "effect/crypto/SecureRandom";
6
import * as Effect from "effect/Effect";
7
import * as Layer from "effect/Layer";
8
import * as SynchronizedRef from "effect/SynchronizedRef";
@@ -76,7 +77,8 @@ const getHttpMcpEndpointHost = (address: NetAddress.IpAddress): string =>
77
const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (
78
options: McpSessionRegistryOptions = {},
79
) {
79
- const crypto = yield* Crypto.Crypto;
80
+ const random = yield* SecureRandom.SecureRandom;
81
+ const digest = yield* Digest.Digest;
82
const environment = yield* ServerEnvironment.ServerEnvironment;
83
const environmentId = yield* environment.getEnvironmentId;
84
const httpServer = yield* HttpServer.HttpServer;
@@ -88,15 +90,15 @@ const makeWithOptions = Effect.fn("McpSessionRegistry.make")(function* (
90
: "http://127.0.0.1/mcp";
91
92
const hashToken = (token: string) =>
91
- crypto
92
- .digest("SHA-256", new TextEncoder().encode(token))
93
+ digest
94
+ .digest(Digest.sha256, new TextEncoder().encode(token))
95
.pipe(Effect.map(bytesToHex), Effect.orDie);
96
97
const issue: McpSessionRegistryShape["issue"] = Effect.fn("McpSessionRegistry.issue")(
98
function* (request) {
99
const issuedAt = yield* currentTimeMillis;
98
- const providerSessionId = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
99
- const rawToken = yield* crypto.randomBytes(32).pipe(Effect.map(tokenFromBytes), Effect.orDie);
100
+ const providerSessionId = yield* random.uuidV4();
101
+ const rawToken = yield* random.randomBytes(32).pipe(Effect.map(tokenFromBytes), Effect.orDie);
102
const tokenHash = yield* hashToken(rawToken);
103
const browserToolsAvailable = request.browserToolsAvailable ?? true;
104
const scope: McpInvocationContext.McpThreadInvocationScope = {
apps/server/src/mcp/McpToolAccess.race.test.ts
+1
-1
@@ -141,7 +141,7 @@ const renameRacingTheUser = (threadId: ThreadId, userRaises: boolean) =>
141
Effect.provideService(McpSchema.McpServerClient, mcpClient),
142
Effect.provide(
143
McpHttpServer.toolkitRegistration(RenameToolkit, handlers).pipe(
144
- Layer.provideMerge(McpServer.McpServer.layer),
144
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
145
),
146
),
147
);
apps/server/src/mcp/McpToolAccess.test.ts
+2
-2
@@ -192,7 +192,7 @@ export const refusedAtCompileTime = () => {
192
193
const probeServer = (threads: Layer.Layer<ThreadManagement.ThreadManagementService>) =>
194
McpHttpServer.toolkitRegistration(ProbeToolkit, layerProbeHandlers).pipe(
195
- Layer.provideMerge(McpServer.McpServer.layer),
195
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
196
Layer.provideMerge(threads),
197
);
198
@@ -392,7 +392,7 @@ const linkedProbeServer = McpHttpServer.toolkitRegistration(
392
writes_environment: McpToolAccess.writesEnvironment(ranHere),
393
}),
394
).pipe(
395
- Layer.provideMerge(McpServer.McpServer.layer),
395
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
396
Layer.provideMerge(
397
Layer.mock(ThreadManagement.ThreadManagementService)({
398
getThreadShell: (threadId) => Effect.succeed(shells.get(threadId) ?? null),
apps/server/src/mcp/OrchestratorMcpService.test.ts
+29
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import {
@@ -128,6 +129,7 @@ describe("OrchestratorMcpService", () => {
129
let hasNestedWork = true;
130
const layerDependencies = Layer.mergeAll(
131
NodeServices.layer,
132
+ NodeCrypto.layer,
133
Layer.mock(ThreadManagementService.ThreadManagementService)({
134
getThreadRecords: (threadId) =>
135
Effect.succeed(
@@ -256,6 +258,7 @@ describe("OrchestratorMcpService", () => {
258
} as unknown as OrchestrationV2ThreadProjection;
259
const layerDependencies = Layer.mergeAll(
260
NodeServices.layer,
261
+ NodeCrypto.layer,
262
Layer.mock(ThreadManagementService.ThreadManagementService)({
263
getThreadRecords: (threadId) =>
264
Effect.succeed(threadId === parentThreadId ? parentProjection : childProjection),
@@ -353,6 +356,7 @@ describe("OrchestratorMcpService", () => {
356
}) as unknown as OrchestrationV2ThreadProjection;
357
const layerDependencies = Layer.mergeAll(
358
NodeServices.layer,
359
+ NodeCrypto.layer,
360
Layer.mock(ThreadManagementService.ThreadManagementService)({
361
getThreadRecords: (threadId) =>
362
Effect.succeed(threadId === parentThreadId ? parentProjection() : childProjection()),
@@ -450,6 +454,7 @@ describe("OrchestratorMcpService", () => {
454
} as unknown as OrchestrationV2ThreadProjection;
455
const layerDependencies = Layer.mergeAll(
456
NodeServices.layer,
457
+ NodeCrypto.layer,
458
Layer.mock(ThreadManagementService.ThreadManagementService)({
459
getThreadRecords: (threadId) =>
460
Effect.succeed(threadId === parentThreadId ? parentProjection : childProjection),
@@ -540,6 +545,7 @@ describe("OrchestratorMcpService", () => {
545
} as unknown as OrchestrationV2ThreadProjection;
546
const layerDependencies = Layer.mergeAll(
547
NodeServices.layer,
548
+ NodeCrypto.layer,
549
Layer.mock(ThreadManagementService.ThreadManagementService)({
550
getThreadRecords: (threadId) =>
551
threadId === parentThreadId
@@ -641,6 +647,7 @@ describe("OrchestratorMcpService", () => {
647
} as unknown as OrchestrationV2ThreadProjection;
648
const layerDependencies = Layer.mergeAll(
649
NodeServices.layer,
650
+ NodeCrypto.layer,
651
Layer.mock(ThreadManagementService.ThreadManagementService)({
652
getThreadRecords: (threadId) =>
653
Effect.succeed(threadId === parentThreadId ? parentProjection : childProjection),
@@ -723,6 +730,7 @@ describe("OrchestratorMcpService", () => {
730
} as unknown as OrchestrationV2ThreadProjection;
731
const layerDependencies = Layer.mergeAll(
732
NodeServices.layer,
733
+ NodeCrypto.layer,
734
Layer.mock(ThreadManagementService.ThreadManagementService)({
735
getThreadRecords: (threadId) =>
736
Effect.succeed(threadId === parentThreadId ? parentProjection : childProjection),
@@ -811,6 +819,7 @@ describe("OrchestratorMcpService", () => {
819
} as unknown as OrchestrationV2ThreadProjection;
820
const layerDependencies = Layer.mergeAll(
821
NodeServices.layer,
822
+ NodeCrypto.layer,
823
Layer.mock(ThreadManagementService.ThreadManagementService)({
824
getThreadRecords: (threadId) =>
825
Effect.succeed(threadId === parentThreadId ? parentProjection : childProjection),
@@ -959,6 +968,7 @@ describe("OrchestratorMcpService", () => {
968
]) as unknown as ReadonlyMap<ThreadId, OrchestrationV2ThreadProjection>;
969
const layerDependencies = Layer.mergeAll(
970
NodeServices.layer,
971
+ NodeCrypto.layer,
972
Layer.mock(ThreadManagementService.ThreadManagementService)({
973
getThreadRecords: (threadId, fields, filter) =>
974
((fields as ReadonlyArray<string>).includes("subagents")
@@ -1261,6 +1271,7 @@ describe("OrchestratorMcpService provider resolution", () => {
1271
}) as unknown as OrchestrationV2ThreadProjection;
1272
const dependencies = Layer.mergeAll(
1273
NodeServices.layer,
1274
+ NodeCrypto.layer,
1275
Layer.mock(ThreadManagementService.ThreadManagementService)({
1276
hasReceipt: () => Effect.succeed(false),
1277
assertProviderInstanceEnabled: () => Effect.void,
@@ -1396,6 +1407,7 @@ describe("OrchestratorMcpService provider resolution", () => {
1407
];
1408
const layerDependencies = Layer.mergeAll(
1409
NodeServices.layer,
1410
+ NodeCrypto.layer,
1411
Layer.mock(ThreadManagementService.ThreadManagementService)({
1412
getThreadRecords: () => Effect.succeed(parentProjection([])),
1413
}),
@@ -1572,6 +1584,7 @@ describe("OrchestratorMcpService provider resolution", () => {
1584
Layer.provide(
1585
Layer.mergeAll(
1586
NodeServices.layer,
1587
+ NodeCrypto.layer,
1588
Layer.mock(ThreadManagementService.ThreadManagementService)({
1589
getThreadRecords: () =>
1590
Effect.succeed(
@@ -1702,6 +1715,7 @@ describe("OrchestratorMcpService provider resolution", () => {
1715
});
1716
const layerDependencies = Layer.mergeAll(
1717
NodeServices.layer,
1718
+ NodeCrypto.layer,
1719
Layer.mock(ThreadManagementService.ThreadManagementService)({
1720
hasReceipt: () => Effect.succeed(false),
1721
getThreadRecords: () => Effect.succeed(parentProjection([])),
@@ -1778,6 +1792,7 @@ describe("OrchestratorMcpService provider resolution", () => {
1792
let delegated = false;
1793
const layerDependencies = Layer.mergeAll(
1794
NodeServices.layer,
1795
+ NodeCrypto.layer,
1796
Layer.mock(ThreadManagementService.ThreadManagementService)({
1797
hasReceipt: () => Effect.succeed(false),
1798
getThreadRecords: (threadId) =>
@@ -1885,6 +1900,7 @@ describe("OrchestratorMcpService provider resolution", () => {
1900
};
1901
const layerDependencies = Layer.mergeAll(
1902
NodeServices.layer,
1903
+ NodeCrypto.layer,
1904
Layer.mock(ThreadManagementService.ThreadManagementService)({
1905
getThreadRecords: (threadId) =>
1906
Ref.get(accepted).pipe(
@@ -2028,6 +2044,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2044
Layer.provide(
2045
Layer.mergeAll(
2046
NodeServices.layer,
2047
+ NodeCrypto.layer,
2048
layerRegistry,
2049
layerSettings,
2050
providerRegistryLayer([
@@ -2134,7 +2151,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2151
assert.equal(untouched.messages.length, 0);
2152
assert.equal(untouched.runs.length, 0);
2153
}).pipe(Effect.provide(layerTest));
2137
- }).pipe(Effect.provide(NodeServices.layer)),
2154
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
2155
),
2156
);
2157
@@ -2242,6 +2259,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2259
let delegated = false;
2260
const layerDependencies = Layer.mergeAll(
2261
NodeServices.layer,
2262
+ NodeCrypto.layer,
2263
Layer.mock(ThreadManagementService.ThreadManagementService)({
2264
hasReceipt: () => Effect.succeed(false),
2265
assertProviderInstanceEnabled: () => Effect.void,
@@ -2447,6 +2465,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2465
Layer.provide(
2466
Layer.mergeAll(
2467
NodeServices.layer,
2468
+ NodeCrypto.layer,
2469
Layer.mock(ThreadManagementService.ThreadManagementService)({
2470
getThreadShell: (threadId) =>
2471
Effect.succeed(threadId === boundThreadId ? boundThread : null),
@@ -2516,6 +2535,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2535
Layer.provide(
2536
Layer.mergeAll(
2537
NodeServices.layer,
2538
+ NodeCrypto.layer,
2539
Layer.mock(ThreadManagementService.ThreadManagementService)({
2540
getThreadShell: () => Effect.succeed(null),
2541
getThreadRecords: () => Effect.succeed(idleThreadProjection(shell)),
@@ -2597,6 +2617,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2617
Layer.provide(
2618
Layer.mergeAll(
2619
NodeServices.layer,
2620
+ NodeCrypto.layer,
2621
Layer.mock(ThreadManagementService.ThreadManagementService)({
2622
getThreadShell: (threadId) =>
2623
Ref.getAndUpdate(lookups, (count) => count + 1).pipe(
@@ -2687,6 +2708,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2708
Layer.provide(
2709
Layer.mergeAll(
2710
NodeServices.layer,
2711
+ NodeCrypto.layer,
2712
Layer.mock(ThreadManagementService.ThreadManagementService)({}),
2713
ServerSettings.layerTest(),
2714
Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
@@ -2881,6 +2903,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2903
};
2904
const dependencies = Layer.mergeAll(
2905
NodeServices.layer,
2906
+ NodeCrypto.layer,
2907
Layer.mock(ThreadManagementService.ThreadManagementService)({
2908
getThreadRecords: (threadId) =>
2909
Effect.succeed(
@@ -2979,6 +3002,7 @@ describe("OrchestratorMcpService provider resolution", () => {
3002
};
3003
const dependencies = Layer.mergeAll(
3004
NodeServices.layer,
3005
+ NodeCrypto.layer,
3006
Layer.mock(ThreadManagementService.ThreadManagementService)({
3007
hasReceipt: () => Effect.succeed(false),
3008
assertProviderInstanceEnabled: () => Effect.void,
@@ -3064,6 +3088,7 @@ describe("OrchestratorMcpService provider resolution", () => {
3088
};
3089
const dependencies = Layer.mergeAll(
3090
NodeServices.layer,
3091
+ NodeCrypto.layer,
3092
Layer.mock(ThreadManagementService.ThreadManagementService)({
3093
hasReceipt: () => Effect.succeed(false),
3094
assertProviderInstanceEnabled: () => Effect.void,
@@ -3176,6 +3201,7 @@ describe("OrchestratorMcpService thread lookup", () => {
3201
Layer.provide(
3202
Layer.mergeAll(
3203
NodeServices.layer,
3204
+ NodeCrypto.layer,
3205
Layer.mock(ThreadManagementService.ThreadManagementService)({
3206
getThreadShell: (threadId) =>
3207
Effect.succeed(shells.find((shell) => shell.id === threadId) ?? null),
@@ -3319,6 +3345,7 @@ describe("OrchestratorMcpService thread list", () => {
3345
Layer.provide(
3346
Layer.mergeAll(
3347
NodeServices.layer,
3348
+ NodeCrypto.layer,
3349
Layer.mock(ThreadManagementService.ThreadManagementService)({
3350
listProjectThreads: (input) =>
3351
Effect.succeed(
@@ -3470,6 +3497,7 @@ describe("OrchestratorMcpService thread stop", () => {
3497
Layer.provide(
3498
Layer.mergeAll(
3499
NodeServices.layer,
3500
+ NodeCrypto.layer,
3501
layerAdapters,
3502
ServerSettings.layerTest(),
3503
Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
apps/server/src/mcp/OrchestratorMcpService.ts
+4
-6
@@ -72,7 +72,7 @@ import {
72
} from "../sourceControl/threadPullRequests.ts";
73
import * as Clock from "effect/Clock";
74
import * as Context from "effect/Context";
75
-import * as Crypto from "effect/Crypto";
75
+import * as SecureRandom from "effect/crypto/SecureRandom";
76
import * as DateTime from "effect/DateTime";
77
import * as Duration from "effect/Duration";
78
import * as Effect from "effect/Effect";
@@ -1003,7 +1003,7 @@ function timelineItem(input: {
1003
}
1004
1005
const make = Effect.gen(function* () {
1006
- const crypto = yield* Crypto.Crypto;
1006
+ const random = yield* SecureRandom.SecureRandom;
1007
const threadManagement = yield* ThreadManagementService.ThreadManagementService;
1008
const providerRegistry = yield* ProviderRegistry.ProviderRegistry;
1009
const providerAdapters = yield* ProviderAdapterRegistry.ProviderAdapterRegistryV2;
@@ -1462,9 +1462,7 @@ const make = Effect.gen(function* () {
1462
});
1463
1464
const requestKey = (clientRequestId: string | undefined): Effect.Effect<string> =>
1465
- clientRequestId === undefined
1466
- ? crypto.randomUUIDv4().pipe(Effect.orDie)
1467
- : Effect.succeed(clientRequestId);
1465
+ clientRequestId === undefined ? random.uuidV4() : Effect.succeed(clientRequestId);
1466
1467
const readTask = Effect.fn("OrchestratorMcpService.readTask")(function* (
1468
scope: McpThreadInvocationScope,
@@ -3265,7 +3263,7 @@ const make = Effect.gen(function* () {
3263
export const layer: Layer.Layer<
3264
OrchestratorMcpService,
3265
never,
3268
- | Crypto.Crypto
3266
+ | SecureRandom.SecureRandom
3267
| ThreadManagementService.ThreadManagementService
3268
| ThreadLaunchService.ThreadLaunchService
3269
| GitVcsDriver.GitVcsDriver
apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts
+20
-18
@@ -1,4 +1,5 @@
1
import * as NodeURL from "node:url";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import { describe, expect, it } from "@effect/vitest";
5
import {
@@ -94,22 +95,23 @@ const delegatedTaskStatusTranscriptFile = new URL(
95
import.meta.url,
96
);
97
97
-const readDelegatedTaskStatusTranscript = Effect.fn("readDelegatedTaskStatusTranscript")(function* (
98
- followupResult: string,
99
-) {
100
- const fs = yield* FileSystem.FileSystem;
101
- const text = yield* fs.readFileString(NodeURL.fileURLToPath(delegatedTaskStatusTranscriptFile));
102
- const transcript = yield* decodeProviderReplayNdjson(
103
- text.replaceAll(queuedFollowupResult, followupResult),
104
- );
105
- // The recording ends when the recorder closes the app-server while the parent
106
- // turn is still open. This test keeps acting as that parent afterwards, and
107
- // replaying the exit would kill the shared process and fail the parent run.
108
- return {
109
- ...transcript,
110
- entries: transcript.entries.filter((entry) => entry.type !== "runtime_exit"),
111
- };
112
-}, Effect.provide(NodeServices.layer));
98
+const readDelegatedTaskStatusTranscript = Effect.fn("readDelegatedTaskStatusTranscript")(
99
+ function* (followupResult: string) {
100
+ const fs = yield* FileSystem.FileSystem;
101
+ const text = yield* fs.readFileString(NodeURL.fileURLToPath(delegatedTaskStatusTranscriptFile));
102
+ const transcript = yield* decodeProviderReplayNdjson(
103
+ text.replaceAll(queuedFollowupResult, followupResult),
104
+ );
105
+ // The recording ends when the recorder closes the app-server while the parent
106
+ // turn is still open. This test keeps acting as that parent afterwards, and
107
+ // replaying the exit would kill the shared process and fail the parent run.
108
+ return {
109
+ ...transcript,
110
+ entries: transcript.entries.filter((entry) => entry.type !== "runtime_exit"),
111
+ };
112
+ },
113
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
114
+);
115
116
function makeProviderSnapshot(input: {
117
readonly instanceId: ProviderInstanceId;
@@ -231,7 +233,7 @@ describe("orchestrator MCP toolkit", () => {
233
}),
234
]);
235
const layerTest = layerOrchestratorToolkit.pipe(
234
- Layer.provideMerge(McpServer.McpServer.layer),
236
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
237
Layer.provideMerge(layerOrchestration),
238
Layer.provide(
239
CodexOrchestratorReplayHarness.makeProviderAdapterRegistryLayer(transcript).pipe(
@@ -252,7 +254,7 @@ describe("orchestrator MCP toolkit", () => {
254
),
255
),
256
Layer.provide(Layer.mock(RemoteDelegation.RemoteDelegation)({})),
255
- Layer.provide(NodeServices.layer),
257
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
258
);
259
260
yield* Effect.gen(function* () {
apps/server/src/mcp/PreviewAutomationBroker.test.ts
+5
-1
@@ -1,4 +1,6 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { expect, it } from "@effect/vitest";
5
import {
6
EnvironmentId,
@@ -22,7 +24,9 @@ import * as Stream from "effect/Stream";
24
import { PreviewBrowserRootError } from "../preview/PreviewBrowserHost.ts";
25
import * as PreviewAutomationBroker from "./PreviewAutomationBroker.ts";
26
25
-const makeBroker = PreviewAutomationBroker.make.pipe(Effect.provide(NodeServices.layer));
27
+const makeBroker = PreviewAutomationBroker.make.pipe(
28
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
29
+);
30
31
const scope = {
32
environmentId: EnvironmentId.make("environment-1"),
apps/server/src/mcp/PreviewAutomationBroker.ts
+3
-3
@@ -29,7 +29,7 @@ import {
29
} from "@t3tools/contracts";
30
import * as Context from "effect/Context";
31
import type * as Cause from "effect/Cause";
32
-import * as Crypto from "effect/Crypto";
32
+import * as SecureRandom from "effect/crypto/SecureRandom";
33
import * as Deferred from "effect/Deferred";
34
import * as Effect from "effect/Effect";
35
import * as Layer from "effect/Layer";
@@ -347,7 +347,7 @@ const classifyResponseError = (
347
};
348
349
export const make = Effect.gen(function* PreviewAutomationBrokerMake() {
350
- const crypto = yield* Crypto.Crypto;
350
+ const random = yield* SecureRandom.SecureRandom;
351
const state = yield* SynchronizedRef.make<BrokerState>({
352
clients: new Map(),
353
assignments: new Map(),
@@ -399,7 +399,7 @@ export const make = Effect.gen(function* PreviewAutomationBrokerMake() {
399
) {
400
const clientId = host.clientId;
401
const queue = yield* Queue.unbounded<PreviewAutomationStreamEvent, Cause.Done>();
402
- const connectionId = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
402
+ const connectionId = yield* random.uuidV4();
403
yield* Queue.offer(queue, { type: "connected", connectionId });
404
const connection: ClientConnection = {
405
clientId,
apps/server/src/mcp/TaskCancelNativeSubagent.integration.test.ts
+2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import {
@@ -160,6 +161,7 @@ it.effect("task_cancel ends a delegated child's background native subagent", ()
161
ServerSettings.layerTest(),
162
Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
163
NodeServices.layer,
164
+ NodeCrypto.layer,
165
),
166
),
167
);
apps/server/src/mcp/TaskCancelUsageLimit.integration.test.ts
+2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import {
@@ -189,6 +190,7 @@ it.effect.each([
190
ServerSettings.layerTest(),
191
Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
192
NodeServices.layer,
193
+ NodeCrypto.layer,
194
),
195
),
196
);
apps/server/src/mcp/ThreadMetadataMcpService.ts
+4
-6
@@ -9,7 +9,7 @@ import {
9
ThreadId,
10
} from "@t3tools/contracts";
11
import * as Context from "effect/Context";
12
-import * as Crypto from "effect/Crypto";
12
+import * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as DateTime from "effect/DateTime";
14
import * as Effect from "effect/Effect";
15
import * as Layer from "effect/Layer";
@@ -110,7 +110,7 @@ function resultFromThread(input: {
110
}
111
112
const make = Effect.gen(function* () {
113
- const crypto = yield* Crypto.Crypto;
113
+ const random = yield* SecureRandom.SecureRandom;
114
const threadManagement = yield* ThreadManagementService.ThreadManagementService;
115
116
const update = Effect.fn("ThreadMetadataMcpService.update")(function* (
@@ -145,9 +145,7 @@ const make = Effect.gen(function* () {
145
return yield* threadNotFound(threadManagement, threadId, `Thread ${threadId} was not found.`);
146
}
147
const requestKey =
148
- input.clientRequestId === undefined
149
- ? yield* crypto.randomUUIDv4().pipe(Effect.orDie)
150
- : input.clientRequestId;
148
+ input.clientRequestId === undefined ? yield* random.uuidV4() : input.clientRequestId;
149
const updateCommandId = commandId({
150
scope,
151
threadId,
@@ -200,5 +198,5 @@ const make = Effect.gen(function* () {
198
export const layer: Layer.Layer<
199
ThreadMetadataMcpService,
200
never,
203
- Crypto.Crypto | ThreadManagementService.ThreadManagementService
201
+ SecureRandom.SecureRandom | ThreadManagementService.ThreadManagementService
202
> = Layer.effect(ThreadMetadataMcpService, make);
apps/server/src/mcp/WorktreeMcpService.test.ts
+3
-1
@@ -1,4 +1,5 @@
1
import { describe, expect, it, vi } from "@effect/vitest";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import {
5
CommandId,
@@ -319,6 +320,7 @@ const makeHarness = (options: HarnessOptions = {}) => {
320
refreshStatus,
321
} satisfies Partial<VcsStatusBroadcaster.VcsStatusBroadcaster["Service"]>),
322
NodeServices.layer,
323
+ NodeCrypto.layer,
324
),
325
),
326
);
@@ -445,7 +447,7 @@ describe("t3_worktree_handoff", () => {
447
Effect.provide(
448
GitVcsDriver.layer.pipe(
449
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "handoff-remote-git-" })),
448
- Layer.provideMerge(NodeServices.layer),
450
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
451
),
452
),
453
),
apps/server/src/mcp/WorktreeMcpService.ts
+4
-4
@@ -11,7 +11,7 @@ import {
11
} from "@t3tools/contracts";
12
import * as Cause from "effect/Cause";
13
import * as Context from "effect/Context";
14
-import * as Crypto from "effect/Crypto";
14
+import * as SecureRandom from "effect/crypto/SecureRandom";
15
import * as Effect from "effect/Effect";
16
import * as Layer from "effect/Layer";
17
import * as Option from "effect/Option";
@@ -55,7 +55,7 @@ const asOperationFailed = (prefix: string) =>
55
);
56
57
const make = Effect.gen(function* () {
58
- const crypto = yield* Crypto.Crypto;
58
+ const random = yield* SecureRandom.SecureRandom;
59
const threadManagement = yield* ThreadManagementService.ThreadManagementService;
60
const projects = yield* ProjectService.ProjectService;
61
const serverSettings = yield* ServerSettings.ServerSettingsService;
@@ -122,7 +122,7 @@ const make = Effect.gen(function* () {
122
);
123
124
const handoffIds = (scope: McpThreadInvocationScope) =>
125
- crypto.randomUUIDv4().pipe(
125
+ random.uuidV4().pipe(
126
Effect.map((uuid) => {
127
const part = (kind: string, operation: string) =>
128
[kind, "mcp", encodeURIComponent(scope.thread.providerSessionId), operation, uuid].join(
@@ -434,7 +434,7 @@ const make = Effect.gen(function* () {
434
export const layer: Layer.Layer<
435
WorktreeMcpService,
436
never,
437
- | Crypto.Crypto
437
+ | SecureRandom.SecureRandom
438
| ThreadManagementService.ThreadManagementService
439
| ProjectService.ProjectService
440
| ServerSettings.ServerSettingsService
apps/server/src/mcp/linkOrigin.test.ts
+1
-1
@@ -119,7 +119,7 @@ const layerTools = Layer.mergeAll(
119
McpHttpServer.layerProjectRegistration,
120
).pipe(
121
Layer.provide(DocumentText.layer.pipe(Layer.provideMerge(NodeServices.layer))),
122
- Layer.provideMerge(McpServer.McpServer.layer),
122
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
123
Layer.provide(layerLaunches),
124
Layer.provide(NodeCrypto.layer),
125
Layer.provide(
apps/server/src/mcp/threadAccess.ts
+3
-3
@@ -9,7 +9,7 @@ import {
9
ThreadId,
10
type OrchestrationV2ThreadShell,
11
} from "@t3tools/contracts";
12
-import * as Crypto from "effect/Crypto";
12
+import * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as Effect from "effect/Effect";
14
15
import type { OrchestratorV2Error } from "../orchestration-v2/Orchestrator.ts";
@@ -206,6 +206,6 @@ export const readThread = Effect.fn("mcp.readThread")(function* <
206
});
207
208
export const newCommandId = Effect.fn("mcp.newCommandId")(function* () {
209
- const crypto = yield* Crypto.Crypto;
210
- return CommandId.make(`mcp:${yield* crypto.randomUUIDv4().pipe(Effect.orDie)}`);
209
+ const random = yield* SecureRandom.SecureRandom;
210
+ return CommandId.make(`mcp:${yield* random.uuidV4()}`);
211
});
apps/server/src/mcp/toolkits/attachment/tools.ts
+2
-2
@@ -9,7 +9,7 @@ import {
9
OrchestrationV2RunStatus,
10
OrchestratorMcpFailure,
11
} from "@t3tools/contracts";
12
-import * as Crypto from "effect/Crypto";
12
+import * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as FileSystem from "effect/FileSystem";
14
import * as Schema from "effect/Schema";
15
import { Tool, Toolkit } from "effect/ai";
@@ -28,7 +28,7 @@ const shared = {
28
ServerConfig.ServerConfig,
29
ServerSecretStore.ServerSecretStore,
30
FileSystem.FileSystem,
31
- Crypto.Crypto,
31
+ SecureRandom.SecureRandom,
32
],
33
};
34
const AttachmentUploadTool = Tool.make("t3_attachment_prepare_upload", {
apps/server/src/mcp/toolkits/core.test.ts
+26
-17
@@ -128,7 +128,7 @@ it.effect("checks capability through the production registration", () =>
128
}).pipe(
129
Effect.provide(
130
layerThreadToolkit.pipe(
131
- Layer.provideMerge(McpServer.McpServer.layer),
131
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
132
Layer.provide(NodeCrypto.layer),
133
Layer.provide(McpToolAccessTestkit.liveThreadsLayer),
134
),
@@ -163,7 +163,7 @@ it.effect("an answered question reports already answered instead of not found",
163
}).pipe(
164
Effect.provide(
165
layerThreadToolkit.pipe(
166
- Layer.provideMerge(McpServer.McpServer.layer),
166
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
167
Layer.provide(NodeCrypto.layer),
168
Layer.provide(
169
Layer.mock(ThreadManagement.ThreadManagementService)({
@@ -274,11 +274,15 @@ it.effect("returns an HTML render reference that Codex and Claude tool rows both
274
}).pipe(
275
Effect.provide(
276
McpHttpServer.layerHtmlToolkit.pipe(
277
- Layer.provideMerge(McpServer.McpServer.layer),
277
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
278
Layer.provide(McpProviderSessions.layer),
279
Layer.provide(PreviewBrowser.layer),
280
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-mcp-html-render-" })),
281
- Layer.provide(DocumentText.layer.pipe(Layer.provideMerge(NodeServices.layer))),
281
+ Layer.provide(
282
+ DocumentText.layer.pipe(
283
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
284
+ ),
285
+ ),
286
Layer.provide(FetchHttpClient.layer),
287
Layer.provide(
288
Layer.mock(ThreadManagement.ThreadManagementService)({
@@ -322,7 +326,7 @@ it.effect("records only failed calls of tools that hand off no work", () => {
326
}).pipe(
327
Effect.provide(
328
layerThreadToolkit.pipe(
325
- Layer.provideMerge(McpServer.McpServer.layer),
329
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
330
Layer.provide(NodeCrypto.layer),
331
Layer.provide(
332
Layer.mock(ThreadManagement.ThreadManagementService)({
@@ -374,7 +378,7 @@ it.effect("rejects an unknown organize target instead of archiving the calling t
378
}).pipe(
379
Effect.provide(
380
layerThreadToolkit.pipe(
377
- Layer.provideMerge(McpServer.McpServer.layer),
381
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
382
Layer.provide(NodeCrypto.layer),
383
Layer.provide(
384
Layer.mock(ThreadManagement.ThreadManagementService)({
@@ -411,7 +415,7 @@ it.effect("keeps unexpected handler defects private through the production regis
415
}).pipe(
416
Effect.provide(
417
layerThreadToolkit.pipe(
414
- Layer.provideMerge(McpServer.McpServer.layer),
418
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
419
Layer.provide(NodeCrypto.layer),
420
Layer.provide(
421
Layer.mock(ThreadManagement.ThreadManagementService)({
@@ -529,7 +533,7 @@ it.effect("a client caller targets any thread within its ceiling and cannot act
533
}).pipe(
534
Effect.provide(
535
layerThreadToolkit.pipe(
532
- Layer.provideMerge(McpServer.McpServer.layer),
536
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
537
Layer.provide(NodeCrypto.layer),
538
Layer.provide(
539
Layer.mock(ThreadManagement.ThreadManagementService)({
@@ -589,7 +593,7 @@ it.effect("a read-only client reads threads and is refused every write before it
593
}).pipe(
594
Effect.provide(
595
layerThreadToolkit.pipe(
592
- Layer.provideMerge(McpServer.McpServer.layer),
596
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
597
Layer.provide(NodeCrypto.layer),
598
Layer.provide(
599
Layer.mock(ThreadManagement.ThreadManagementService)({
@@ -642,7 +646,7 @@ it.effect("refuses act-as-caller tools to a client caller", () =>
646
}).pipe(
647
Effect.provide(
648
layerOrchestratorToolkit.pipe(
645
- Layer.provideMerge(McpServer.McpServer.layer),
649
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
650
Layer.provide(NodeCrypto.layer),
651
Layer.provide(Layer.mock(ThreadManagement.ThreadManagementService)({})),
652
Layer.provide(ServerSettings.layerTest()),
@@ -687,7 +691,7 @@ it.effect("a caller cannot rewrite a scheduled task that runs above its own mode
691
}).pipe(
692
Effect.provide(
693
layerOrchestratorToolkit.pipe(
690
- Layer.provideMerge(McpServer.McpServer.layer),
694
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
695
Layer.provide(NodeCrypto.layer),
696
Layer.provide(Layer.mock(ThreadManagement.ThreadManagementService)({})),
697
Layer.provide(ServerSettings.layerTest()),
@@ -761,7 +765,7 @@ it.effect.each([
765
}).pipe(
766
Effect.provide(
767
McpHttpServer.layerThreadToolkit.pipe(
764
- Layer.provideMerge(McpServer.McpServer.layer),
768
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
769
Layer.provide(NodeCrypto.layer),
770
Layer.provide(Layer.mock(ThreadManagement.ThreadManagementService)({})),
771
Layer.provide(Layer.mock(ThreadSearch.ThreadSearch)({})),
@@ -826,7 +830,7 @@ it.effect.each(["t3_thread_interrupt", "t3_workflow_stop"])(
830
}).pipe(
831
Effect.provide(
832
layerOrchestratorToolkit.pipe(
829
- Layer.provideMerge(McpServer.McpServer.layer),
833
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
834
Layer.provide(NodeCrypto.layer),
835
Layer.provide(
836
Layer.mock(ThreadManagement.ThreadManagementService)({
@@ -934,7 +938,7 @@ it.effect("discovers workflow stop targets and requires orchestration capability
938
}).pipe(
939
Effect.provide(
940
layerOrchestratorToolkit.pipe(
937
- Layer.provideMerge(McpServer.McpServer.layer),
941
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
942
Layer.provide(NodeCrypto.layer),
943
Layer.provide(
944
Layer.mock(ThreadManagement.ThreadManagementService)({
@@ -1008,11 +1012,16 @@ it.effect("only the caller that prepared a pending upload can discard it", () =>
1012
}).pipe(
1013
Effect.provide(
1014
McpHttpServer.layerAttachmentToolkit.pipe(
1011
- Layer.provideMerge(McpServer.McpServer.layer),
1015
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
1016
Layer.provide(McpToolAccessTestkit.liveThreadsLayer),
1017
Layer.provide(ServerSecretStore.layer),
1018
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-mcp-attachment-" })),
1015
- Layer.provide(DocumentText.layer.pipe(Layer.provideMerge(NodeServices.layer))),
1019
+ Layer.provide(
1020
+ DocumentText.layer.pipe(
1021
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1022
+ ),
1023
+ ),
1024
+ Layer.provide(NodeCrypto.layer),
1025
),
1026
),
1027
),
@@ -1048,7 +1057,7 @@ it.effect(
1057
}).pipe(
1058
Effect.provide(
1059
layerOrchestratorToolkit.pipe(
1051
- Layer.provideMerge(McpServer.McpServer.layer),
1060
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
1061
Layer.provide(NodeCrypto.layer),
1062
Layer.provide(
1063
Layer.mock(ThreadManagement.ThreadManagementService)({
apps/server/src/mcp/toolkits/preview/handlers.test.ts
+4
-3
@@ -1,4 +1,5 @@
1
import { describe, expect, it } from "@effect/vitest";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import {
5
EnvironmentId,
@@ -96,7 +97,7 @@ it.effect("preview_open navigates the opened tab to a dev server in one tool cal
97
}),
98
Effect.provide(
99
Layer.mergeAll(PreviewAutomationBroker.layer, liveThreadsLayer).pipe(
99
- Layer.provide(NodeServices.layer),
100
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
101
),
102
),
103
),
@@ -140,7 +141,7 @@ describe("claimPreviewRecording", () => {
141
}).pipe(
142
Effect.provide(
143
ServerConfig.layerTest(process.cwd(), { prefix: "t3-preview-recording-" }).pipe(
143
- Layer.provideMerge(NodeServices.layer),
144
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
145
),
146
),
147
),
@@ -185,7 +186,7 @@ describe("claimPreviewRecording", () => {
186
}).pipe(
187
Effect.provide(
188
ServerConfig.layerTest(process.cwd(), { prefix: "t3-preview-recording-" }).pipe(
188
- Layer.provideMerge(NodeServices.layer),
189
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
190
),
191
),
192
),
apps/server/src/mcp/toolkits/previewControls/handlers.test.ts
+3
-1
@@ -63,7 +63,9 @@ it.effect.each([
63
);
64
const tab = yield* manager.open({ threadId, url: "http://localhost:3000" });
65
const layerDependencies = Layer.mergeAll(
66
- PreviewAutomationBroker.layer.pipe(Layer.provide(NodeServices.layer)),
66
+ PreviewAutomationBroker.layer.pipe(
67
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
68
+ ),
69
Layer.succeed(Preview.PreviewManager, manager),
70
Layer.succeed(McpInvocationContext.McpInvocationContext, scope),
71
McpToolAccessTestkit.liveThreadsLayer,
apps/server/src/mcp/toolkits/project/handlers.test.ts
+1
-2
@@ -81,7 +81,6 @@ const clientLaunchHarness = (input: {
81
},
82
}),
83
}),
84
- NodeCrypto.layer,
84
Layer.succeed(McpInvocationContext.McpInvocationContext, {
85
environmentId: EnvironmentId.make("environment"),
86
requestNamespace: "client:session-1",
@@ -170,7 +169,7 @@ const clientLaunchHarness = (input: {
169
Layer.provide(NodeServices.layer),
170
),
171
),
173
- Layer.provideMerge(NodeServices.layer),
172
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
173
);
174
return { projectId, modelSelection, projectDefaults, dependencies: layerDependencies };
175
};
apps/server/src/mcp/toolkits/project/handlers.ts
+3
-3
@@ -5,7 +5,7 @@ import {
5
OrchestratorMcpFailure,
6
ProjectId,
7
} from "@t3tools/contracts";
8
-import * as Crypto from "effect/Crypto";
8
+import * as Digest from "effect/crypto/Digest";
9
import * as Effect from "effect/Effect";
10
import * as Hex from "effect/encoding/Hex";
11
import * as FileSystem from "effect/FileSystem";
@@ -70,10 +70,10 @@ const launchCommandId = Effect.fn("mcp.launchCommandId")(function* (
70
namespace: string,
71
key: string,
72
) {
73
- const crypto = yield* Crypto.Crypto;
73
+ const crypto = yield* Digest.Digest;
74
// @effect-diagnostics-next-line preferSchemaOverJson:off - a JSON pair keeps the caller apart from the key.
75
const bytes = new TextEncoder().encode(JSON.stringify([namespace, key]));
76
- const digest = yield* crypto.digest("SHA-256", bytes).pipe(Effect.mapError(unavailable));
76
+ const digest = yield* crypto.digest(Digest.sha256, bytes).pipe(Effect.mapError(unavailable));
77
return CommandId.make(`mcp:launch:${Hex.encode(digest)}`);
78
});
79
apps/server/src/mcp/toolkits/project/tools.ts
+4
-2
@@ -26,7 +26,8 @@ import * as ServerConfig from "../../../config.ts";
26
import * as ProviderRegistry from "../../../provider/ProviderRegistry.ts";
27
import * as ServerSettings from "../../../serverSettings.ts";
28
import * as ThreadLaunchService from "../../../orchestration-v2/ThreadLaunchService.ts";
29
-import * as Crypto from "effect/Crypto";
29
+import * as Digest from "effect/crypto/Digest";
30
+import * as SecureRandom from "effect/crypto/SecureRandom";
31
import * as Schema from "effect/Schema";
32
import { Tool, Toolkit } from "effect/ai";
33
import * as ProjectService from "../../../project/ProjectService.ts";
@@ -45,7 +46,7 @@ const shared = {
46
McpInvocationContext.McpInvocationContext,
47
ThreadManagementService.ThreadManagementService,
48
ProjectService.ProjectService,
48
- Crypto.Crypto,
49
+ SecureRandom.SecureRandom,
50
],
51
};
52
const ProjectListTool = Tool.make("t3_project_list", {
@@ -171,6 +172,7 @@ const ThreadLaunchTool = Tool.make("t3_thread_launch", {
172
ServerSettings.ServerSettingsService,
173
ProviderRegistry.ProviderRegistry,
174
DocumentText.DocumentText,
175
+ Digest.Digest,
176
],
177
})
178
.annotate(Tool.Destructive, true)
apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts
+3
-6
@@ -12,7 +12,7 @@ import {
12
SourceControlProviderKind,
13
} from "@t3tools/contracts";
14
import { describe, expect, it } from "@effect/vitest";
15
-import * as Crypto from "effect/Crypto";
15
+import * as SecureRandom from "effect/crypto/SecureRandom";
16
import * as Effect from "effect/Effect";
17
import * as Layer from "effect/Layer";
18
import * as Option from "effect/Option";
@@ -37,10 +37,7 @@ import { CHILD_PULL_REQUEST_REPORT_NEXT, PullRequestsToolkit } from "./tools.ts"
37
const PROJECT_ID = ProjectId.make("project-1");
38
const THREAD_ID = ThreadId.make("thread-1");
39
40
-const testCrypto = Crypto.make({
41
- randomBytes: (size) => new Uint8Array(size).fill(7),
42
- digest: (_algorithm, data) => Effect.succeed(data),
43
-});
40
+const testCrypto = SecureRandom.make((size) => new Uint8Array(size).fill(7));
41
42
const invocation = (
43
capabilities: ReadonlyArray<McpInvocationContext.McpCapability>,
@@ -197,7 +194,7 @@ const makeHarness = Effect.fn("makePullRequestsToolkitHarness")(function* (
194
Effect.succeed(id === THREAD_ID && thread ? v2PullRequestThread(thread) : null),
195
dispatch,
196
}),
200
- Layer.succeed(Crypto.Crypto, testCrypto),
197
+ Layer.succeed(SecureRandom.SecureRandom, testCrypto),
198
McpToolAccessTestkit.liveThreadsLayer,
199
);
200
const toolkit = yield* PullRequestsToolkit.pipe(
apps/server/src/mcp/toolkits/pullRequests/handlers.ts
+3
-3
@@ -8,7 +8,7 @@ import {
8
} from "@t3tools/contracts";
9
import { canonicalizeGitCafePullRequestUrl } from "@t3tools/source-control-definitions/registry";
10
import * as Cause from "effect/Cause";
11
-import * as Crypto from "effect/Crypto";
11
+import * as SecureRandom from "effect/crypto/SecureRandom";
12
import * as Effect from "effect/Effect";
13
import * as Option from "effect/Option";
14
@@ -200,10 +200,10 @@ const make = Effect.gen(function* () {
200
const reviewGuides = yield* PullRequestReviewGuideService.PullRequestReviewGuideService;
201
202
const projects = yield* ProjectService.ProjectService;
203
- const crypto = yield* Crypto.Crypto;
203
+ const random = yield* SecureRandom.SecureRandom;
204
205
const commandId = (tag: string, threadId: ThreadId) =>
206
- crypto.randomUUIDv4().pipe(
206
+ random.uuidV4().pipe(
207
Effect.orDie,
208
Effect.map((uuid) => CommandId.make(`server:${tag}:${threadId}:${uuid}`)),
209
);
apps/server/src/mcp/toolkits/thread/tools.ts
+3
-3
@@ -20,7 +20,7 @@ import {
20
NonNegativeInt,
21
ProjectId,
22
} from "@t3tools/contracts";
23
-import * as Crypto from "effect/Crypto";
23
+import * as SecureRandom from "effect/crypto/SecureRandom";
24
import * as Schema from "effect/Schema";
25
import { Tool, Toolkit } from "effect/ai";
26
@@ -57,7 +57,7 @@ const ThreadOrganizeTool = Tool.make("t3_thread_organize", {
57
dependencies: [
58
McpInvocationContext.McpInvocationContext,
59
ThreadManagementService.ThreadManagementService,
60
- Crypto.Crypto,
60
+ SecureRandom.SecureRandom,
61
],
62
})
63
.annotate(Tool.Title, "Organize a thread")
@@ -71,7 +71,7 @@ const commandTool = {
71
dependencies: [
72
McpInvocationContext.McpInvocationContext,
73
ThreadManagementService.ThreadManagementService,
74
- Crypto.Crypto,
74
+ SecureRandom.SecureRandom,
75
],
76
};
77
const queueEntry = Schema.Struct({
apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
+6
-2
@@ -13,6 +13,7 @@ import { decodeAcpReplayTranscript, makeAcpReplayRuntime } from "./AcpAdapterV2.
13
import * as NodeFS from "node:fs";
14
import * as NodePath from "node:path";
15
16
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
17
import * as NodeServices from "@effect/platform-node/NodeServices";
18
import * as DocumentText from "../../provider/DocumentText.ts";
19
import { assert, describe, it } from "@effect/vitest";
@@ -101,11 +102,14 @@ import {
102
const DEFAULT_GROK_SETTINGS = Schema.decodeSync(GrokSettings)({});
103
const DROID_SETTINGS = Schema.decodeSync(AcpRegistrySettings)({ agentId: "factory-droid" });
104
104
-const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
105
+const layerHost = TestProviderHost.layer().pipe(
106
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
107
+);
108
109
const layerTest = Layer.mergeAll(
107
- DocumentText.layer.pipe(Layer.provide(NodeServices.layer)),
110
+ DocumentText.layer.pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
111
NodeServices.layer,
112
+ NodeCrypto.layer,
113
IdAllocator.layer,
114
McpProviderSessions.layer,
115
layerHost,
apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.testkit.ts
+2
-2
@@ -15,7 +15,7 @@ import {
15
import type * as DateTime from "effect/DateTime";
16
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
17
import * as Effect from "effect/Effect";
18
-import * as Crypto from "effect/Crypto";
18
+import * as SecureRandom from "effect/crypto/SecureRandom";
19
import * as FileSystem from "effect/FileSystem";
20
import * as Layer from "effect/Layer";
21
import * as Schema from "effect/Schema";
@@ -202,7 +202,7 @@ export function makeAcpReplayRuntime(input: {
202
) => Effect.Effect<
203
AcpSessionRuntime.AcpSessionRuntime["Service"],
204
EffectAcpErrors.AcpError,
205
- Crypto.Crypto | Scope.Scope
205
+ SecureRandom.SecureRandom | Scope.Scope
206
> {
207
// Transcripts exceed the kernel's 128 KiB per-environment-variable limit.
208
const transcriptPath = `${input.statusPath}.transcript.json`;
apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts
+5
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import {
@@ -65,7 +66,9 @@ const decodeAcpRegistryAdapterSettings = Schema.decodeUnknownEffect(
66
AcpRegistryAdapterV2Driver.configSchema,
67
);
68
68
-const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
69
+const layerHost = TestProviderHost.layer().pipe(
70
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
71
+);
72
73
const layerRegistry = Layer.succeed(
74
HttpClient.HttpClient,
@@ -109,6 +112,7 @@ const layerInjectedRuntimeCatalog = Layer.mock(AcpRegistrySupport.AcpRegistryCat
112
113
const layerTest = Layer.mergeAll(
114
NodeServices.layer,
115
+ NodeCrypto.layer,
116
IdAllocator.layer,
117
McpProviderSessions.layer,
118
layerHost,
apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.testkit.ts
+5
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { AcpRegistrySettings } from "@t3tools/provider-acp-registry/settings";
4
import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime";
@@ -36,7 +37,9 @@ function layerAcpRegistryProviderAdapterRegistryReplay(
37
transcript: AcpReplayTranscript,
38
options: { readonly replayGate?: ProviderReplayGate } = {},
39
) {
39
- const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
40
+ const layerHost = TestProviderHost.layer().pipe(
41
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
42
+ );
43
44
return ProviderAdapterRegistry.layerFromAdaptersEffect(
45
Effect.gen(function* () {
@@ -75,6 +78,7 @@ function layerAcpRegistryProviderAdapterRegistryReplay(
78
Layer.mergeAll(
79
layerHost,
80
NodeServices.layer,
81
+ NodeCrypto.layer,
82
IdAllocator.layer,
83
Layer.mock(AcpRegistrySupport.AcpRegistryCatalog)({
84
resolve: () => Effect.die("ACP registry resolver must not run during replay"),
apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts
+21
-17
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import {
@@ -13,7 +14,7 @@ import {
14
} from "@t3tools/contracts";
15
import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime";
16
import { htmlRenderFromToolItem } from "@t3tools/shared/toolOutput";
16
-import * as Crypto from "effect/Crypto";
17
+import * as SecureRandom from "effect/crypto/SecureRandom";
18
import * as DateTime from "effect/DateTime";
19
import * as Deferred from "effect/Deferred";
20
import * as Effect from "effect/Effect";
@@ -42,7 +43,7 @@ import {
43
44
const flavor = makeAntigravityAcpAdapterFlavor({
45
instanceId: ProviderInstanceId.make("antigravity-test"),
45
- crypto: undefined as never,
46
+ random: undefined as never,
47
fileSystem: undefined as never,
48
path: undefined as never,
49
host: undefined as never,
@@ -137,9 +138,12 @@ describe("AntigravityAdapterV2 flavor", () => {
138
139
const layerSession = Layer.mergeAll(
140
NodeServices.layer,
141
+ NodeCrypto.layer,
142
IdAllocator.layer,
143
McpProviderSessions.layer,
142
- TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
144
+ TestProviderHost.layer().pipe(
145
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
146
+ ),
147
);
148
149
describe("AntigravityAdapterV2 compaction", () => {
@@ -147,7 +151,7 @@ describe("AntigravityAdapterV2 compaction", () => {
151
Effect.gen(function* () {
152
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
153
const path = yield* Path.Path;
150
- const crypto = yield* Crypto.Crypto;
154
+ const crypto = yield* SecureRandom.SecureRandom;
155
const mockAgentPath = yield* path.fromFileUrl(
156
new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
157
);
@@ -165,7 +169,7 @@ describe("AntigravityAdapterV2 compaction", () => {
169
cwd: input.cwd,
170
env: { T3_ACP_ANTIGRAVITY: "1" },
171
},
168
- }).pipe(Effect.provideService(Crypto.Crypto, crypto)),
172
+ }).pipe(Effect.provideService(SecureRandom.SecureRandom, crypto)),
173
withProcess: (_stop, task) => task,
174
// @effect-diagnostics-next-line effectSucceedWithVoid:off - This optional result requires undefined, not the wider void type.
175
defaultModel: Effect.succeed(undefined),
@@ -258,7 +262,7 @@ describe("AntigravityAdapterV2 client file system", () => {
262
let writeTextFile: Parameters<RuntimeService["handleWriteTextFile"]>[0] | undefined;
263
const logs = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-antigravity-log-" });
264
const requestLog = path.join(logs, "requests.ndjson");
261
- const crypto = yield* Crypto.Crypto;
265
+ const crypto = yield* SecureRandom.SecureRandom;
266
const instanceId = ProviderInstanceId.make("antigravity-containment-test");
267
const adapter = yield* makeAntigravityAdapterV2({
268
instanceId,
@@ -274,7 +278,7 @@ describe("AntigravityAdapterV2 client file system", () => {
278
env: { T3_ACP_ANTIGRAVITY: "1", T3_ACP_REQUEST_LOG_PATH: requestLog },
279
},
280
}).pipe(
277
- Effect.provideService(Crypto.Crypto, crypto),
281
+ Effect.provideService(SecureRandom.SecureRandom, crypto),
282
Effect.map((runtime): RuntimeService => ({
283
...runtime,
284
handleReadTextFile: (handler) =>
@@ -395,7 +399,7 @@ describe("AntigravityAdapterV2 workspace changes", () => {
399
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
400
const fileSystem = yield* FileSystem.FileSystem;
401
const path = yield* Path.Path;
398
- const crypto = yield* Crypto.Crypto;
402
+ const crypto = yield* SecureRandom.SecureRandom;
403
const mockAgentPath = yield* path.fromFileUrl(
404
new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
405
);
@@ -427,7 +431,7 @@ describe("AntigravityAdapterV2 workspace changes", () => {
431
env: { T3_ACP_ANTIGRAVITY: "1", T3_ACP_HANG_PROMPT_FOREVER: "1" },
432
},
433
}).pipe(
430
- Effect.provideService(Crypto.Crypto, crypto),
434
+ Effect.provideService(SecureRandom.SecureRandom, crypto),
435
Effect.map((runtime): RuntimeService => ({
436
...runtime,
437
prompt: (request) =>
@@ -565,7 +569,7 @@ describe("AntigravityAdapterV2 html_render pages", () => {
569
Effect.gen(function* () {
570
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
571
const path = yield* Path.Path;
568
- const crypto = yield* Crypto.Crypto;
572
+ const crypto = yield* SecureRandom.SecureRandom;
573
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
574
const mockAgentPath = yield* path.fromFileUrl(
575
new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
@@ -598,7 +602,7 @@ describe("AntigravityAdapterV2 html_render pages", () => {
602
env: { T3_ACP_ANTIGRAVITY: "1" },
603
},
604
}).pipe(
601
- Effect.provideService(Crypto.Crypto, crypto),
605
+ Effect.provideService(SecureRandom.SecureRandom, crypto),
606
Effect.map((runtime): RuntimeService => ({
607
...runtime,
608
handleSessionUpdate: (handler) =>
@@ -847,7 +851,7 @@ describe("AntigravityAdapterV2 subagent reads", () => {
851
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
852
const fileSystem = yield* FileSystem.FileSystem;
853
const path = yield* Path.Path;
850
- const crypto = yield* Crypto.Crypto;
854
+ const crypto = yield* SecureRandom.SecureRandom;
855
const mockAgentPath = yield* path.fromFileUrl(
856
new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
857
);
@@ -883,7 +887,7 @@ describe("AntigravityAdapterV2 subagent reads", () => {
887
env: { T3_ACP_ANTIGRAVITY: "1" },
888
},
889
}).pipe(
886
- Effect.provideService(Crypto.Crypto, crypto),
890
+ Effect.provideService(SecureRandom.SecureRandom, crypto),
891
Effect.map((runtime): RuntimeService => ({
892
...runtime,
893
handleSessionUpdate: (handler) =>
@@ -1055,7 +1059,7 @@ describe("AntigravityAdapterV2 runtime mode ceiling", () => {
1059
Effect.gen(function* () {
1060
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
1061
const path = yield* Path.Path;
1058
- const crypto = yield* Crypto.Crypto;
1062
+ const crypto = yield* SecureRandom.SecureRandom;
1063
const mockAgentPath = yield* path.fromFileUrl(
1064
new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
1065
);
@@ -1076,7 +1080,7 @@ describe("AntigravityAdapterV2 runtime mode ceiling", () => {
1080
env: { T3_ACP_ANTIGRAVITY: "1" },
1081
},
1082
}).pipe(
1079
- Effect.provideService(Crypto.Crypto, crypto),
1083
+ Effect.provideService(SecureRandom.SecureRandom, crypto),
1084
Effect.map((runtime): RuntimeService => ({
1085
...runtime,
1086
setMode: (modeId) =>
@@ -1125,7 +1129,7 @@ describe("AntigravityAdapterV2 session system prompt", () => {
1129
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
1130
const fileSystem = yield* FileSystem.FileSystem;
1131
const path = yield* Path.Path;
1128
- const crypto = yield* Crypto.Crypto;
1132
+ const crypto = yield* SecureRandom.SecureRandom;
1133
const mockAgentPath = yield* path.fromFileUrl(
1134
new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
1135
);
@@ -1153,7 +1157,7 @@ describe("AntigravityAdapterV2 session system prompt", () => {
1157
},
1158
},
1159
}).pipe(
1156
- Effect.provideService(Crypto.Crypto, crypto),
1160
+ Effect.provideService(SecureRandom.SecureRandom, crypto),
1161
Effect.map((runtime): RuntimeService => ({
1162
...runtime,
1163
prompt: (request) =>
apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.ts
+4
-4
@@ -6,7 +6,7 @@ import {
6
type ProviderSetupError,
7
} from "@t3tools/contracts";
8
import type { SelfInvocation } from "@t3tools/shared/nodeRuntime";
9
-import * as Crypto from "effect/Crypto";
9
+import * as SecureRandom from "effect/crypto/SecureRandom";
10
import * as Effect from "effect/Effect";
11
import * as FileSystem from "effect/FileSystem";
12
import * as Path from "effect/Path";
@@ -124,7 +124,7 @@ const extractAntigravitySubagentUpdate: NonNullable<AcpAdapterV2Flavor["extractS
124
};
125
126
interface AntigravityFlavorServices {
127
- readonly crypto: Crypto.Crypto;
127
+ readonly random: SecureRandom.SecureRandom["Service"];
128
readonly fileSystem: FileSystem.FileSystem;
129
readonly path: Path.Path;
130
readonly host: ProviderHost.ProviderHost["Service"];
@@ -196,7 +196,7 @@ export function makeAntigravityAcpAdapterFlavor(
196
),
197
} satisfies typeof runtime;
198
},
199
- Effect.provideService(Crypto.Crypto, options.crypto),
199
+ Effect.provideService(SecureRandom.SecureRandom, options.random),
200
Effect.mapError((cause): EffectAcpErrors.AcpError =>
201
cause._tag === "ProviderSetupError"
202
? new EffectAcpErrors.AcpTransportError({ detail: cause.detail, cause })
@@ -289,7 +289,7 @@ export const makeAntigravityAdapterV2 = Effect.fn("makeAntigravityAdapterV2")(fu
289
options: AntigravityAdapterV2Options,
290
) {
291
const services: AntigravityFlavorServices = {
292
- crypto: yield* Crypto.Crypto,
292
+ random: yield* SecureRandom.SecureRandom,
293
fileSystem: yield* FileSystem.FileSystem,
294
path: yield* Path.Path,
295
host: yield* ProviderHost.ProviderHost,
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+841
-154
@@ -24,6 +24,7 @@ import type {
24
TaskUpdateInput,
25
TaskUpdateOutput,
26
} from "@anthropic-ai/claude-agent-sdk/sdk-tools";
27
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
28
import * as NodeServices from "@effect/platform-node/NodeServices";
29
import {
30
ChatAttachmentId,
@@ -55,7 +56,7 @@ import { assert, describe, it } from "@effect/vitest";
56
import * as Context from "effect/Context";
57
import * as DateTime from "effect/DateTime";
58
import * as Deferred from "effect/Deferred";
58
-import * as Crypto from "effect/Crypto";
59
+import * as SecureRandom from "effect/crypto/SecureRandom";
60
import * as Effect from "effect/Effect";
61
import * as Exit from "effect/Exit";
62
import * as FileSystem from "effect/FileSystem";
@@ -899,7 +900,7 @@ describe("ClaudeAdapterV2 Auto-accept edits", () => {
900
attachmentsDir,
901
fileSystem,
902
path: yield* Path.Path,
902
- crypto: yield* Crypto.Crypto,
903
+ random: yield* SecureRandom.SecureRandom,
904
idAllocator,
905
queryRunner: {
906
allocateSessionId: Effect.succeed("native-thread-claude-accept-edits"),
@@ -998,7 +999,12 @@ describe("ClaudeAdapterV2 Auto-accept edits", () => {
999
assert.equal((yield* Fiber.join(decision))?.behavior, "allow");
1000
}).pipe(
1001
Effect.provide(
1001
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1002
+ Layer.mergeAll(
1003
+ IdAllocator.layer,
1004
+ McpProviderSessions.layer,
1005
+ NodeServices.layer,
1006
+ NodeCrypto.layer,
1007
+ ),
1008
),
1009
),
1010
),
@@ -1016,7 +1022,7 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
1022
attachmentsDir: yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-append-" }),
1023
fileSystem,
1024
path: yield* Path.Path,
1019
- crypto: yield* Crypto.Crypto,
1025
+ random: yield* SecureRandom.SecureRandom,
1026
idAllocator: yield* IdAllocator.IdAllocatorV2,
1027
queryRunner: {
1028
allocateSessionId: Effect.succeed("native-thread-claude-append-file"),
@@ -1098,7 +1104,12 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
1104
assert.equal(opened[0]!.extraArgs?.["system-prompt"], "Replacement");
1105
}).pipe(
1106
Effect.provide(
1101
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1107
+ Layer.mergeAll(
1108
+ IdAllocator.layer,
1109
+ McpProviderSessions.layer,
1110
+ NodeServices.layer,
1111
+ NodeCrypto.layer,
1112
+ ),
1113
),
1114
),
1115
),
@@ -1126,7 +1137,12 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
1137
assert.isUndefined(opened[0]!.extraArgs?.["settings"]);
1138
}).pipe(
1139
Effect.provide(
1129
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1140
+ Layer.mergeAll(
1141
+ IdAllocator.layer,
1142
+ McpProviderSessions.layer,
1143
+ NodeServices.layer,
1144
+ NodeCrypto.layer,
1145
+ ),
1146
),
1147
),
1148
),
@@ -1190,7 +1206,12 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
1206
);
1207
}).pipe(
1208
Effect.provide(
1193
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1209
+ Layer.mergeAll(
1210
+ IdAllocator.layer,
1211
+ McpProviderSessions.layer,
1212
+ NodeServices.layer,
1213
+ NodeCrypto.layer,
1214
+ ),
1215
),
1216
),
1217
),
@@ -1375,7 +1396,12 @@ describe("ClaudeAdapterV2 executable path", () => {
1396
}),
1397
).pipe(
1398
Effect.provide(
1378
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1399
+ Layer.mergeAll(
1400
+ IdAllocator.layer,
1401
+ McpProviderSessions.layer,
1402
+ NodeServices.layer,
1403
+ NodeCrypto.layer,
1404
+ ),
1405
),
1406
),
1407
);
@@ -1412,7 +1438,7 @@ describe("ClaudeAdapterV2 resumeThread", () => {
1438
attachmentsDir: configDir,
1439
fileSystem,
1440
path,
1415
- crypto: yield* Crypto.Crypto,
1441
+ random: yield* SecureRandom.SecureRandom,
1442
idAllocator: yield* IdAllocator.IdAllocatorV2,
1443
queryRunner: {
1444
allocateSessionId: Effect.succeed("native-thread-empty"),
@@ -1464,7 +1490,12 @@ describe("ClaudeAdapterV2 resumeThread", () => {
1490
}),
1491
).pipe(
1492
Effect.provide(
1467
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1493
+ Layer.mergeAll(
1494
+ IdAllocator.layer,
1495
+ McpProviderSessions.layer,
1496
+ NodeServices.layer,
1497
+ NodeCrypto.layer,
1498
+ ),
1499
),
1500
),
1501
);
@@ -1487,7 +1518,7 @@ describe("ClaudeAdapterV2 resume compaction", () => {
1518
attachmentsDir,
1519
fileSystem,
1520
path: yield* Path.Path,
1490
- crypto: yield* Crypto.Crypto,
1521
+ random: yield* SecureRandom.SecureRandom,
1522
idAllocator,
1523
queryRunner: {
1524
allocateSessionId: Effect.succeed("native-thread-claude-resume"),
@@ -1738,7 +1769,12 @@ describe("ClaudeAdapterV2 resume compaction", () => {
1769
);
1770
}).pipe(
1771
Effect.provide(
1741
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1772
+ Layer.mergeAll(
1773
+ IdAllocator.layer,
1774
+ McpProviderSessions.layer,
1775
+ NodeServices.layer,
1776
+ NodeCrypto.layer,
1777
+ ),
1778
),
1779
),
1780
),
@@ -1838,7 +1874,7 @@ describe("ClaudeAdapterV2 attachments", () => {
1874
attachmentsDir,
1875
fileSystem,
1876
path: yield* Path.Path,
1841
- crypto: yield* Crypto.Crypto,
1877
+ random: yield* SecureRandom.SecureRandom,
1878
idAllocator,
1879
queryRunner: {
1880
allocateSessionId: Effect.succeed("native-thread-claude-attachments"),
@@ -2345,7 +2381,12 @@ describe("ClaudeAdapterV2 attachments", () => {
2381
}
2382
}).pipe(
2383
Effect.provide(
2348
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
2384
+ Layer.mergeAll(
2385
+ IdAllocator.layer,
2386
+ McpProviderSessions.layer,
2387
+ NodeServices.layer,
2388
+ NodeCrypto.layer,
2389
+ ),
2390
),
2391
),
2392
),
@@ -2370,7 +2411,7 @@ describe("ClaudeAdapterV2 native fork", () => {
2411
attachmentsDir,
2412
fileSystem,
2413
path: yield* Path.Path,
2373
- crypto: yield* Crypto.Crypto,
2414
+ random: yield* SecureRandom.SecureRandom,
2415
idAllocator,
2416
queryRunner: {
2417
allocateSessionId: Effect.succeed("source-native-session"),
@@ -2527,7 +2568,12 @@ describe("ClaudeAdapterV2 native fork", () => {
2568
assert.equal(openedQueries[0]?.options.sessionId, undefined);
2569
}).pipe(
2570
Effect.provide(
2530
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
2571
+ Layer.mergeAll(
2572
+ IdAllocator.layer,
2573
+ McpProviderSessions.layer,
2574
+ NodeServices.layer,
2575
+ NodeCrypto.layer,
2576
+ ),
2577
),
2578
),
2579
),
@@ -2617,7 +2663,7 @@ describe("ClaudeAdapterV2 MCP credential channel", () => {
2663
...ProviderEventLoggers.NoOpProviderEventLoggers,
2664
native,
2665
}),
2620
- Effect.provide(NodeServices.layer),
2666
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
2667
);
2668
2669
it.effect("commits queued delivery before interruptible protocol logging", () =>
@@ -2685,7 +2731,7 @@ describe("ClaudeAdapterV2 native session identity", () => {
2731
attachmentsDir,
2732
fileSystem,
2733
path: yield* Path.Path,
2688
- crypto: yield* Crypto.Crypto,
2734
+ random: yield* SecureRandom.SecureRandom,
2735
idAllocator,
2736
queryRunner: {
2737
allocateSessionId: Effect.succeed("native-session-identity"),
@@ -2738,7 +2784,12 @@ describe("ClaudeAdapterV2 native session identity", () => {
2784
return openedQueries;
2785
}).pipe(
2786
Effect.provide(
2741
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
2787
+ Layer.mergeAll(
2788
+ IdAllocator.layer,
2789
+ McpProviderSessions.layer,
2790
+ NodeServices.layer,
2791
+ NodeCrypto.layer,
2792
+ ),
2793
),
2794
),
2795
);
@@ -3043,7 +3094,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
3094
attachmentsDir,
3095
fileSystem,
3096
path: yield* Path.Path,
3046
- crypto: yield* Crypto.Crypto,
3097
+ random: yield* SecureRandom.SecureRandom,
3098
idAllocator,
3099
continuationRequests: {
3100
offer: (request) =>
@@ -3387,7 +3438,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
3438
);
3439
}).pipe(
3440
Effect.provide(
3390
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3441
+ Layer.mergeAll(
3442
+ IdAllocator.layer,
3443
+ McpProviderSessions.layer,
3444
+ NodeServices.layer,
3445
+ NodeCrypto.layer,
3446
+ ),
3447
),
3448
),
3449
);
@@ -3618,7 +3674,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
3674
}
3675
}).pipe(
3676
Effect.provide(
3621
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3677
+ Layer.mergeAll(
3678
+ IdAllocator.layer,
3679
+ McpProviderSessions.layer,
3680
+ NodeServices.layer,
3681
+ NodeCrypto.layer,
3682
+ ),
3683
),
3684
),
3685
);
@@ -3711,7 +3772,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
3772
assert.equal((yield* open).permissionMode, "auto");
3773
}).pipe(
3774
Effect.provide(
3714
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3775
+ Layer.mergeAll(
3776
+ IdAllocator.layer,
3777
+ McpProviderSessions.layer,
3778
+ NodeServices.layer,
3779
+ NodeCrypto.layer,
3780
+ ),
3781
),
3782
),
3783
);
@@ -3782,7 +3848,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
3848
});
3849
}).pipe(
3850
Effect.provide(
3785
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3851
+ Layer.mergeAll(
3852
+ IdAllocator.layer,
3853
+ McpProviderSessions.layer,
3854
+ NodeServices.layer,
3855
+ NodeCrypto.layer,
3856
+ ),
3857
),
3858
),
3859
);
@@ -4070,7 +4141,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4141
assert.equal(notices().length, 1);
4142
}).pipe(
4143
Effect.provide(
4073
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4144
+ Layer.mergeAll(
4145
+ IdAllocator.layer,
4146
+ McpProviderSessions.layer,
4147
+ NodeServices.layer,
4148
+ NodeCrypto.layer,
4149
+ ),
4150
),
4151
),
4152
);
@@ -4119,7 +4195,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4195
]);
4196
}).pipe(
4197
Effect.provide(
4122
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4198
+ Layer.mergeAll(
4199
+ IdAllocator.layer,
4200
+ McpProviderSessions.layer,
4201
+ NodeServices.layer,
4202
+ NodeCrypto.layer,
4203
+ ),
4204
),
4205
),
4206
);
@@ -4205,7 +4286,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4286
);
4287
}).pipe(
4288
Effect.provide(
4208
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4289
+ Layer.mergeAll(
4290
+ IdAllocator.layer,
4291
+ McpProviderSessions.layer,
4292
+ NodeServices.layer,
4293
+ NodeCrypto.layer,
4294
+ ),
4295
),
4296
),
4297
);
@@ -4306,7 +4392,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4392
);
4393
}).pipe(
4394
Effect.provide(
4309
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4395
+ Layer.mergeAll(
4396
+ IdAllocator.layer,
4397
+ McpProviderSessions.layer,
4398
+ NodeServices.layer,
4399
+ NodeCrypto.layer,
4400
+ ),
4401
),
4402
),
4403
);
@@ -4408,7 +4499,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4499
}).pipe(
4500
Effect.scoped,
4501
Effect.provide(
4411
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4502
+ Layer.mergeAll(
4503
+ IdAllocator.layer,
4504
+ McpProviderSessions.layer,
4505
+ NodeServices.layer,
4506
+ NodeCrypto.layer,
4507
+ ),
4508
),
4509
),
4510
);
@@ -4425,7 +4521,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4521
}).pipe(
4522
Effect.scoped,
4523
Effect.provide(
4428
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4524
+ Layer.mergeAll(
4525
+ IdAllocator.layer,
4526
+ McpProviderSessions.layer,
4527
+ NodeServices.layer,
4528
+ NodeCrypto.layer,
4529
+ ),
4530
),
4531
),
4532
);
@@ -4480,7 +4581,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4581
}).pipe(
4582
Effect.scoped,
4583
Effect.provide(
4483
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4584
+ Layer.mergeAll(
4585
+ IdAllocator.layer,
4586
+ McpProviderSessions.layer,
4587
+ NodeServices.layer,
4588
+ NodeCrypto.layer,
4589
+ ),
4590
),
4591
),
4592
);
@@ -4509,7 +4615,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4615
}).pipe(
4616
Effect.scoped,
4617
Effect.provide(
4512
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4618
+ Layer.mergeAll(
4619
+ IdAllocator.layer,
4620
+ McpProviderSessions.layer,
4621
+ NodeServices.layer,
4622
+ NodeCrypto.layer,
4623
+ ),
4624
),
4625
),
4626
);
@@ -4586,7 +4697,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4697
]);
4698
}).pipe(
4699
Effect.provide(
4589
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4700
+ Layer.mergeAll(
4701
+ IdAllocator.layer,
4702
+ McpProviderSessions.layer,
4703
+ NodeServices.layer,
4704
+ NodeCrypto.layer,
4705
+ ),
4706
),
4707
),
4708
);
@@ -4703,7 +4819,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4819
}).pipe(
4820
Effect.scoped,
4821
Effect.provide(
4706
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4822
+ Layer.mergeAll(
4823
+ IdAllocator.layer,
4824
+ McpProviderSessions.layer,
4825
+ NodeServices.layer,
4826
+ NodeCrypto.layer,
4827
+ ),
4828
),
4829
),
4830
);
@@ -4763,7 +4884,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4884
}).pipe(
4885
Effect.scoped,
4886
Effect.provide(
4766
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4887
+ Layer.mergeAll(
4888
+ IdAllocator.layer,
4889
+ McpProviderSessions.layer,
4890
+ NodeServices.layer,
4891
+ NodeCrypto.layer,
4892
+ ),
4893
),
4894
),
4895
);
@@ -4773,6 +4899,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
4899
IdAllocator.layer,
4900
McpProviderSessions.layer,
4901
NodeServices.layer,
4902
+ NodeCrypto.layer,
4903
);
4904
const approvalOnly: ElicitationRequest = {
4905
serverName: "deploys",
@@ -5037,7 +5164,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5164
assert.isTrue(yield* harness.hasPendingBackgroundWork);
5165
}).pipe(
5166
Effect.provide(
5040
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5167
+ Layer.mergeAll(
5168
+ IdAllocator.layer,
5169
+ McpProviderSessions.layer,
5170
+ NodeServices.layer,
5171
+ NodeCrypto.layer,
5172
+ ),
5173
),
5174
),
5175
),
@@ -5095,7 +5227,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5227
]);
5228
}).pipe(
5229
Effect.provide(
5098
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5230
+ Layer.mergeAll(
5231
+ IdAllocator.layer,
5232
+ McpProviderSessions.layer,
5233
+ NodeServices.layer,
5234
+ NodeCrypto.layer,
5235
+ ),
5236
),
5237
),
5238
),
@@ -5219,7 +5356,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5356
}).pipe(
5357
Effect.scoped,
5358
Effect.provide(
5222
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5359
+ Layer.mergeAll(
5360
+ IdAllocator.layer,
5361
+ McpProviderSessions.layer,
5362
+ NodeServices.layer,
5363
+ NodeCrypto.layer,
5364
+ ),
5365
),
5366
),
5367
);
@@ -5292,7 +5434,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5434
assert.equal(node?.type === "node.updated" ? node.node.status : undefined, failed.status);
5435
}).pipe(
5436
Effect.provide(
5295
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5437
+ Layer.mergeAll(
5438
+ IdAllocator.layer,
5439
+ McpProviderSessions.layer,
5440
+ NodeServices.layer,
5441
+ NodeCrypto.layer,
5442
+ ),
5443
),
5444
),
5445
),
@@ -5355,7 +5502,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5502
);
5503
}).pipe(
5504
Effect.provide(
5358
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5505
+ Layer.mergeAll(
5506
+ IdAllocator.layer,
5507
+ McpProviderSessions.layer,
5508
+ NodeServices.layer,
5509
+ NodeCrypto.layer,
5510
+ ),
5511
),
5512
),
5513
),
@@ -5472,7 +5624,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5624
assert.lengthOf(harness.terminalEvents(), 1);
5625
}).pipe(
5626
Effect.provide(
5475
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5627
+ Layer.mergeAll(
5628
+ IdAllocator.layer,
5629
+ McpProviderSessions.layer,
5630
+ NodeServices.layer,
5631
+ NodeCrypto.layer,
5632
+ ),
5633
),
5634
),
5635
),
@@ -5542,7 +5699,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5699
assert.notEqual(notices()[0]?.id, notices()[2]?.id);
5700
}).pipe(
5701
Effect.provide(
5545
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5702
+ Layer.mergeAll(
5703
+ IdAllocator.layer,
5704
+ McpProviderSessions.layer,
5705
+ NodeServices.layer,
5706
+ NodeCrypto.layer,
5707
+ ),
5708
),
5709
),
5710
);
@@ -5597,7 +5759,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5759
assert.equal(terminal.failure.resetAt, "2026-10-12T12:20:00.000Z");
5760
}).pipe(
5761
Effect.provide(
5600
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5762
+ Layer.mergeAll(
5763
+ IdAllocator.layer,
5764
+ McpProviderSessions.layer,
5765
+ NodeServices.layer,
5766
+ NodeCrypto.layer,
5767
+ ),
5768
),
5769
),
5770
);
@@ -5688,7 +5855,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5855
);
5856
}).pipe(
5857
Effect.provide(
5691
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5858
+ Layer.mergeAll(
5859
+ IdAllocator.layer,
5860
+ McpProviderSessions.layer,
5861
+ NodeServices.layer,
5862
+ NodeCrypto.layer,
5863
+ ),
5864
),
5865
),
5866
);
@@ -5738,7 +5910,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5910
assert.notInclude(terminal.failure.message, "repeated API errors");
5911
}).pipe(
5912
Effect.provide(
5741
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5913
+ Layer.mergeAll(
5914
+ IdAllocator.layer,
5915
+ McpProviderSessions.layer,
5916
+ NodeServices.layer,
5917
+ NodeCrypto.layer,
5918
+ ),
5919
),
5920
),
5921
);
@@ -5781,7 +5958,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
5958
assert.equal(terminal.failure.code, "api_error_403");
5959
}).pipe(
5960
Effect.provide(
5784
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5961
+ Layer.mergeAll(
5962
+ IdAllocator.layer,
5963
+ McpProviderSessions.layer,
5964
+ NodeServices.layer,
5965
+ NodeCrypto.layer,
5966
+ ),
5967
),
5968
),
5969
);
@@ -5890,7 +6072,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6072
}
6073
}).pipe(
6074
Effect.provide(
5893
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6075
+ Layer.mergeAll(
6076
+ IdAllocator.layer,
6077
+ McpProviderSessions.layer,
6078
+ NodeServices.layer,
6079
+ NodeCrypto.layer,
6080
+ ),
6081
),
6082
),
6083
);
@@ -5945,7 +6132,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6132
assert.equal(rolledBack.providerThread.nativeConversationHeadRef?.nativeId, mainUuid);
6133
}).pipe(
6134
Effect.provide(
5948
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6135
+ Layer.mergeAll(
6136
+ IdAllocator.layer,
6137
+ McpProviderSessions.layer,
6138
+ NodeServices.layer,
6139
+ NodeCrypto.layer,
6140
+ ),
6141
),
6142
),
6143
);
@@ -6014,7 +6206,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6206
assert.isUndefined(harness.getOpenedOptions()?.resumeSessionAt);
6207
}).pipe(
6208
Effect.provide(
6017
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6209
+ Layer.mergeAll(
6210
+ IdAllocator.layer,
6211
+ McpProviderSessions.layer,
6212
+ NodeServices.layer,
6213
+ NodeCrypto.layer,
6214
+ ),
6215
),
6216
),
6217
);
@@ -6077,7 +6274,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6274
assert.equal(harness.getOpenedOptions()?.resumeSessionAt, pinnedHead);
6275
}).pipe(
6276
Effect.provide(
6080
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6277
+ Layer.mergeAll(
6278
+ IdAllocator.layer,
6279
+ McpProviderSessions.layer,
6280
+ NodeServices.layer,
6281
+ NodeCrypto.layer,
6282
+ ),
6283
),
6284
),
6285
);
@@ -6226,7 +6428,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6428
assert.isUndefined(harness.getOpenedOptions()?.resumeSessionAt);
6429
}).pipe(
6430
Effect.provide(
6229
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6431
+ Layer.mergeAll(
6432
+ IdAllocator.layer,
6433
+ McpProviderSessions.layer,
6434
+ NodeServices.layer,
6435
+ NodeCrypto.layer,
6436
+ ),
6437
),
6438
),
6439
);
@@ -6388,7 +6595,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6595
);
6596
}).pipe(
6597
Effect.provide(
6391
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6598
+ Layer.mergeAll(
6599
+ IdAllocator.layer,
6600
+ McpProviderSessions.layer,
6601
+ NodeServices.layer,
6602
+ NodeCrypto.layer,
6603
+ ),
6604
),
6605
),
6606
);
@@ -6452,7 +6664,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6664
);
6665
}).pipe(
6666
Effect.provide(
6455
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6667
+ Layer.mergeAll(
6668
+ IdAllocator.layer,
6669
+ McpProviderSessions.layer,
6670
+ NodeServices.layer,
6671
+ NodeCrypto.layer,
6672
+ ),
6673
),
6674
),
6675
);
@@ -6531,7 +6748,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6748
);
6749
}).pipe(
6750
Effect.provide(
6534
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6751
+ Layer.mergeAll(
6752
+ IdAllocator.layer,
6753
+ McpProviderSessions.layer,
6754
+ NodeServices.layer,
6755
+ NodeCrypto.layer,
6756
+ ),
6757
),
6758
),
6759
);
@@ -6589,7 +6811,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6811
}
6812
}).pipe(
6813
Effect.provide(
6592
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6814
+ Layer.mergeAll(
6815
+ IdAllocator.layer,
6816
+ McpProviderSessions.layer,
6817
+ NodeServices.layer,
6818
+ NodeCrypto.layer,
6819
+ ),
6820
),
6821
),
6822
);
@@ -6642,7 +6869,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6869
);
6870
}).pipe(
6871
Effect.provide(
6645
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6872
+ Layer.mergeAll(
6873
+ IdAllocator.layer,
6874
+ McpProviderSessions.layer,
6875
+ NodeServices.layer,
6876
+ NodeCrypto.layer,
6877
+ ),
6878
),
6879
),
6880
);
@@ -6710,7 +6942,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
6942
assert.deepEqual(reportedContext, [2]);
6943
}).pipe(
6944
Effect.provide(
6713
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6945
+ Layer.mergeAll(
6946
+ IdAllocator.layer,
6947
+ McpProviderSessions.layer,
6948
+ NodeServices.layer,
6949
+ NodeCrypto.layer,
6950
+ ),
6951
),
6952
),
6953
);
@@ -6806,7 +7043,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7043
assert.deepEqual(reportedContextTokens(harness.events), [38_123]);
7044
}).pipe(
7045
Effect.provide(
6809
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7046
+ Layer.mergeAll(
7047
+ IdAllocator.layer,
7048
+ McpProviderSessions.layer,
7049
+ NodeServices.layer,
7050
+ NodeCrypto.layer,
7051
+ ),
7052
),
7053
),
7054
);
@@ -6883,7 +7125,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7125
);
7126
}).pipe(
7127
Effect.provide(
6886
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7128
+ Layer.mergeAll(
7129
+ IdAllocator.layer,
7130
+ McpProviderSessions.layer,
7131
+ NodeServices.layer,
7132
+ NodeCrypto.layer,
7133
+ ),
7134
),
7135
),
7136
);
@@ -6945,7 +7192,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7192
);
7193
}).pipe(
7194
Effect.provide(
6948
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7195
+ Layer.mergeAll(
7196
+ IdAllocator.layer,
7197
+ McpProviderSessions.layer,
7198
+ NodeServices.layer,
7199
+ NodeCrypto.layer,
7200
+ ),
7201
),
7202
),
7203
);
@@ -7017,7 +7269,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7269
}).pipe(
7270
Effect.scoped,
7271
Effect.provide(
7020
- Layer.mergeAll(NodeServices.layer, IdAllocator.layer, McpProviderSessions.layer),
7272
+ Layer.mergeAll(
7273
+ NodeServices.layer,
7274
+ NodeCrypto.layer,
7275
+ IdAllocator.layer,
7276
+ McpProviderSessions.layer,
7277
+ ),
7278
),
7279
),
7280
);
@@ -7094,7 +7351,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7351
}).pipe(
7352
Effect.scoped,
7353
Effect.provide(
7097
- Layer.mergeAll(NodeServices.layer, IdAllocator.layer, McpProviderSessions.layer),
7354
+ Layer.mergeAll(
7355
+ NodeServices.layer,
7356
+ NodeCrypto.layer,
7357
+ IdAllocator.layer,
7358
+ McpProviderSessions.layer,
7359
+ ),
7360
),
7361
),
7362
);
@@ -7321,7 +7583,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7583
}).pipe(
7584
Effect.scoped,
7585
Effect.provide(
7324
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7586
+ Layer.mergeAll(
7587
+ IdAllocator.layer,
7588
+ McpProviderSessions.layer,
7589
+ NodeServices.layer,
7590
+ NodeCrypto.layer,
7591
+ ),
7592
),
7593
),
7594
);
@@ -7395,7 +7662,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7662
}).pipe(
7663
Effect.scoped,
7664
Effect.provide(
7398
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7665
+ Layer.mergeAll(
7666
+ IdAllocator.layer,
7667
+ McpProviderSessions.layer,
7668
+ NodeServices.layer,
7669
+ NodeCrypto.layer,
7670
+ ),
7671
),
7672
),
7673
);
@@ -7479,7 +7751,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7751
}).pipe(
7752
Effect.scoped,
7753
Effect.provide(
7482
- Layer.mergeAll(NodeServices.layer, IdAllocator.layer, McpProviderSessions.layer),
7754
+ Layer.mergeAll(
7755
+ NodeServices.layer,
7756
+ NodeCrypto.layer,
7757
+ IdAllocator.layer,
7758
+ McpProviderSessions.layer,
7759
+ ),
7760
),
7761
),
7762
);
@@ -7544,7 +7821,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
7821
}).pipe(
7822
Effect.scoped,
7823
Effect.provide(
7547
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7824
+ Layer.mergeAll(
7825
+ IdAllocator.layer,
7826
+ McpProviderSessions.layer,
7827
+ NodeServices.layer,
7828
+ NodeCrypto.layer,
7829
+ ),
7830
),
7831
),
7832
);
@@ -7786,7 +8068,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8068
);
8069
}).pipe(
8070
Effect.provide(
7789
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8071
+ Layer.mergeAll(
8072
+ IdAllocator.layer,
8073
+ McpProviderSessions.layer,
8074
+ NodeServices.layer,
8075
+ NodeCrypto.layer,
8076
+ ),
8077
),
8078
),
8079
),
@@ -8059,7 +8346,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8346
}).pipe(
8347
Effect.scoped,
8348
Effect.provide(
8062
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8349
+ Layer.mergeAll(
8350
+ IdAllocator.layer,
8351
+ McpProviderSessions.layer,
8352
+ NodeServices.layer,
8353
+ NodeCrypto.layer,
8354
+ ),
8355
),
8356
),
8357
);
@@ -8090,7 +8382,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8382
}).pipe(
8383
Effect.scoped,
8384
Effect.provide(
8093
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8385
+ Layer.mergeAll(
8386
+ IdAllocator.layer,
8387
+ McpProviderSessions.layer,
8388
+ NodeServices.layer,
8389
+ NodeCrypto.layer,
8390
+ ),
8391
),
8392
),
8393
);
@@ -8145,7 +8442,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8442
}).pipe(
8443
Effect.scoped,
8444
Effect.provide(
8148
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8445
+ Layer.mergeAll(
8446
+ IdAllocator.layer,
8447
+ McpProviderSessions.layer,
8448
+ NodeServices.layer,
8449
+ NodeCrypto.layer,
8450
+ ),
8451
),
8452
),
8453
);
@@ -8171,7 +8473,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8473
}).pipe(
8474
Effect.scoped,
8475
Effect.provide(
8174
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8476
+ Layer.mergeAll(
8477
+ IdAllocator.layer,
8478
+ McpProviderSessions.layer,
8479
+ NodeServices.layer,
8480
+ NodeCrypto.layer,
8481
+ ),
8482
),
8483
),
8484
);
@@ -8213,7 +8520,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8520
}).pipe(
8521
Effect.scoped,
8522
Effect.provide(
8216
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8523
+ Layer.mergeAll(
8524
+ IdAllocator.layer,
8525
+ McpProviderSessions.layer,
8526
+ NodeServices.layer,
8527
+ NodeCrypto.layer,
8528
+ ),
8529
),
8530
),
8531
);
@@ -8260,7 +8572,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8572
}).pipe(
8573
Effect.scoped,
8574
Effect.provide(
8263
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8575
+ Layer.mergeAll(
8576
+ IdAllocator.layer,
8577
+ McpProviderSessions.layer,
8578
+ NodeServices.layer,
8579
+ NodeCrypto.layer,
8580
+ ),
8581
),
8582
),
8583
);
@@ -8290,7 +8607,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8607
}).pipe(
8608
Effect.scoped,
8609
Effect.provide(
8293
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8610
+ Layer.mergeAll(
8611
+ IdAllocator.layer,
8612
+ McpProviderSessions.layer,
8613
+ NodeServices.layer,
8614
+ NodeCrypto.layer,
8615
+ ),
8616
),
8617
),
8618
);
@@ -8306,7 +8628,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8628
}).pipe(
8629
Effect.scoped,
8630
Effect.provide(
8309
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8631
+ Layer.mergeAll(
8632
+ IdAllocator.layer,
8633
+ McpProviderSessions.layer,
8634
+ NodeServices.layer,
8635
+ NodeCrypto.layer,
8636
+ ),
8637
),
8638
),
8639
);
@@ -8383,7 +8710,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8710
yield* harness.awaitTerminal(1);
8711
}).pipe(
8712
Effect.provide(
8386
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8713
+ Layer.mergeAll(
8714
+ IdAllocator.layer,
8715
+ McpProviderSessions.layer,
8716
+ NodeServices.layer,
8717
+ NodeCrypto.layer,
8718
+ ),
8719
),
8720
),
8721
),
@@ -8435,7 +8767,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8767
);
8768
}).pipe(
8769
Effect.provide(
8438
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8770
+ Layer.mergeAll(
8771
+ IdAllocator.layer,
8772
+ McpProviderSessions.layer,
8773
+ NodeServices.layer,
8774
+ NodeCrypto.layer,
8775
+ ),
8776
),
8777
),
8778
),
@@ -8499,7 +8836,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8836
}
8837
}).pipe(
8838
Effect.provide(
8502
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8839
+ Layer.mergeAll(
8840
+ IdAllocator.layer,
8841
+ McpProviderSessions.layer,
8842
+ NodeServices.layer,
8843
+ NodeCrypto.layer,
8844
+ ),
8845
),
8846
),
8847
);
@@ -8589,7 +8931,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
8931
assert.isFalse(yield* harness.hasPendingBackgroundWork);
8932
}).pipe(
8933
Effect.provide(
8592
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8934
+ Layer.mergeAll(
8935
+ IdAllocator.layer,
8936
+ McpProviderSessions.layer,
8937
+ NodeServices.layer,
8938
+ NodeCrypto.layer,
8939
+ ),
8940
),
8941
),
8942
),
@@ -8715,7 +9062,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9062
);
9063
}).pipe(
9064
Effect.provide(
8718
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9065
+ Layer.mergeAll(
9066
+ IdAllocator.layer,
9067
+ McpProviderSessions.layer,
9068
+ NodeServices.layer,
9069
+ NodeCrypto.layer,
9070
+ ),
9071
),
9072
),
9073
),
@@ -8851,7 +9203,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9203
]);
9204
}).pipe(
9205
Effect.provide(
8854
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9206
+ Layer.mergeAll(
9207
+ IdAllocator.layer,
9208
+ McpProviderSessions.layer,
9209
+ NodeServices.layer,
9210
+ NodeCrypto.layer,
9211
+ ),
9212
),
9213
),
9214
),
@@ -8961,7 +9318,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9318
}).pipe(
9319
Effect.provideService(HostProcess.Platform, "linux"),
9320
Effect.provide(
8964
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9321
+ Layer.mergeAll(
9322
+ IdAllocator.layer,
9323
+ McpProviderSessions.layer,
9324
+ NodeServices.layer,
9325
+ NodeCrypto.layer,
9326
+ ),
9327
),
9328
),
9329
),
@@ -9023,7 +9385,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9385
assert.lengthOf(harness.terminalEvents(), 1);
9386
}).pipe(
9387
Effect.provide(
9026
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9388
+ Layer.mergeAll(
9389
+ IdAllocator.layer,
9390
+ McpProviderSessions.layer,
9391
+ NodeServices.layer,
9392
+ NodeCrypto.layer,
9393
+ ),
9394
),
9395
),
9396
),
@@ -9081,7 +9448,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9448
assert.lengthOf(harness.terminalEvents(), 1);
9449
}).pipe(
9450
Effect.provide(
9084
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9451
+ Layer.mergeAll(
9452
+ IdAllocator.layer,
9453
+ McpProviderSessions.layer,
9454
+ NodeServices.layer,
9455
+ NodeCrypto.layer,
9456
+ ),
9457
),
9458
),
9459
),
@@ -9155,7 +9527,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9527
assert.lengthOf(harness.continuationRequests, 0);
9528
}).pipe(
9529
Effect.provide(
9158
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9530
+ Layer.mergeAll(
9531
+ IdAllocator.layer,
9532
+ McpProviderSessions.layer,
9533
+ NodeServices.layer,
9534
+ NodeCrypto.layer,
9535
+ ),
9536
),
9537
),
9538
),
@@ -9182,7 +9559,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9559
attachmentsDir,
9560
fileSystem,
9561
path: yield* Path.Path,
9185
- crypto: yield* Crypto.Crypto,
9562
+ random: yield* SecureRandom.SecureRandom,
9563
idAllocator,
9564
continuationRequests: {
9565
offer: (request) =>
@@ -9337,7 +9714,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9714
yield* changes.until(() => continuationRequests.length === 1);
9715
}).pipe(
9716
Effect.provide(
9340
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9717
+ Layer.mergeAll(
9718
+ IdAllocator.layer,
9719
+ McpProviderSessions.layer,
9720
+ NodeServices.layer,
9721
+ NodeCrypto.layer,
9722
+ ),
9723
),
9724
),
9725
),
@@ -9369,7 +9751,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9751
attachmentsDir,
9752
fileSystem,
9753
path: yield* Path.Path,
9372
- crypto: yield* Crypto.Crypto,
9754
+ random: yield* SecureRandom.SecureRandom,
9755
idAllocator,
9756
continuationRequests: {
9757
offer: () => Effect.void,
@@ -9594,7 +9976,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
9976
assert.isFalse(yield* hasPendingBackgroundWork);
9977
}).pipe(
9978
Effect.provide(
9597
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
9979
+ Layer.mergeAll(
9980
+ IdAllocator.layer,
9981
+ McpProviderSessions.layer,
9982
+ NodeServices.layer,
9983
+ NodeCrypto.layer,
9984
+ ),
9985
),
9986
),
9987
),
@@ -9800,7 +10187,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
10187
);
10188
}).pipe(
10189
Effect.provide(
9803
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
10190
+ Layer.mergeAll(
10191
+ IdAllocator.layer,
10192
+ McpProviderSessions.layer,
10193
+ NodeServices.layer,
10194
+ NodeCrypto.layer,
10195
+ ),
10196
),
10197
),
10198
),
@@ -9887,7 +10279,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
10279
);
10280
}).pipe(
10281
Effect.provide(
9890
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
10282
+ Layer.mergeAll(
10283
+ IdAllocator.layer,
10284
+ McpProviderSessions.layer,
10285
+ NodeServices.layer,
10286
+ NodeCrypto.layer,
10287
+ ),
10288
),
10289
),
10290
),
@@ -10033,7 +10430,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
10430
);
10431
}).pipe(
10432
Effect.provide(
10036
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
10433
+ Layer.mergeAll(
10434
+ IdAllocator.layer,
10435
+ McpProviderSessions.layer,
10436
+ NodeServices.layer,
10437
+ NodeCrypto.layer,
10438
+ ),
10439
),
10440
),
10441
),
@@ -10154,7 +10556,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
10556
assert.equal(result?.behavior, "allow");
10557
}).pipe(
10558
Effect.provide(
10157
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
10559
+ Layer.mergeAll(
10560
+ IdAllocator.layer,
10561
+ McpProviderSessions.layer,
10562
+ NodeServices.layer,
10563
+ NodeCrypto.layer,
10564
+ ),
10565
),
10566
),
10567
),
@@ -10244,7 +10651,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
10651
assert.equal(statusOf("turn_item.updated"), "cancelled");
10652
}).pipe(
10653
Effect.provide(
10247
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
10654
+ Layer.mergeAll(
10655
+ IdAllocator.layer,
10656
+ McpProviderSessions.layer,
10657
+ NodeServices.layer,
10658
+ NodeCrypto.layer,
10659
+ ),
10660
),
10661
),
10662
),
@@ -10319,7 +10731,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
10731
assert.equal(harness.terminalEvents()[1]?.status, "failed");
10732
}).pipe(
10733
Effect.provide(
10322
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
10734
+ Layer.mergeAll(
10735
+ IdAllocator.layer,
10736
+ McpProviderSessions.layer,
10737
+ NodeServices.layer,
10738
+ NodeCrypto.layer,
10739
+ ),
10740
),
10741
),
10742
),
@@ -10359,7 +10776,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
10776
assert.include(terminal.failure.message, "never started a turn");
10777
}).pipe(
10778
Effect.provide(
10362
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
10779
+ Layer.mergeAll(
10780
+ IdAllocator.layer,
10781
+ McpProviderSessions.layer,
10782
+ NodeServices.layer,
10783
+ NodeCrypto.layer,
10784
+ ),
10785
),
10786
),
10787
),
@@ -10448,7 +10870,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
10870
yield* Deferred.await(closed);
10871
}).pipe(
10872
Effect.provide(
10451
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
10873
+ Layer.mergeAll(
10874
+ IdAllocator.layer,
10875
+ McpProviderSessions.layer,
10876
+ NodeServices.layer,
10877
+ NodeCrypto.layer,
10878
+ ),
10879
),
10880
),
10881
),
@@ -10525,7 +10952,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
10952
assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
10953
}).pipe(
10954
Effect.provide(
10528
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
10955
+ Layer.mergeAll(
10956
+ IdAllocator.layer,
10957
+ McpProviderSessions.layer,
10958
+ NodeServices.layer,
10959
+ NodeCrypto.layer,
10960
+ ),
10961
),
10962
),
10963
),
@@ -10579,7 +11011,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
11011
assert.equal(harness.terminalEvents()[0]?.status, "completed");
11012
}).pipe(
11013
Effect.provide(
10582
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
11014
+ Layer.mergeAll(
11015
+ IdAllocator.layer,
11016
+ McpProviderSessions.layer,
11017
+ NodeServices.layer,
11018
+ NodeCrypto.layer,
11019
+ ),
11020
),
11021
),
11022
),
@@ -10625,7 +11062,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
11062
assert.isTrue(yield* harness.hasPendingBackgroundWork);
11063
}).pipe(
11064
Effect.provide(
10628
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
11065
+ Layer.mergeAll(
11066
+ IdAllocator.layer,
11067
+ McpProviderSessions.layer,
11068
+ NodeServices.layer,
11069
+ NodeCrypto.layer,
11070
+ ),
11071
),
11072
),
11073
),
@@ -10684,7 +11126,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
11126
);
11127
}).pipe(
11128
Effect.provide(
10687
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
11129
+ Layer.mergeAll(
11130
+ IdAllocator.layer,
11131
+ McpProviderSessions.layer,
11132
+ NodeServices.layer,
11133
+ NodeCrypto.layer,
11134
+ ),
11135
),
11136
),
11137
),
@@ -10796,7 +11243,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
11243
}
11244
}).pipe(
11245
Effect.provide(
10799
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
11246
+ Layer.mergeAll(
11247
+ IdAllocator.layer,
11248
+ McpProviderSessions.layer,
11249
+ NodeServices.layer,
11250
+ NodeCrypto.layer,
11251
+ ),
11252
),
11253
),
11254
),
@@ -10887,7 +11339,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
11339
assert.isFalse(yield* harness.hasPendingBackgroundWork);
11340
}).pipe(
11341
Effect.provide(
10890
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
11342
+ Layer.mergeAll(
11343
+ IdAllocator.layer,
11344
+ McpProviderSessions.layer,
11345
+ NodeServices.layer,
11346
+ NodeCrypto.layer,
11347
+ ),
11348
),
11349
),
11350
),
@@ -10967,7 +11424,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
11424
assert.isFalse(hasMessageText(staleResultText));
11425
}).pipe(
11426
Effect.provide(
10970
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
11427
+ Layer.mergeAll(
11428
+ IdAllocator.layer,
11429
+ McpProviderSessions.layer,
11430
+ NodeServices.layer,
11431
+ NodeCrypto.layer,
11432
+ ),
11433
),
11434
),
11435
),
@@ -11026,7 +11488,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
11488
assert.lengthOf(harness.terminalEvents(), 1);
11489
}).pipe(
11490
Effect.provide(
11029
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
11491
+ Layer.mergeAll(
11492
+ IdAllocator.layer,
11493
+ McpProviderSessions.layer,
11494
+ NodeServices.layer,
11495
+ NodeCrypto.layer,
11496
+ ),
11497
),
11498
),
11499
),
@@ -11056,7 +11523,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
11523
assert.lengthOf(harness.offeredMessages, 0);
11524
}).pipe(
11525
Effect.provide(
11059
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
11526
+ Layer.mergeAll(
11527
+ IdAllocator.layer,
11528
+ McpProviderSessions.layer,
11529
+ NodeServices.layer,
11530
+ NodeCrypto.layer,
11531
+ ),
11532
),
11533
),
11534
),
@@ -11297,7 +11769,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
11769
);
11770
}).pipe(
11771
Effect.provide(
11300
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
11772
+ Layer.mergeAll(
11773
+ IdAllocator.layer,
11774
+ McpProviderSessions.layer,
11775
+ NodeServices.layer,
11776
+ NodeCrypto.layer,
11777
+ ),
11778
),
11779
),
11780
),
@@ -11456,7 +11933,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
11933
);
11934
}).pipe(
11935
Effect.provide(
11459
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
11936
+ Layer.mergeAll(
11937
+ IdAllocator.layer,
11938
+ McpProviderSessions.layer,
11939
+ NodeServices.layer,
11940
+ NodeCrypto.layer,
11941
+ ),
11942
),
11943
),
11944
),
@@ -11640,7 +12122,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
12122
);
12123
}).pipe(
12124
Effect.provide(
11643
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
12125
+ Layer.mergeAll(
12126
+ IdAllocator.layer,
12127
+ McpProviderSessions.layer,
12128
+ NodeServices.layer,
12129
+ NodeCrypto.layer,
12130
+ ),
12131
),
12132
),
12133
),
@@ -11766,7 +12253,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
12253
assert.lengthOf(harness.continuationRequests, 0);
12254
}).pipe(
12255
Effect.provide(
11769
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
12256
+ Layer.mergeAll(
12257
+ IdAllocator.layer,
12258
+ McpProviderSessions.layer,
12259
+ NodeServices.layer,
12260
+ NodeCrypto.layer,
12261
+ ),
12262
),
12263
),
12264
),
@@ -11846,7 +12338,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
12338
]);
12339
}).pipe(
12340
Effect.provide(
11849
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
12341
+ Layer.mergeAll(
12342
+ IdAllocator.layer,
12343
+ McpProviderSessions.layer,
12344
+ NodeServices.layer,
12345
+ NodeCrypto.layer,
12346
+ ),
12347
),
12348
),
12349
),
@@ -12007,7 +12504,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
12504
]);
12505
}).pipe(
12506
Effect.provide(
12010
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
12507
+ Layer.mergeAll(
12508
+ IdAllocator.layer,
12509
+ McpProviderSessions.layer,
12510
+ NodeServices.layer,
12511
+ NodeCrypto.layer,
12512
+ ),
12513
),
12514
),
12515
),
@@ -12156,7 +12658,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
12658
]);
12659
}).pipe(
12660
Effect.provide(
12159
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
12661
+ Layer.mergeAll(
12662
+ IdAllocator.layer,
12663
+ McpProviderSessions.layer,
12664
+ NodeServices.layer,
12665
+ NodeCrypto.layer,
12666
+ ),
12667
),
12668
),
12669
),
@@ -12323,7 +12830,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
12830
assert.lengthOf(harness.continuationRequests, 1);
12831
}).pipe(
12832
Effect.provide(
12326
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
12833
+ Layer.mergeAll(
12834
+ IdAllocator.layer,
12835
+ McpProviderSessions.layer,
12836
+ NodeServices.layer,
12837
+ NodeCrypto.layer,
12838
+ ),
12839
),
12840
),
12841
),
@@ -12413,7 +12925,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
12925
assert.deepEqual(routing.assistantTexts(harness.threadId), ["The auditor finished."]);
12926
}).pipe(
12927
Effect.provide(
12416
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
12928
+ Layer.mergeAll(
12929
+ IdAllocator.layer,
12930
+ McpProviderSessions.layer,
12931
+ NodeServices.layer,
12932
+ NodeCrypto.layer,
12933
+ ),
12934
),
12935
),
12936
),
@@ -12499,7 +13016,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13016
assert.equal(latest.subagent.completedAt === null, resume);
13017
}).pipe(
13018
Effect.provide(
12502
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
13019
+ Layer.mergeAll(
13020
+ IdAllocator.layer,
13021
+ McpProviderSessions.layer,
13022
+ NodeServices.layer,
13023
+ NodeCrypto.layer,
13024
+ ),
13025
),
13026
),
13027
),
@@ -12611,7 +13133,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13133
});
13134
}).pipe(
13135
Effect.provide(
12614
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
13136
+ Layer.mergeAll(
13137
+ IdAllocator.layer,
13138
+ McpProviderSessions.layer,
13139
+ NodeServices.layer,
13140
+ NodeCrypto.layer,
13141
+ ),
13142
),
13143
),
13144
),
@@ -12725,7 +13252,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13252
assert.equal(closes, 0);
13253
}).pipe(
13254
Effect.provide(
12728
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
13255
+ Layer.mergeAll(
13256
+ IdAllocator.layer,
13257
+ McpProviderSessions.layer,
13258
+ NodeServices.layer,
13259
+ NodeCrypto.layer,
13260
+ ),
13261
),
13262
),
13263
),
@@ -12848,7 +13380,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13380
assert.equal(child?.appThread.modelSelection?.model, initialModel ?? parentModel);
13381
}).pipe(
13382
Effect.provide(
12851
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
13383
+ Layer.mergeAll(
13384
+ IdAllocator.layer,
13385
+ McpProviderSessions.layer,
13386
+ NodeServices.layer,
13387
+ NodeCrypto.layer,
13388
+ ),
13389
),
13390
),
13391
),
@@ -12950,7 +13487,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13487
});
13488
}).pipe(
13489
Effect.provide(
12953
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
13490
+ Layer.mergeAll(
13491
+ IdAllocator.layer,
13492
+ McpProviderSessions.layer,
13493
+ NodeServices.layer,
13494
+ NodeCrypto.layer,
13495
+ ),
13496
),
13497
),
13498
),
@@ -13069,7 +13611,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13611
assert.deepEqual(childEfforts, ["low", "low", "max"]);
13612
}).pipe(
13613
Effect.provide(
13072
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
13614
+ Layer.mergeAll(
13615
+ IdAllocator.layer,
13616
+ McpProviderSessions.layer,
13617
+ NodeServices.layer,
13618
+ NodeCrypto.layer,
13619
+ ),
13620
),
13621
),
13622
),
@@ -13155,7 +13702,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13702
yield* harness.awaitTerminal(1);
13703
}).pipe(
13704
Effect.provide(
13158
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
13705
+ Layer.mergeAll(
13706
+ IdAllocator.layer,
13707
+ McpProviderSessions.layer,
13708
+ NodeServices.layer,
13709
+ NodeCrypto.layer,
13710
+ ),
13711
),
13712
),
13713
),
@@ -13216,7 +13768,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13768
assert.equal(settled.subagent.result, "FORK-DONE");
13769
}).pipe(
13770
Effect.provide(
13219
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
13771
+ Layer.mergeAll(
13772
+ IdAllocator.layer,
13773
+ McpProviderSessions.layer,
13774
+ NodeServices.layer,
13775
+ NodeCrypto.layer,
13776
+ ),
13777
),
13778
),
13779
),
@@ -13313,7 +13870,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
13870
assert.isFalse(yield* harness.hasPendingBackgroundWork);
13871
}).pipe(
13872
Effect.provide(
13316
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
13873
+ Layer.mergeAll(
13874
+ IdAllocator.layer,
13875
+ McpProviderSessions.layer,
13876
+ NodeServices.layer,
13877
+ NodeCrypto.layer,
13878
+ ),
13879
),
13880
),
13881
),
@@ -13570,7 +14132,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14132
assert.isFalse(yield* harness.hasPendingBackgroundWork);
14133
}).pipe(
14134
Effect.provide(
13573
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
14135
+ Layer.mergeAll(
14136
+ IdAllocator.layer,
14137
+ McpProviderSessions.layer,
14138
+ NodeServices.layer,
14139
+ NodeCrypto.layer,
14140
+ ),
14141
),
14142
),
14143
),
@@ -13596,7 +14163,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14163
attachmentsDir,
14164
fileSystem,
14165
path: yield* Path.Path,
13599
- crypto: yield* Crypto.Crypto,
14166
+ random: yield* SecureRandom.SecureRandom,
14167
idAllocator,
14168
continuationRequests: {
14169
offer: (request) =>
@@ -13737,7 +14304,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14304
);
14305
}).pipe(
14306
Effect.provide(
13740
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
14307
+ Layer.mergeAll(
14308
+ IdAllocator.layer,
14309
+ McpProviderSessions.layer,
14310
+ NodeServices.layer,
14311
+ NodeCrypto.layer,
14312
+ ),
14313
),
14314
),
14315
),
@@ -13765,7 +14337,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14337
attachmentsDir,
14338
fileSystem,
14339
path: yield* Path.Path,
13768
- crypto: yield* Crypto.Crypto,
14340
+ random: yield* SecureRandom.SecureRandom,
14341
idAllocator,
14342
continuationRequests: {
14343
offer: (request) =>
@@ -13916,7 +14488,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14488
assert.isFalse(yield* hasPendingBackgroundWork);
14489
}).pipe(
14490
Effect.provide(
13919
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
14491
+ Layer.mergeAll(
14492
+ IdAllocator.layer,
14493
+ McpProviderSessions.layer,
14494
+ NodeServices.layer,
14495
+ NodeCrypto.layer,
14496
+ ),
14497
),
14498
),
14499
),
@@ -13942,7 +14519,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14519
attachmentsDir,
14520
fileSystem,
14521
path: yield* Path.Path,
13945
- crypto: yield* Crypto.Crypto,
14522
+ random: yield* SecureRandom.SecureRandom,
14523
idAllocator,
14524
continuationRequests: { offer: () => Effect.void },
14525
queryRunner: {
@@ -14101,7 +14678,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14678
assert.lengthOf(processQueues, 3);
14679
}).pipe(
14680
Effect.provide(
14104
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
14681
+ Layer.mergeAll(
14682
+ IdAllocator.layer,
14683
+ McpProviderSessions.layer,
14684
+ NodeServices.layer,
14685
+ NodeCrypto.layer,
14686
+ ),
14687
),
14688
),
14689
),
@@ -14132,7 +14714,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14714
}),
14715
fileSystem,
14716
path: yield* Path.Path,
14135
- crypto: yield* Crypto.Crypto,
14717
+ random: yield* SecureRandom.SecureRandom,
14718
idAllocator: yield* IdAllocator.IdAllocatorV2,
14719
continuationRequests: { offer: () => Effect.void },
14720
queryRunner: {
@@ -14232,7 +14814,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14814
assert.equal(closes, 0);
14815
}).pipe(
14816
Effect.provide(
14235
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
14817
+ Layer.mergeAll(
14818
+ IdAllocator.layer,
14819
+ McpProviderSessions.layer,
14820
+ NodeServices.layer,
14821
+ NodeCrypto.layer,
14822
+ ),
14823
),
14824
),
14825
),
@@ -14259,7 +14846,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14846
attachmentsDir,
14847
fileSystem,
14848
path: yield* Path.Path,
14262
- crypto: yield* Crypto.Crypto,
14849
+ random: yield* SecureRandom.SecureRandom,
14850
idAllocator,
14851
continuationRequests: {
14852
offer: () => Effect.void,
@@ -14361,7 +14948,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
14948
assert.isTrue(yield* hasPendingBackgroundWork);
14949
}).pipe(
14950
Effect.provide(
14364
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
14951
+ Layer.mergeAll(
14952
+ IdAllocator.layer,
14953
+ McpProviderSessions.layer,
14954
+ NodeServices.layer,
14955
+ NodeCrypto.layer,
14956
+ ),
14957
),
14958
),
14959
),
@@ -14641,7 +15233,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
15233
assert.isFalse(yield* harness.hasPendingBackgroundWork);
15234
}).pipe(
15235
Effect.provide(
14644
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
15236
+ Layer.mergeAll(
15237
+ IdAllocator.layer,
15238
+ McpProviderSessions.layer,
15239
+ NodeServices.layer,
15240
+ NodeCrypto.layer,
15241
+ ),
15242
),
15243
),
15244
),
@@ -14725,7 +15322,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
15322
});
15323
}).pipe(
15324
Effect.provide(
14728
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
15325
+ Layer.mergeAll(
15326
+ IdAllocator.layer,
15327
+ McpProviderSessions.layer,
15328
+ NodeServices.layer,
15329
+ NodeCrypto.layer,
15330
+ ),
15331
),
15332
),
15333
),
@@ -14833,7 +15435,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
15435
assert.deepEqual(stoppedTasks, [WORKFLOW_TASK_ID]);
15436
}).pipe(
15437
Effect.provide(
14836
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
15438
+ Layer.mergeAll(
15439
+ IdAllocator.layer,
15440
+ McpProviderSessions.layer,
15441
+ NodeServices.layer,
15442
+ NodeCrypto.layer,
15443
+ ),
15444
),
15445
),
15446
),
@@ -15088,7 +15695,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
15695
);
15696
}).pipe(
15697
Effect.provide(
15091
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
15698
+ Layer.mergeAll(
15699
+ IdAllocator.layer,
15700
+ McpProviderSessions.layer,
15701
+ NodeServices.layer,
15702
+ NodeCrypto.layer,
15703
+ ),
15704
),
15705
),
15706
),
@@ -15178,7 +15790,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
15790
);
15791
}).pipe(
15792
Effect.provide(
15181
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
15793
+ Layer.mergeAll(
15794
+ IdAllocator.layer,
15795
+ McpProviderSessions.layer,
15796
+ NodeServices.layer,
15797
+ NodeCrypto.layer,
15798
+ ),
15799
),
15800
),
15801
),
@@ -15406,7 +16023,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
16023
);
16024
}).pipe(
16025
Effect.provide(
15409
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
16026
+ Layer.mergeAll(
16027
+ IdAllocator.layer,
16028
+ McpProviderSessions.layer,
16029
+ NodeServices.layer,
16030
+ NodeCrypto.layer,
16031
+ ),
16032
),
16033
),
16034
),
@@ -15526,7 +16148,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
16148
);
16149
}).pipe(
16150
Effect.provide(
15529
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
16151
+ Layer.mergeAll(
16152
+ IdAllocator.layer,
16153
+ McpProviderSessions.layer,
16154
+ NodeServices.layer,
16155
+ NodeCrypto.layer,
16156
+ ),
16157
),
16158
),
16159
),
@@ -15632,7 +16259,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
16259
}
16260
}).pipe(
16261
Effect.provide(
15635
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
16262
+ Layer.mergeAll(
16263
+ IdAllocator.layer,
16264
+ McpProviderSessions.layer,
16265
+ NodeServices.layer,
16266
+ NodeCrypto.layer,
16267
+ ),
16268
),
16269
),
16270
),
@@ -15723,7 +16355,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
16355
);
16356
}).pipe(
16357
Effect.provide(
15726
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
16358
+ Layer.mergeAll(
16359
+ IdAllocator.layer,
16360
+ McpProviderSessions.layer,
16361
+ NodeServices.layer,
16362
+ NodeCrypto.layer,
16363
+ ),
16364
),
16365
),
16366
),
@@ -15957,7 +16594,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
16594
);
16595
}).pipe(
16596
Effect.provide(
15960
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
16597
+ Layer.mergeAll(
16598
+ IdAllocator.layer,
16599
+ McpProviderSessions.layer,
16600
+ NodeServices.layer,
16601
+ NodeCrypto.layer,
16602
+ ),
16603
),
16604
),
16605
),
@@ -16159,7 +16801,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
16801
);
16802
}).pipe(
16803
Effect.provide(
16162
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
16804
+ Layer.mergeAll(
16805
+ IdAllocator.layer,
16806
+ McpProviderSessions.layer,
16807
+ NodeServices.layer,
16808
+ NodeCrypto.layer,
16809
+ ),
16810
),
16811
),
16812
),
@@ -16206,7 +16853,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
16853
yield* Queue.take(harness.terminalReceipts);
16854
}).pipe(
16855
Effect.provide(
16209
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
16856
+ Layer.mergeAll(
16857
+ IdAllocator.layer,
16858
+ McpProviderSessions.layer,
16859
+ NodeServices.layer,
16860
+ NodeCrypto.layer,
16861
+ ),
16862
),
16863
),
16864
),
@@ -16259,7 +16911,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
16911
yield* Queue.take(harness.terminalReceipts);
16912
}).pipe(
16913
Effect.provide(
16262
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
16914
+ Layer.mergeAll(
16915
+ IdAllocator.layer,
16916
+ McpProviderSessions.layer,
16917
+ NodeServices.layer,
16918
+ NodeCrypto.layer,
16919
+ ),
16920
),
16921
),
16922
),
@@ -16308,7 +16965,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
16965
);
16966
}).pipe(
16967
Effect.provide(
16311
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
16968
+ Layer.mergeAll(
16969
+ IdAllocator.layer,
16970
+ McpProviderSessions.layer,
16971
+ NodeServices.layer,
16972
+ NodeCrypto.layer,
16973
+ ),
16974
),
16975
),
16976
),
@@ -16394,7 +17056,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
17056
}).pipe(
17057
Effect.scoped,
17058
Effect.provide(
16397
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
17059
+ Layer.mergeAll(
17060
+ IdAllocator.layer,
17061
+ McpProviderSessions.layer,
17062
+ NodeServices.layer,
17063
+ NodeCrypto.layer,
17064
+ ),
17065
),
17066
),
17067
);
@@ -16483,7 +17150,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
17150
}).pipe(
17151
Effect.scoped,
17152
Effect.provide(
16486
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
17153
+ Layer.mergeAll(
17154
+ IdAllocator.layer,
17155
+ McpProviderSessions.layer,
17156
+ NodeServices.layer,
17157
+ NodeCrypto.layer,
17158
+ ),
17159
),
17160
),
17161
);
@@ -16526,7 +17198,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
17198
}).pipe(
17199
Effect.scoped,
17200
Effect.provide(
16529
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
17201
+ Layer.mergeAll(
17202
+ IdAllocator.layer,
17203
+ McpProviderSessions.layer,
17204
+ NodeServices.layer,
17205
+ NodeCrypto.layer,
17206
+ ),
17207
),
17208
),
17209
);
@@ -16565,7 +17242,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
17242
}).pipe(
17243
Effect.scoped,
17244
Effect.provide(
16568
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
17245
+ Layer.mergeAll(
17246
+ IdAllocator.layer,
17247
+ McpProviderSessions.layer,
17248
+ NodeServices.layer,
17249
+ NodeCrypto.layer,
17250
+ ),
17251
),
17252
),
17253
);
@@ -16614,7 +17296,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
17296
}).pipe(
17297
Effect.scoped,
17298
Effect.provide(
16617
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
17299
+ Layer.mergeAll(
17300
+ IdAllocator.layer,
17301
+ McpProviderSessions.layer,
17302
+ NodeServices.layer,
17303
+ NodeCrypto.layer,
17304
+ ),
17305
),
17306
),
17307
);
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.testkit.ts
+8
-6
@@ -8,6 +8,7 @@ import {
8
type SDKMessage,
9
type SDKUserMessage,
10
} from "@anthropic-ai/claude-agent-sdk";
11
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
12
import * as NodeServices from "@effect/platform-node/NodeServices";
13
import * as HostProcess from "@t3tools/shared/HostProcess";
14
import { SpawnExecutableResolution } from "@t3tools/shared/shell";
@@ -18,7 +19,7 @@ import {
19
type ProviderReplayTranscript,
20
} from "@t3tools/contracts";
21
import * as Cause from "effect/Cause";
21
-import * as Crypto from "effect/Crypto";
22
+import * as SecureRandom from "effect/crypto/SecureRandom";
23
import * as Duration from "effect/Duration";
24
import * as Effect from "effect/Effect";
25
import * as Exit from "effect/Exit";
@@ -1023,7 +1024,7 @@ function layerClaudeProviderAdapterRegistryReplay(
1024
const layerServerConfig = Layer.effect(
1025
ServerConfig.ServerConfig,
1026
makeReplayServerConfig(transcript.scenario).pipe(Effect.orDie),
1026
- ).pipe(Layer.provide(NodeServices.layer));
1027
+ ).pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
1028
return Layer.unwrap(
1029
writeReplayTaskOutputFiles(transcript).pipe(
1030
Effect.orDie,
@@ -1041,7 +1042,7 @@ function layerClaudeProviderAdapterRegistryReplay(
1042
).pipe(Effect.map((adapter) => [adapter])),
1043
),
1044
),
1044
- Effect.provide(NodeServices.layer),
1045
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1046
),
1047
).pipe(
1048
Layer.provide(
@@ -1049,6 +1050,7 @@ function layerClaudeProviderAdapterRegistryReplay(
1050
layerClaudeAgentSdkReplay(transcript, options),
1051
IdAllocator.layer,
1052
NodeServices.layer,
1053
+ NodeCrypto.layer,
1054
layerServerConfig,
1055
),
1056
),
@@ -1611,10 +1613,10 @@ async function recordClaudeStreamingQuery(input: {
1613
const message = ClaudeAdapterV2.makeClaudeUserMessage({
1614
text: prompt,
1615
uuid: await Effect.runPromise(
1614
- Crypto.Crypto.pipe(
1615
- Effect.flatMap((crypto) => crypto.randomUUIDv4()),
1616
+ SecureRandom.SecureRandom.pipe(
1617
+ Effect.flatMap((random) => random.uuidV4()),
1618
Effect.filterOrFail(ClaudeAdapterV2.isClaudePromptUuid),
1617
- Effect.provide(NodeServices.layer),
1619
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1620
),
1621
),
1622
});
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+10
-12
@@ -120,7 +120,7 @@ import { FILE_HEADERS_ONLY, formatPatch, structuredPatch } from "diff";
120
import * as Cause from "effect/Cause";
121
import * as Clock from "effect/Clock";
122
import * as Context from "effect/Context";
123
-import * as Crypto from "effect/Crypto";
123
+import * as SecureRandom from "effect/crypto/SecureRandom";
124
import * as DateTime from "effect/DateTime";
125
import * as Deferred from "effect/Deferred";
126
import * as Effect from "effect/Effect";
@@ -939,14 +939,14 @@ export const layerQueryRunner: Layer.Layer<
939
ClaudeAgentSdkQueryRunner,
940
never,
941
| ChildProcessSpawner.ChildProcessSpawner
942
- | Crypto.Crypto
942
+ | SecureRandom.SecureRandom
943
| Path.Path
944
| PortScanner.PortDiscovery
945
| ProviderEventLoggers.ProviderEventLoggers
946
> = Layer.effect(
947
ClaudeAgentSdkQueryRunner,
948
Effect.gen(function* () {
949
- const crypto = yield* Crypto.Crypto;
949
+ const random = yield* SecureRandom.SecureRandom;
950
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
951
const path = yield* Path.Path;
952
const { native: nativeEventLogger } = yield* ProviderEventLoggers.ProviderEventLoggers;
@@ -957,9 +957,7 @@ export const layerQueryRunner: Layer.Layer<
957
const portDiscovery = yield* PortScanner.PortDiscovery;
958
959
return ClaudeAgentSdkQueryRunner.of({
960
- allocateSessionId: crypto
961
- .randomUUIDv4()
962
- .pipe(Effect.mapError((cause) => queryRunnerError(cause, "allocateSessionId"))),
960
+ allocateSessionId: random.uuidV4(),
961
open: Effect.fn("ClaudeAgentSdkQueryRunner.open")(
962
function* (input: ClaudeAgentSdkQueryOpenInput) {
963
const protocolLogger = makeClaudeAgentSdkProtocolLogger({
@@ -4537,7 +4535,7 @@ export interface ClaudeAdapterV2Options {
4535
readonly attachmentsDir: string;
4536
readonly fileSystem: FileSystem.FileSystem;
4537
readonly path: Path.Path;
4540
- readonly crypto: Crypto.Crypto;
4538
+ readonly random: SecureRandom.SecureRandom["Service"];
4539
readonly idAllocator: IdAllocator.IdAllocatorV2["Service"];
4540
readonly queryRunner: ClaudeAgentSdkQueryRunnerShape;
4541
readonly scopedLimitNames?: Ref.Ref<ClaudeScopedLimitNames>;
@@ -4555,7 +4553,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
4553
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
4554
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
4555
const serverSettings = yield* Effect.serviceOption(ServerSettings.ServerSettingsService);
4558
- const { attachmentsDir, fileSystem, path, crypto, idAllocator, queryRunner } = adapterOptions;
4556
+ const { attachmentsDir, fileSystem, path, random, idAllocator, queryRunner } = adapterOptions;
4557
const subagentModelCatalog = scopeClaudeModelCatalog(
4558
BUNDLED_CLAUDE_MODEL_CATALOG,
4559
adapterOptions.settings.customModels,
@@ -10524,7 +10522,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
10522
// Use fresh uuids: native sessions can outlive this database, and Claude skips previously recorded prompts.
10523
const promptUuid = isClaudeProviderContinuationTurn(turnInput)
10524
? null
10527
- : yield* crypto.randomUUIDv4().pipe(
10525
+ : yield* random.uuidV4().pipe(
10526
Effect.filterOrFail(isClaudePromptUuid),
10527
Effect.mapError(
10528
(cause) =>
@@ -11646,7 +11644,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
11644
export type ClaudeAdapterV2DriverEnv =
11645
| ChildProcessSpawner.ChildProcessSpawner
11646
| ClaudeAgentSdkQueryRunner
11649
- | Crypto.Crypto
11647
+ | SecureRandom.SecureRandom
11648
| FileSystem.FileSystem
11649
| IdAllocator.IdAllocatorV2
11650
| McpProviderSessions.McpProviderSessions
@@ -11672,7 +11670,7 @@ export const createClaudeAdapterV2 = Effect.fn("ClaudeAdapterV2Driver.create")(
11670
);
11671
const claudeEnvironment = yield* makeClaudeEnvironment(config, baseEnvironment);
11672
const path = yield* Path.Path;
11675
- const crypto = yield* Crypto.Crypto;
11673
+ const random = yield* SecureRandom.SecureRandom;
11674
const binaryPath = yield* resolveClaudeSdkExecutablePath(
11675
expandHomePath(config.binaryPath, yield* HostProcess.HomeDirectory),
11676
claudeEnvironment,
@@ -11684,7 +11682,7 @@ export const createClaudeAdapterV2 = Effect.fn("ClaudeAdapterV2Driver.create")(
11682
attachmentsDir: serverConfig.attachmentsDir,
11683
fileSystem,
11684
path,
11687
- crypto,
11685
+ random,
11686
idAllocator,
11687
queryRunner,
11688
continuationRequests,
apps/server/src/orchestration-v2/Adapters/ClaudeAgentSdkQueryRunner.test.ts
+4
-3
@@ -6,6 +6,7 @@ import * as NodeFS from "node:fs";
6
import * as NodeOS from "node:os";
7
import * as NodePath from "node:path";
8
import * as NodeStream from "node:stream";
9
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
10
import * as NodeServices from "@effect/platform-node/NodeServices";
11
import { assert, describe, it } from "@effect/vitest";
12
import { ProviderSessionId, ThreadId } from "@t3tools/contracts";
@@ -109,7 +110,7 @@ it.effect("forks a session stored under the instance's own CLAUDE_CONFIG_DIR", (
110
assert.equal(process.env.CLAUDE_CONFIG_DIR, hostConfigDir);
111
assert.equal(inProcessFork.mock.calls.length, 0);
112
}).pipe(Effect.provide(forkRunnerLayer)),
112
- ).pipe(Effect.provide(NodeServices.layer)),
113
+ ).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
114
);
115
const realQueryRunner = layerQueryRunner.pipe(
116
Layer.provide(PortScanner.layerTest),
@@ -119,7 +120,7 @@ const realQueryRunner = layerQueryRunner.pipe(
120
canonical: undefined,
121
}),
122
),
122
- Layer.provide(NodeServices.layer),
123
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
124
);
125
126
const resumedMcpQueryInput = {
@@ -510,7 +511,7 @@ describe.skipIf(HostProcess.Platform.defaultValue() === "win32")("Claude CLI pro
511
Layer.provide(
512
Layer.succeed(ProviderEventLoggers, { native: undefined, canonical: undefined }),
513
),
513
- Layer.provide(NodeServices.layer),
514
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
515
);
516
return Effect.gen(function* () {
517
const cli = fakeClaudeCli(
apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts
+367
-66
@@ -3,6 +3,7 @@ import {
3
makeProviderTextDeltaCoalescer,
4
type ProviderTextDeltaUpdate,
5
} from "./ProviderTextDeltaCoalescer.ts";
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import {
9
CommandId,
@@ -37,7 +38,7 @@ import * as CodexError from "effect-codex-app-server/errors";
38
import type * as CodexSchema from "effect-codex-app-server/schema";
39
import * as DateTime from "effect/DateTime";
40
import * as Deferred from "effect/Deferred";
40
-import * as Crypto from "effect/Crypto";
41
+import * as Digest from "effect/crypto/Digest";
42
import * as Effect from "effect/Effect";
43
import * as Predicate from "effect/Predicate";
44
import * as FileSystem from "effect/FileSystem";
@@ -795,7 +796,7 @@ describe("CodexAdapterV2 process exit", () => {
796
settings: DEFAULT_CODEX_SETTINGS,
797
environment: {},
798
clientFactory: { open: () => Effect.succeed(client) },
798
- crypto: yield* Crypto.Crypto,
799
+ digest: yield* Digest.Digest,
800
fileSystem: yield* FileSystem.FileSystem,
801
idAllocator: yield* IdAllocator.IdAllocatorV2,
802
serverConfig: yield* ProviderReplayHarness.makeReplayServerConfig(scenario).pipe(
@@ -875,7 +876,12 @@ describe("CodexAdapterV2 process exit", () => {
876
}).pipe(
877
Effect.scoped,
878
Effect.provide(
878
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
879
+ Layer.mergeAll(
880
+ IdAllocator.layer,
881
+ McpProviderSessions.layer,
882
+ NodeServices.layer,
883
+ NodeCrypto.layer,
884
+ ),
885
),
886
),
887
);
@@ -924,7 +930,7 @@ describe("CodexAdapterV2 session initialize", () => {
930
),
931
),
932
},
927
- crypto: yield* Crypto.Crypto,
933
+ digest: yield* Digest.Digest,
934
fileSystem: yield* FileSystem.FileSystem,
935
idAllocator: yield* IdAllocator.IdAllocatorV2,
936
serverConfig: yield* ProviderReplayHarness.makeReplayServerConfig(transcript.scenario).pipe(
@@ -992,7 +998,12 @@ describe("CodexAdapterV2 session initialize", () => {
998
}).pipe(
999
Effect.scoped,
1000
Effect.provide(
995
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1001
+ Layer.mergeAll(
1002
+ IdAllocator.layer,
1003
+ McpProviderSessions.layer,
1004
+ NodeServices.layer,
1005
+ NodeCrypto.layer,
1006
+ ),
1007
),
1008
),
1009
);
@@ -1024,7 +1035,12 @@ describe("CodexAdapterV2 session initialize", () => {
1035
}).pipe(
1036
Effect.scoped,
1037
Effect.provide(
1027
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1038
+ Layer.mergeAll(
1039
+ IdAllocator.layer,
1040
+ McpProviderSessions.layer,
1041
+ NodeServices.layer,
1042
+ NodeCrypto.layer,
1043
+ ),
1044
),
1045
),
1046
);
@@ -1072,7 +1088,12 @@ describe("CodexAdapterV2 session initialize", () => {
1088
}).pipe(
1089
Effect.scoped,
1090
Effect.provide(
1075
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1091
+ Layer.mergeAll(
1092
+ IdAllocator.layer,
1093
+ McpProviderSessions.layer,
1094
+ NodeServices.layer,
1095
+ NodeCrypto.layer,
1096
+ ),
1097
),
1098
),
1099
);
@@ -1118,7 +1139,12 @@ describe("CodexAdapterV2 session initialize", () => {
1139
}).pipe(
1140
Effect.scoped,
1141
Effect.provide(
1121
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1142
+ Layer.mergeAll(
1143
+ IdAllocator.layer,
1144
+ McpProviderSessions.layer,
1145
+ NodeServices.layer,
1146
+ NodeCrypto.layer,
1147
+ ),
1148
),
1149
),
1150
);
@@ -1204,7 +1230,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
1230
settings: DEFAULT_CODEX_SETTINGS,
1231
environment: {},
1232
clientFactory,
1207
- crypto: yield* Crypto.Crypto,
1233
+ digest: yield* Digest.Digest,
1234
fileSystem,
1235
idAllocator,
1236
serverConfig,
@@ -1375,7 +1401,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
1401
}).pipe(
1402
Effect.scoped,
1403
Effect.provide(
1378
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1404
+ Layer.mergeAll(
1405
+ IdAllocator.layer,
1406
+ McpProviderSessions.layer,
1407
+ NodeServices.layer,
1408
+ NodeCrypto.layer,
1409
+ ),
1410
),
1411
),
1412
);
@@ -1485,7 +1516,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
1516
}).pipe(
1517
Effect.scoped,
1518
Effect.provide(
1488
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1519
+ Layer.mergeAll(
1520
+ IdAllocator.layer,
1521
+ McpProviderSessions.layer,
1522
+ NodeServices.layer,
1523
+ NodeCrypto.layer,
1524
+ ),
1525
),
1526
),
1527
);
@@ -1545,7 +1581,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
1581
}).pipe(
1582
Effect.scoped,
1583
Effect.provide(
1548
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1584
+ Layer.mergeAll(
1585
+ IdAllocator.layer,
1586
+ McpProviderSessions.layer,
1587
+ NodeServices.layer,
1588
+ NodeCrypto.layer,
1589
+ ),
1590
),
1591
),
1592
);
@@ -1711,7 +1752,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
1752
}).pipe(
1753
Effect.scoped,
1754
Effect.provide(
1714
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1755
+ Layer.mergeAll(
1756
+ IdAllocator.layer,
1757
+ McpProviderSessions.layer,
1758
+ NodeServices.layer,
1759
+ NodeCrypto.layer,
1760
+ ),
1761
),
1762
),
1763
);
@@ -1859,7 +1905,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
1905
assert.isEmpty(assistantMessages(harness.events));
1906
}).pipe(
1907
Effect.provide(
1862
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
1908
+ Layer.mergeAll(
1909
+ IdAllocator.layer,
1910
+ McpProviderSessions.layer,
1911
+ NodeServices.layer,
1912
+ NodeCrypto.layer,
1913
+ ),
1914
),
1915
),
1916
),
@@ -2066,7 +2117,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
2117
assert.lengthOf(requests(), 4);
2118
}).pipe(
2119
Effect.provide(
2069
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
2120
+ Layer.mergeAll(
2121
+ IdAllocator.layer,
2122
+ McpProviderSessions.layer,
2123
+ NodeServices.layer,
2124
+ NodeCrypto.layer,
2125
+ ),
2126
),
2127
),
2128
),
@@ -2164,7 +2220,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
2220
assert.equal(harness.terminalEvents()[0]?.status, "completed");
2221
}).pipe(
2222
Effect.provide(
2167
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
2223
+ Layer.mergeAll(
2224
+ IdAllocator.layer,
2225
+ McpProviderSessions.layer,
2226
+ NodeServices.layer,
2227
+ NodeCrypto.layer,
2228
+ ),
2229
),
2230
),
2231
),
@@ -2244,7 +2305,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
2305
assert.equal(harness.terminalEvents()[0]?.status, "completed");
2306
}).pipe(
2307
Effect.provide(
2247
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
2308
+ Layer.mergeAll(
2309
+ IdAllocator.layer,
2310
+ McpProviderSessions.layer,
2311
+ NodeServices.layer,
2312
+ NodeCrypto.layer,
2313
+ ),
2314
),
2315
),
2316
),
@@ -2381,7 +2447,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
2447
}
2448
}).pipe(
2449
Effect.provide(
2384
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
2450
+ Layer.mergeAll(
2451
+ IdAllocator.layer,
2452
+ McpProviderSessions.layer,
2453
+ NodeServices.layer,
2454
+ NodeCrypto.layer,
2455
+ ),
2456
),
2457
),
2458
),
@@ -2492,7 +2563,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
2563
}).pipe(
2564
Effect.scoped,
2565
Effect.provide(
2495
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
2566
+ Layer.mergeAll(
2567
+ IdAllocator.layer,
2568
+ McpProviderSessions.layer,
2569
+ NodeServices.layer,
2570
+ NodeCrypto.layer,
2571
+ ),
2572
),
2573
),
2574
);
@@ -2600,7 +2676,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
2676
assert.deepEqual(resumeThreadEnvs, [harness.threadId, undefined, explicitThreadId]);
2677
}).pipe(
2678
Effect.provide(
2603
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
2679
+ Layer.mergeAll(
2680
+ IdAllocator.layer,
2681
+ McpProviderSessions.layer,
2682
+ NodeServices.layer,
2683
+ NodeCrypto.layer,
2684
+ ),
2685
),
2686
),
2687
),
@@ -2728,7 +2809,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
2809
assert.equal(DateTime.toEpochMillis(resumed.updatedAt), 1782622450000);
2810
}).pipe(
2811
Effect.provide(
2731
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
2812
+ Layer.mergeAll(
2813
+ IdAllocator.layer,
2814
+ McpProviderSessions.layer,
2815
+ NodeServices.layer,
2816
+ NodeCrypto.layer,
2817
+ ),
2818
),
2819
),
2820
),
@@ -3158,7 +3244,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
3244
}
3245
}).pipe(
3246
Effect.provide(
3161
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3247
+ Layer.mergeAll(
3248
+ IdAllocator.layer,
3249
+ McpProviderSessions.layer,
3250
+ NodeServices.layer,
3251
+ NodeCrypto.layer,
3252
+ ),
3253
),
3254
),
3255
),
@@ -3310,7 +3401,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
3401
assert.isAbove(terminalIndex, resumedCommandIndex);
3402
}).pipe(
3403
Effect.provide(
3313
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3404
+ Layer.mergeAll(
3405
+ IdAllocator.layer,
3406
+ McpProviderSessions.layer,
3407
+ NodeServices.layer,
3408
+ NodeCrypto.layer,
3409
+ ),
3410
),
3411
),
3412
),
@@ -3478,7 +3574,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
3574
assert.deepEqual(assistantMessages(harness.events), []);
3575
}).pipe(
3576
Effect.provide(
3481
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3577
+ Layer.mergeAll(
3578
+ IdAllocator.layer,
3579
+ McpProviderSessions.layer,
3580
+ NodeServices.layer,
3581
+ NodeCrypto.layer,
3582
+ ),
3583
),
3584
),
3585
),
@@ -3611,7 +3712,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
3712
);
3713
}).pipe(
3714
Effect.provide(
3614
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3715
+ Layer.mergeAll(
3716
+ IdAllocator.layer,
3717
+ McpProviderSessions.layer,
3718
+ NodeServices.layer,
3719
+ NodeCrypto.layer,
3720
+ ),
3721
),
3722
),
3723
),
@@ -3693,7 +3799,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
3799
}).pipe(
3800
Effect.scoped,
3801
Effect.provide(
3696
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3802
+ Layer.mergeAll(
3803
+ IdAllocator.layer,
3804
+ McpProviderSessions.layer,
3805
+ NodeServices.layer,
3806
+ NodeCrypto.layer,
3807
+ ),
3808
),
3809
),
3810
);
@@ -3816,7 +3927,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
3927
}).pipe(
3928
Effect.scoped,
3929
Effect.provide(
3819
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3930
+ Layer.mergeAll(
3931
+ IdAllocator.layer,
3932
+ McpProviderSessions.layer,
3933
+ NodeServices.layer,
3934
+ NodeCrypto.layer,
3935
+ ),
3936
),
3937
),
3938
);
@@ -3848,7 +3964,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
3964
);
3965
}).pipe(
3966
Effect.provide(
3851
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
3967
+ Layer.mergeAll(
3968
+ IdAllocator.layer,
3969
+ McpProviderSessions.layer,
3970
+ NodeServices.layer,
3971
+ NodeCrypto.layer,
3972
+ ),
3973
),
3974
),
3975
),
@@ -4066,7 +4187,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
4187
}).pipe(
4188
Effect.scoped,
4189
Effect.provide(
4069
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4190
+ Layer.mergeAll(
4191
+ IdAllocator.layer,
4192
+ McpProviderSessions.layer,
4193
+ NodeServices.layer,
4194
+ NodeCrypto.layer,
4195
+ ),
4196
),
4197
),
4198
);
@@ -4222,7 +4348,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
4348
assert.lengthOf(harness.continuationRequests, 0);
4349
}).pipe(
4350
Effect.provide(
4225
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4351
+ Layer.mergeAll(
4352
+ IdAllocator.layer,
4353
+ McpProviderSessions.layer,
4354
+ NodeServices.layer,
4355
+ NodeCrypto.layer,
4356
+ ),
4357
),
4358
),
4359
);
@@ -4352,7 +4483,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
4483
),
4484
),
4485
);
4355
- }).pipe(Effect.provide(NodeServices.layer)),
4486
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
4487
);
4488
});
4489
@@ -4468,7 +4599,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
4599
),
4600
),
4601
);
4471
- }).pipe(Effect.provide(NodeServices.layer)),
4602
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
4603
),
4604
);
4605
@@ -4751,7 +4882,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
4882
assert.equal(commandUpdates[commandUpdates.length - 1]?.turnItem.status, "interrupted");
4883
}).pipe(
4884
Effect.provide(
4754
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
4885
+ Layer.mergeAll(
4886
+ IdAllocator.layer,
4887
+ McpProviderSessions.layer,
4888
+ NodeServices.layer,
4889
+ NodeCrypto.layer,
4890
+ ),
4891
),
4892
),
4893
),
@@ -4981,7 +5117,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
5117
assert.isFalse(yield* harness.hasPendingBackgroundWork);
5118
}).pipe(
5119
Effect.provide(
4984
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5120
+ Layer.mergeAll(
5121
+ IdAllocator.layer,
5122
+ McpProviderSessions.layer,
5123
+ NodeServices.layer,
5124
+ NodeCrypto.layer,
5125
+ ),
5126
),
5127
),
5128
),
@@ -5092,7 +5233,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
5233
assert.isFalse(yield* harness.hasPendingBackgroundWork);
5234
}).pipe(
5235
Effect.provide(
5095
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5236
+ Layer.mergeAll(
5237
+ IdAllocator.layer,
5238
+ McpProviderSessions.layer,
5239
+ NodeServices.layer,
5240
+ NodeCrypto.layer,
5241
+ ),
5242
),
5243
),
5244
),
@@ -5218,7 +5364,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
5364
);
5365
}).pipe(
5366
Effect.provide(
5221
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5367
+ Layer.mergeAll(
5368
+ IdAllocator.layer,
5369
+ McpProviderSessions.layer,
5370
+ NodeServices.layer,
5371
+ NodeCrypto.layer,
5372
+ ),
5373
),
5374
),
5375
),
@@ -5466,7 +5617,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
5617
}
5618
}).pipe(
5619
Effect.provide(
5469
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5620
+ Layer.mergeAll(
5621
+ IdAllocator.layer,
5622
+ McpProviderSessions.layer,
5623
+ NodeServices.layer,
5624
+ NodeCrypto.layer,
5625
+ ),
5626
),
5627
),
5628
),
@@ -5577,7 +5733,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
5733
if (willRetry) assert.equal(terminal.retry?.attempt, 1);
5734
}).pipe(
5735
Effect.provide(
5580
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5736
+ Layer.mergeAll(
5737
+ IdAllocator.layer,
5738
+ McpProviderSessions.layer,
5739
+ NodeServices.layer,
5740
+ NodeCrypto.layer,
5741
+ ),
5742
),
5743
),
5744
),
@@ -5679,7 +5840,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
5840
assert.lengthOf(harness.continuationRequests, 0);
5841
}).pipe(
5842
Effect.provide(
5682
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
5843
+ Layer.mergeAll(
5844
+ IdAllocator.layer,
5845
+ McpProviderSessions.layer,
5846
+ NodeServices.layer,
5847
+ NodeCrypto.layer,
5848
+ ),
5849
),
5850
),
5851
),
@@ -5842,7 +6008,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
6008
assert.isFalse(yield* harness.hasPendingBackgroundWork);
6009
}).pipe(
6010
Effect.provide(
5845
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6011
+ Layer.mergeAll(
6012
+ IdAllocator.layer,
6013
+ McpProviderSessions.layer,
6014
+ NodeServices.layer,
6015
+ NodeCrypto.layer,
6016
+ ),
6017
),
6018
),
6019
),
@@ -5909,7 +6080,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
6080
assert.isFalse(yield* harness.hasPendingBackgroundWork);
6081
}).pipe(
6082
Effect.provide(
5912
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6083
+ Layer.mergeAll(
6084
+ IdAllocator.layer,
6085
+ McpProviderSessions.layer,
6086
+ NodeServices.layer,
6087
+ NodeCrypto.layer,
6088
+ ),
6089
),
6090
),
6091
),
@@ -6155,7 +6331,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
6331
assert.isFalse(yield* harness.hasPendingBackgroundWork);
6332
}).pipe(
6333
Effect.provide(
6158
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6334
+ Layer.mergeAll(
6335
+ IdAllocator.layer,
6336
+ McpProviderSessions.layer,
6337
+ NodeServices.layer,
6338
+ NodeCrypto.layer,
6339
+ ),
6340
),
6341
),
6342
),
@@ -6370,7 +6551,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
6551
assert.equal(harness.continuationRequests[0]?.delivery, "message_text");
6552
}).pipe(
6553
Effect.provide(
6373
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6554
+ Layer.mergeAll(
6555
+ IdAllocator.layer,
6556
+ McpProviderSessions.layer,
6557
+ NodeServices.layer,
6558
+ NodeCrypto.layer,
6559
+ ),
6560
),
6561
),
6562
),
@@ -6523,7 +6709,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
6709
assert.include(harness.continuationRequests[0]?.detail, "CAPACITY_CHILD_DONE");
6710
}).pipe(
6711
Effect.provide(
6526
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6712
+ Layer.mergeAll(
6713
+ IdAllocator.layer,
6714
+ McpProviderSessions.layer,
6715
+ NodeServices.layer,
6716
+ NodeCrypto.layer,
6717
+ ),
6718
),
6719
),
6720
),
@@ -6640,7 +6831,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
6831
assert.equal(harness.subagentUpdates().at(-1)?.subagent.status, "interrupted");
6832
}).pipe(
6833
Effect.provide(
6643
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6834
+ Layer.mergeAll(
6835
+ IdAllocator.layer,
6836
+ McpProviderSessions.layer,
6837
+ NodeServices.layer,
6838
+ NodeCrypto.layer,
6839
+ ),
6840
),
6841
),
6842
),
@@ -6712,7 +6908,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
6908
);
6909
}).pipe(
6910
Effect.provide(
6715
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
6911
+ Layer.mergeAll(
6912
+ IdAllocator.layer,
6913
+ McpProviderSessions.layer,
6914
+ NodeServices.layer,
6915
+ NodeCrypto.layer,
6916
+ ),
6917
),
6918
),
6919
),
@@ -6826,7 +7027,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
7027
assert.include(harness.continuationRequests[0]?.detail, "CHILD_AFTER_GRANDCHILD");
7028
}).pipe(
7029
Effect.provide(
6829
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7030
+ Layer.mergeAll(
7031
+ IdAllocator.layer,
7032
+ McpProviderSessions.layer,
7033
+ NodeServices.layer,
7034
+ NodeCrypto.layer,
7035
+ ),
7036
),
7037
),
7038
),
@@ -6904,7 +7110,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
7110
assert.lengthOf(harness.continuationRequests, 0);
7111
}).pipe(
7112
Effect.provide(
6907
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7113
+ Layer.mergeAll(
7114
+ IdAllocator.layer,
7115
+ McpProviderSessions.layer,
7116
+ NodeServices.layer,
7117
+ NodeCrypto.layer,
7118
+ ),
7119
),
7120
),
7121
),
@@ -6991,7 +7202,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
7202
]);
7203
}).pipe(
7204
Effect.provide(
6994
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7205
+ Layer.mergeAll(
7206
+ IdAllocator.layer,
7207
+ McpProviderSessions.layer,
7208
+ NodeServices.layer,
7209
+ NodeCrypto.layer,
7210
+ ),
7211
),
7212
),
7213
),
@@ -7086,7 +7302,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
7302
}
7303
}).pipe(
7304
Effect.provide(
7089
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7305
+ Layer.mergeAll(
7306
+ IdAllocator.layer,
7307
+ McpProviderSessions.layer,
7308
+ NodeServices.layer,
7309
+ NodeCrypto.layer,
7310
+ ),
7311
),
7312
),
7313
),
@@ -7149,7 +7370,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
7370
assert.include(harness.continuationRequests[0]?.detail, "CODEX_RESUME_DONE");
7371
}).pipe(
7372
Effect.provide(
7152
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7373
+ Layer.mergeAll(
7374
+ IdAllocator.layer,
7375
+ McpProviderSessions.layer,
7376
+ NodeServices.layer,
7377
+ NodeCrypto.layer,
7378
+ ),
7379
),
7380
),
7381
),
@@ -7308,7 +7534,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
7534
}
7535
}).pipe(
7536
Effect.provide(
7311
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7537
+ Layer.mergeAll(
7538
+ IdAllocator.layer,
7539
+ McpProviderSessions.layer,
7540
+ NodeServices.layer,
7541
+ NodeCrypto.layer,
7542
+ ),
7543
),
7544
),
7545
),
@@ -7461,7 +7692,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
7692
}).pipe(
7693
Effect.scoped,
7694
Effect.provide(
7464
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7695
+ Layer.mergeAll(
7696
+ IdAllocator.layer,
7697
+ McpProviderSessions.layer,
7698
+ NodeServices.layer,
7699
+ NodeCrypto.layer,
7700
+ ),
7701
),
7702
),
7703
);
@@ -7608,7 +7844,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
7844
}).pipe(
7845
Effect.scoped,
7846
Effect.provide(
7611
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
7847
+ Layer.mergeAll(
7848
+ IdAllocator.layer,
7849
+ McpProviderSessions.layer,
7850
+ NodeServices.layer,
7851
+ NodeCrypto.layer,
7852
+ ),
7853
),
7854
),
7855
);
@@ -7766,7 +8007,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8007
}).pipe(
8008
Effect.scoped,
8009
Effect.provide(
7769
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8010
+ Layer.mergeAll(
8011
+ IdAllocator.layer,
8012
+ McpProviderSessions.layer,
8013
+ NodeServices.layer,
8014
+ NodeCrypto.layer,
8015
+ ),
8016
),
8017
),
8018
);
@@ -7858,7 +8104,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8104
}).pipe(
8105
Effect.scoped,
8106
Effect.provide(
7861
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8107
+ Layer.mergeAll(
8108
+ IdAllocator.layer,
8109
+ McpProviderSessions.layer,
8110
+ NodeServices.layer,
8111
+ NodeCrypto.layer,
8112
+ ),
8113
),
8114
),
8115
);
@@ -7939,7 +8190,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8190
}).pipe(
8191
Effect.scoped,
8192
Effect.provide(
7942
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8193
+ Layer.mergeAll(
8194
+ IdAllocator.layer,
8195
+ McpProviderSessions.layer,
8196
+ NodeServices.layer,
8197
+ NodeCrypto.layer,
8198
+ ),
8199
),
8200
),
8201
);
@@ -8002,7 +8258,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8258
}).pipe(
8259
Effect.scoped,
8260
Effect.provide(
8005
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8261
+ Layer.mergeAll(
8262
+ IdAllocator.layer,
8263
+ McpProviderSessions.layer,
8264
+ NodeServices.layer,
8265
+ NodeCrypto.layer,
8266
+ ),
8267
),
8268
),
8269
);
@@ -8101,7 +8362,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8362
}).pipe(
8363
Effect.scoped,
8364
Effect.provide(
8104
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8365
+ Layer.mergeAll(
8366
+ IdAllocator.layer,
8367
+ McpProviderSessions.layer,
8368
+ NodeServices.layer,
8369
+ NodeCrypto.layer,
8370
+ ),
8371
),
8372
),
8373
);
@@ -8166,7 +8432,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8432
}).pipe(
8433
Effect.scoped,
8434
Effect.provide(
8169
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8435
+ Layer.mergeAll(
8436
+ IdAllocator.layer,
8437
+ McpProviderSessions.layer,
8438
+ NodeServices.layer,
8439
+ NodeCrypto.layer,
8440
+ ),
8441
),
8442
),
8443
);
@@ -8256,7 +8527,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8527
}).pipe(
8528
Effect.scoped,
8529
Effect.provide(
8259
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8530
+ Layer.mergeAll(
8531
+ IdAllocator.layer,
8532
+ McpProviderSessions.layer,
8533
+ NodeServices.layer,
8534
+ NodeCrypto.layer,
8535
+ ),
8536
),
8537
),
8538
);
@@ -8322,7 +8598,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8598
}).pipe(
8599
Effect.scoped,
8600
Effect.provide(
8325
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8601
+ Layer.mergeAll(
8602
+ IdAllocator.layer,
8603
+ McpProviderSessions.layer,
8604
+ NodeServices.layer,
8605
+ NodeCrypto.layer,
8606
+ ),
8607
),
8608
),
8609
);
@@ -8495,7 +8776,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8776
}).pipe(
8777
Effect.scoped,
8778
Effect.provide(
8498
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8779
+ Layer.mergeAll(
8780
+ IdAllocator.layer,
8781
+ McpProviderSessions.layer,
8782
+ NodeServices.layer,
8783
+ NodeCrypto.layer,
8784
+ ),
8785
),
8786
),
8787
);
@@ -8532,7 +8818,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8818
}).pipe(
8819
Effect.scoped,
8820
Effect.provide(
8535
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8821
+ Layer.mergeAll(
8822
+ IdAllocator.layer,
8823
+ McpProviderSessions.layer,
8824
+ NodeServices.layer,
8825
+ NodeCrypto.layer,
8826
+ ),
8827
),
8828
),
8829
);
@@ -8561,7 +8852,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8852
}).pipe(
8853
Effect.scoped,
8854
Effect.provide(
8564
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8855
+ Layer.mergeAll(
8856
+ IdAllocator.layer,
8857
+ McpProviderSessions.layer,
8858
+ NodeServices.layer,
8859
+ NodeCrypto.layer,
8860
+ ),
8861
),
8862
),
8863
);
@@ -8622,7 +8918,12 @@ describe("CodexAdapterV2 post-settle continuation", () => {
8918
}).pipe(
8919
Effect.scoped,
8920
Effect.provide(
8625
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
8921
+ Layer.mergeAll(
8922
+ IdAllocator.layer,
8923
+ McpProviderSessions.layer,
8924
+ NodeServices.layer,
8925
+ NodeCrypto.layer,
8926
+ ),
8927
),
8928
),
8929
);
apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.testkit.ts
+3
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { CodexSettings, type ProviderReplayTranscript } from "@t3tools/contracts";
4
import * as CodexClient from "effect-codex-app-server/client";
@@ -124,7 +125,7 @@ export function layer(input: {
125
const layerServerConfig = Layer.effect(
126
ServerConfig.ServerConfig,
127
makeReplayServerConfig(input.transcript.scenario).pipe(Effect.orDie),
127
- ).pipe(Layer.provide(NodeServices.layer));
128
+ ).pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
129
const layerRegistry = ProviderAdapterRegistry.layerFromAdaptersEffect(
130
CodexAdapterV2.createCodexAdapterV2({
131
instanceId: CodexAdapterV2.CODEX_DEFAULT_INSTANCE_ID,
@@ -139,6 +140,7 @@ export function layer(input: {
140
layerReplayClientFactory,
141
layerServerConfig,
142
NodeServices.layer,
143
+ NodeCrypto.layer,
144
IdAllocator.layer,
145
),
146
),
apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
+8
-8
@@ -82,7 +82,7 @@ import * as CodexErrors from "effect-codex-app-server/errors";
82
import * as CodexSchema from "effect-codex-app-server/schema";
83
import * as Cause from "effect/Cause";
84
import * as Context from "effect/Context";
85
-import * as Crypto from "effect/Crypto";
85
+import * as Digest from "effect/crypto/Digest";
86
import * as DateTime from "effect/DateTime";
87
import * as Deferred from "effect/Deferred";
88
import * as Effect from "effect/Effect";
@@ -511,7 +511,7 @@ export function codexDynamicToolOutput(
511
512
const projectCodexDynamicToolItem = Effect.fn("CodexAdapterV2.projectDynamicToolItem")(function* (
513
item: CodexDynamicToolItem,
514
-): Effect.fn.Return<CodexDynamicToolProjection, never, Crypto.Crypto> {
514
+): Effect.fn.Return<CodexDynamicToolProjection, never, Digest.Digest> {
515
const output =
516
item.type === "mcpToolCall" ? codexMcpToolOutput(item) : codexDynamicToolOutput(item);
517
const toolName =
@@ -1574,7 +1574,7 @@ export const layerAppServerClientFactory: Layer.Layer<
1574
1575
export type CodexAdapterV2DriverEnv =
1576
| CodexAppServerClientFactory
1577
- | Crypto.Crypto
1577
+ | Digest.Digest
1578
| FileSystem.FileSystem
1579
| IdAllocator.IdAllocatorV2
1580
| McpProviderSessions.McpProviderSessions
@@ -1587,7 +1587,7 @@ export const createCodexAdapterV2 = Effect.fn("CodexAdapterV2.createCodexAdapter
1587
) {
1588
const clientFactory = yield* CodexAppServerClientFactory;
1589
const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests;
1590
- const crypto = yield* Crypto.Crypto;
1590
+ const digest = yield* Digest.Digest;
1591
const fileSystem = yield* FileSystem.FileSystem;
1592
const hostEnvironment = yield* HostProcess.Environment;
1593
const idAllocator = yield* IdAllocator.IdAllocatorV2;
@@ -1618,7 +1618,7 @@ export const createCodexAdapterV2 = Effect.fn("CodexAdapterV2.createCodexAdapter
1618
settings,
1619
environment: yield* mergeProviderInstanceEnvironment(environment, hostEnvironment),
1620
clientFactory,
1621
- crypto,
1621
+ digest,
1622
fileSystem,
1623
idAllocator,
1624
serverConfig,
@@ -1637,7 +1637,7 @@ export interface CodexAdapterV2Options {
1637
readonly compatibility?: (
1638
version: string,
1639
) => Effect.Effect<ServerProviderCompatibilityAdvisory | undefined>;
1640
- readonly crypto: Crypto.Crypto;
1640
+ readonly digest: Digest.Digest["Service"];
1641
readonly fileSystem: FileSystem.FileSystem;
1642
readonly idAllocator: IdAllocator.IdAllocatorV2["Service"];
1643
readonly serverConfig: ServerConfig["Service"];
@@ -1656,7 +1656,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
1656
const readMcpSession = (threadId: ThreadId | null) =>
1657
// @effect-diagnostics-next-line effectSucceedWithVoid:off - This optional result requires undefined, not the wider void type.
1658
threadId === null ? Effect.succeed(undefined) : mcpSessions.read(threadId);
1659
- const { clientFactory, crypto, fileSystem, idAllocator, serverConfig } = adapterOptions;
1659
+ const { clientFactory, digest, fileSystem, idAllocator, serverConfig } = adapterOptions;
1660
const continuationRequests = adapterOptions.continuationRequests;
1661
1662
return ProviderAdapter.ProviderAdapterV2.of({
@@ -3779,7 +3779,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
3779
});
3780
const { ordinal, startedAt } = yield* resolveItemPosition(context, item.id);
3781
const projection = yield* projectCodexDynamicToolItem(item).pipe(
3782
- Effect.provideService(Crypto.Crypto, crypto),
3782
+ Effect.provideService(Digest.Digest, digest),
3783
);
3784
const node: OrchestrationV2ExecutionNode = {
3785
id: nodeId,
apps/server/src/orchestration-v2/Adapters/FxAdapterV2.test.ts
+5
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { describe, it } from "@effect/vitest";
4
import {
@@ -36,9 +37,12 @@ import {
37
38
const testLayer = Layer.mergeAll(
39
NodeServices.layer,
40
+ NodeCrypto.layer,
41
IdAllocator.layer,
42
McpProviderSessions.layer,
41
- TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
43
+ TestProviderHost.layer().pipe(
44
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
45
+ ),
46
);
47
48
const SESSION_ID = "fx-session-01";
apps/server/src/orchestration-v2/Adapters/FxAdapterV2.testkit.ts
+7
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { FxSettings } from "@t3tools/provider-fx/settings";
4
import {
@@ -34,7 +35,9 @@ function layerFxProviderAdapterRegistryReplay(
35
transcript: AcpReplayTranscript,
36
options: { readonly replayGate?: ProviderReplayGate } = {},
37
) {
37
- const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
38
+ const layerHost = TestProviderHost.layer().pipe(
39
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
40
+ );
41
42
return ProviderAdapterRegistry.layerFromAdaptersEffect(
43
Effect.gen(function* () {
@@ -79,7 +82,9 @@ function layerFxProviderAdapterRegistryReplay(
82
return [adapter];
83
}),
84
).pipe(
82
- Layer.provide(Layer.mergeAll(layerHost, NodeServices.layer, IdAllocator.layer)),
85
+ Layer.provide(
86
+ Layer.mergeAll(layerHost, NodeServices.layer, NodeCrypto.layer, IdAllocator.layer),
87
+ ),
88
Layer.merge(
89
Layer.effectDiscard(
90
Effect.addFinalizer(() => Effect.sync(() => options.replayGate?.releaseAll())),
apps/server/src/orchestration-v2/Adapters/GrokAdapterV2.test.ts
+10
-3
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import {
4
ProjectId,
@@ -234,9 +235,12 @@ describe("Grok permission prompts", () => {
235
});
236
237
describe("Grok launch permission mode", () => {
237
- const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
238
+ const layerHost = TestProviderHost.layer().pipe(
239
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
240
+ );
241
const layerTest = Layer.mergeAll(
242
NodeServices.layer,
243
+ NodeCrypto.layer,
244
IdAllocator.layer,
245
McpProviderSessions.layer,
246
layerHost,
@@ -246,7 +250,7 @@ describe("Grok launch permission mode", () => {
250
Effect.gen(function* () {
251
const launches: Array<ReadonlyArray<string>> = [];
252
const childProcessSpawner = ChildProcessSpawner.make((command) => {
249
- if (command._tag === "StandardCommand") launches.push(command.args);
253
+ if (command._tag === "StandardCommand") launches.push(command.args.map(String));
254
return Effect.fail(
255
PlatformError.systemError({
256
_tag: "NotFound",
@@ -363,9 +367,12 @@ describe("Grok launch permission mode", () => {
367
});
368
369
describe("Grok native questions", () => {
366
- const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
370
+ const layerHost = TestProviderHost.layer().pipe(
371
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
372
+ );
373
const layerTest = Layer.mergeAll(
374
NodeServices.layer,
375
+ NodeCrypto.layer,
376
IdAllocator.layer,
377
McpProviderSessions.layer,
378
layerHost,
apps/server/src/orchestration-v2/Adapters/GrokAdapterV2.testkit.ts
+7
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { GrokSettings } from "@t3tools/provider-grok/settings";
4
import * as Effect from "effect/Effect";
@@ -36,7 +37,9 @@ function layerGrokProviderAdapterRegistryReplay(
37
transcript: AcpReplayTranscript,
38
options: { readonly replayGate?: ProviderReplayGate } = {},
39
) {
39
- const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
40
+ const layerHost = TestProviderHost.layer().pipe(
41
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
42
+ );
43
44
return ProviderAdapterRegistry.layerFromAdaptersEffect(
45
Effect.gen(function* () {
@@ -86,7 +89,9 @@ function layerGrokProviderAdapterRegistryReplay(
89
return [adapter];
90
}),
91
).pipe(
89
- Layer.provide(Layer.mergeAll(layerHost, NodeServices.layer, IdAllocator.layer)),
92
+ Layer.provide(
93
+ Layer.mergeAll(layerHost, NodeServices.layer, NodeCrypto.layer, IdAllocator.layer),
94
+ ),
95
// Held inbound lines must not outlive the scenario and wedge teardown.
96
Layer.merge(
97
Layer.effectDiscard(
apps/server/src/orchestration-v2/Adapters/KiroAdapterV2.test.ts
+5
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import {
@@ -62,9 +63,12 @@ import {
63
64
const testLayer = Layer.mergeAll(
65
NodeServices.layer,
66
+ NodeCrypto.layer,
67
IdAllocator.layer,
68
McpProviderSessions.layer,
67
- TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
69
+ TestProviderHost.layer().pipe(
70
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
71
+ ),
72
);
73
74
const SESSION_ID = "sess_abb5e0cf-d4a2-4360-9f03-2f8f0889a707";
apps/server/src/orchestration-v2/Adapters/KiroAdapterV2.testkit.ts
+7
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { ProviderInstanceId } from "@t3tools/contracts";
4
import { KiroSettings } from "@t3tools/provider-kiro/settings";
@@ -29,7 +30,9 @@ function layerKiroProviderAdapterRegistryReplay(
30
transcript: AcpReplayTranscript,
31
options: { readonly replayGate?: ProviderReplayGate } = {},
32
) {
32
- const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
33
+ const layerHost = TestProviderHost.layer().pipe(
34
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
35
+ );
36
37
return ProviderAdapterRegistry.layerFromAdaptersEffect(
38
Effect.gen(function* () {
@@ -61,7 +64,9 @@ function layerKiroProviderAdapterRegistryReplay(
64
return [adapter];
65
}),
66
).pipe(
64
- Layer.provide(Layer.mergeAll(layerHost, NodeServices.layer, IdAllocator.layer)),
67
+ Layer.provide(
68
+ Layer.mergeAll(layerHost, NodeServices.layer, NodeCrypto.layer, IdAllocator.layer),
69
+ ),
70
// Held inbound lines must not outlive the scenario and wedge teardown.
71
Layer.merge(
72
Layer.effectDiscard(
apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.testkit.ts
+10
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import {
4
ProviderInstanceId,
@@ -250,7 +251,9 @@ const makeReplayAdapter = (
251
);
252
});
253
253
-const layerReplayHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
254
+const layerReplayHost = TestProviderHost.layer().pipe(
255
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
256
+);
257
258
const layerReplayHostWithAttachments = (
259
attachmentsDir: string,
@@ -278,7 +281,11 @@ function layerRegistry(
281
makeReplayAdapter(transcript, { external: true, ...options }).pipe(
282
Effect.map((adapter) => ProviderAdapterRegistry.layerFromAdapters([adapter])),
283
),
281
- ).pipe(Layer.provide(Layer.mergeAll(layerReplayHost, IdAllocator.layer, NodeServices.layer)));
284
+ ).pipe(
285
+ Layer.provide(
286
+ Layer.mergeAll(layerReplayHost, IdAllocator.layer, NodeServices.layer, NodeCrypto.layer),
287
+ ),
288
+ );
289
}
290
291
export const openCode2ReplayRuntime = (
@@ -329,6 +336,7 @@ export const openCode2ReplayRuntime = (
336
),
337
IdAllocator.layer,
338
NodeServices.layer,
339
+ NodeCrypto.layer,
340
),
341
),
342
);
apps/server/src/orchestration-v2/CheckpointService.ts
+6
-6
@@ -10,7 +10,7 @@ import {
10
ThreadId,
11
} from "@t3tools/contracts";
12
import * as Context from "effect/Context";
13
-import * as Crypto from "effect/Crypto";
13
+import * as Digest from "effect/crypto/Digest";
14
import * as DateTime from "effect/DateTime";
15
import * as Effect from "effect/Effect";
16
import * as Base64Url from "effect/encoding/Base64Url";
@@ -147,9 +147,9 @@ export class CheckpointServiceV2 extends Context.Service<
147
148
export const checkpointRefForScopeOrdinal = Effect.fn("checkpointRefForScopeOrdinal")(
149
function* (input: { readonly scopeId: CheckpointScopeId; readonly ordinalWithinScope: number }) {
150
- const crypto = yield* Crypto.Crypto;
150
+ const crypto = yield* Digest.Digest;
151
const digest = yield* crypto
152
- .digest("SHA-256", new TextEncoder().encode(input.scopeId))
152
+ .digest(Digest.sha256, new TextEncoder().encode(input.scopeId))
153
.pipe(Effect.orDie);
154
const scopeKey = Hex.encode(digest).slice(0, 32);
155
return CheckpointRef.make(
@@ -231,14 +231,14 @@ function makeCheckpoint(input: {
231
export const layer: Layer.Layer<
232
CheckpointServiceV2,
233
never,
234
- CheckpointStore.CheckpointStore | Crypto.Crypto | IdAllocator.IdAllocatorV2
234
+ CheckpointStore.CheckpointStore | Digest.Digest | IdAllocator.IdAllocatorV2
235
> = Layer.effect(
236
CheckpointServiceV2,
237
Effect.gen(function* () {
238
const checkpointStore = yield* CheckpointStore.CheckpointStore;
239
- const crypto = yield* Crypto.Crypto;
239
+ const crypto = yield* Digest.Digest;
240
const checkpointRefFor = (input: Parameters<typeof checkpointRefForScopeOrdinal>[0]) =>
241
- checkpointRefForScopeOrdinal(input).pipe(Effect.provideService(Crypto.Crypto, crypto));
241
+ checkpointRefForScopeOrdinal(input).pipe(Effect.provideService(Digest.Digest, crypto));
242
const idAllocator = yield* IdAllocator.IdAllocatorV2;
243
const workspaceLocks = yield* KeyedLock.make<string>();
244
const withWorkspaceLock = <A, E, R>(cwd: string, effect: Effect.Effect<A, E, R>) =>
apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts
+8
-3
@@ -15,7 +15,7 @@ import {
15
type OrchestrationV2DomainEvent,
16
} from "@t3tools/contracts";
17
import * as DateTime from "effect/DateTime";
18
-import * as Crypto from "effect/Crypto";
18
+import * as SecureRandom from "effect/crypto/SecureRandom";
19
import * as Effect from "effect/Effect";
20
import * as FileSystem from "effect/FileSystem";
21
import * as Fiber from "effect/Fiber";
@@ -149,7 +149,7 @@ it.effect.each(deliveries)(
149
attachmentsDir: cwd,
150
fileSystem: yield* FileSystem.FileSystem,
151
path: yield* Path.Path,
152
- crypto: yield* Crypto.Crypto,
152
+ random: yield* SecureRandom.SecureRandom,
153
idAllocator: yield* IdAllocator.IdAllocatorV2,
154
queryRunner: {
155
allocateSessionId: Effect.succeed(sessionId),
@@ -480,7 +480,12 @@ it.effect.each(deliveries)(
480
);
481
}).pipe(
482
Effect.provide(
483
- Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
483
+ Layer.mergeAll(
484
+ IdAllocator.layer,
485
+ McpProviderSessions.layer,
486
+ NodeServices.layer,
487
+ NodeCrypto.layer,
488
+ ),
489
),
490
),
491
),
apps/server/src/orchestration-v2/DelegatedCompletionDelivery.test.ts
+2
-1
@@ -1,5 +1,6 @@
1
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
2
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
3
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
4
import * as NodeServices from "@effect/platform-node/NodeServices";
5
import { assert, it, vi } from "@effect/vitest";
6
import {
@@ -50,7 +51,7 @@ import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAda
51
import * as ProviderContinuationRequests from "@t3tools/provider-core/server/ProviderContinuationRequests";
52
53
const layerPlatformTest = Layer.merge(
53
- NodeServices.layer,
54
+ Layer.mergeAll(NodeServices.layer, NodeCrypto.layer),
55
Layer.mock(SourceControlProviderRegistry.SourceControlProviderRegistry)({
56
resolveLink: () => Effect.die("unused title link"),
57
}),
apps/server/src/orchestration-v2/FoundationPersistence.test.ts
+2
-3
@@ -27,6 +27,7 @@ import {
27
TurnItemId,
28
} from "@t3tools/contracts";
29
import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
30
+import * as Arr from "effect/Array";
31
import * as Clock from "effect/Clock";
32
import * as DateTime from "effect/DateTime";
33
import * as Deferred from "effect/Deferred";
@@ -1356,9 +1357,7 @@ it.layer(layerTest)("orchestration V2 foundation persistence", (it) => {
1357
rows.push(eventRow(++ordinal, { commandId: exactPageCommandId }));
1358
}
1359
const inserted = yield* Effect.forEach(
1359
- Array.from({ length: Math.ceil(rows.length / 400) }, (_, chunk) =>
1360
- rows.slice(chunk * 400, (chunk + 1) * 400),
1361
- ),
1360
+ Arr.chunksOf(rows, 400),
1361
(chunk) =>
1362
sql<{
1363
readonly sequence: number;
apps/server/src/orchestration-v2/NativeChildWorkQuery.test.ts
+3
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { expect, it } from "@effect/vitest";
4
import { ProviderInstanceId, ThreadId } from "@t3tools/contracts";
@@ -89,8 +90,9 @@ const readChildren = (olderRun: string) =>
90
it.layer(
91
Layer.mergeAll(
92
NodeServices.layer,
93
+ NodeCrypto.layer,
94
ServerConfig.layerTest(process.cwd(), { prefix: "native-child-work-" }).pipe(
93
- Layer.provide(NodeServices.layer),
95
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
96
),
97
),
98
)("NativeChildWorkQuery", (it) => {
apps/server/src/orchestration-v2/NativeChildWorkQuery.ts
+3
-3
@@ -5,7 +5,7 @@ import {
5
type OrchestrationV2GetNativeChildWorkResult,
6
} from "@t3tools/contracts";
7
import * as Context from "effect/Context";
8
-import * as Crypto from "effect/Crypto";
8
+import * as Digest from "effect/crypto/Digest";
9
import * as Effect from "effect/Effect";
10
import * as Layer from "effect/Layer";
11
import * as Path from "effect/Path";
@@ -33,7 +33,7 @@ const NO_CHILDREN: OrchestrationV2GetNativeChildWorkResult = { children: [] };
33
const make = Effect.gen(function* () {
34
const threads = yield* ThreadManagement.ThreadManagementService;
35
const { stateDir } = yield* ServerConfig.ServerConfig;
36
- const crypto = yield* Crypto.Crypto;
36
+ const digest = yield* Digest.Digest;
37
const path = yield* Path.Path;
38
39
const getNativeChildWork = Effect.fn("NativeChildWorkQuery.getNativeChildWork")(
@@ -85,7 +85,7 @@ const make = Effect.gen(function* () {
85
const directories = yield* resolveAntigravityInstanceDirectories(
86
stateDir,
87
subagent.providerInstanceId,
88
- ).pipe(Effect.provideService(Crypto.Crypto, crypto), Effect.provideService(Path.Path, path));
88
+ ).pipe(Effect.provideService(Digest.Digest, digest), Effect.provideService(Path.Path, path));
89
const children = yield* readAntigravityChildWork({
90
profileDirectory: directories.profile,
91
rootSessionId,
apps/server/src/orchestration-v2/ProjectSettingsUpgrade.integration.test.ts
+3
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
4
import { assert, it } from "@effect/vitest";
@@ -116,7 +117,7 @@ const unusedEnrichment = {
117
118
const layerRuntime = (dbPath: string) => {
119
const layerPlatform = Layer.merge(
119
- NodeServices.layer,
120
+ Layer.mergeAll(NodeServices.layer, NodeCrypto.layer),
121
Layer.mock(SourceControlProviderRegistry.SourceControlProviderRegistry)({
122
resolveLink: () => Effect.die("unused"),
123
}),
@@ -190,5 +191,5 @@ it.live("keeps project settings through the V2 migrations and the first V2 boot"
191
assert.equal(project._tag, "Some");
192
}).pipe(Effect.provide(layerRuntime(dbPath)));
193
}),
193
- ).pipe(Effect.provide(NodeServices.layer)),
194
+ ).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
195
);
apps/server/src/orchestration-v2/ProviderAdapterRegistry.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import {
@@ -193,5 +194,5 @@ it.effect("interrupts admitted session startup when a shared peer signs out", ()
194
yield* auth.logout(Effect.void);
195
yield* Deferred.await(stopped);
196
assert.isTrue(Exit.isFailure(yield* Fiber.await(startup)));
196
- }).pipe(Effect.provide(NodeServices.layer)),
197
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
198
);
apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts
+2
-1
@@ -1,4 +1,5 @@
1
import { assert, it } from "@effect/vitest";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import {
5
CheckpointId,
@@ -69,7 +70,7 @@ const layerTestEventSink = EventSink.layer.pipe(
70
71
const layerGit = GitVcsDriver.layer.pipe(
72
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "ingestor-git-" })),
72
- Layer.provideMerge(NodeServices.layer),
73
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
74
);
75
76
const layerEmptyInstances = Layer.mock(ProviderInstanceRegistry.ProviderInstanceRegistry)({
apps/server/src/orchestration-v2/ProviderSessionManager.test.ts
+5
-4
@@ -1,4 +1,5 @@
1
import * as NetAddress from "effect/net/NetAddress";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import { assert, it } from "@effect/vitest";
5
import { AgentScope } from "@t3tools/shared/AgentScope";
@@ -577,7 +578,7 @@ function layerTest(input: {
578
),
579
),
580
),
580
- ).pipe(Layer.provide(NodeServices.layer));
581
+ ).pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
582
}
583
584
const fakeHttpServer = HttpServer.HttpServer.of({
@@ -596,7 +597,7 @@ const layerTestMcpRegistry = Layer.effect(
597
).pipe(
598
Layer.provide(Layer.succeed(HttpServer.HttpServer, fakeHttpServer)),
599
Layer.provide(Layer.succeed(ServerEnvironment.ServerEnvironment, fakeEnvironment)),
599
- Layer.provide(NodeServices.layer),
600
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
601
);
602
603
const layerPausingMcpRegistry = (pause: {
@@ -3733,7 +3734,7 @@ it.effect.each(["missing", "file"] as const)(
3734
[],
3735
);
3736
}).pipe(Effect.provide(layerTest({ state, idleTimeoutMs: 60_000 })));
3736
- }).pipe(Effect.provide(NodeServices.layer)),
3737
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
3738
);
3739
3740
it.effect(
@@ -3783,7 +3784,7 @@ it.effect(
3784
before.providerSessions,
3785
);
3786
}).pipe(Effect.provide(layerTest({ state, idleTimeoutMs: 60_000 })));
3786
- }).pipe(Effect.provide(NodeServices.layer)),
3787
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
3788
);
3789
3790
it.effect(
apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
+3
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { expect, it, vi } from "vite-plus/test";
4
import { it as effectIt } from "@effect/vitest";
@@ -1188,7 +1189,7 @@ effectIt.effect(
1189
},
1190
]);
1191
expect(JSON.stringify(harness.events)).not.toContain("private git diagnostic");
1191
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
1192
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
1193
);
1194
1195
effectIt.effect("recovers an abandoned failed turn before continuing its native conversation", () =>
@@ -1442,7 +1443,7 @@ effectIt.effect.each(["cleanup-first", "startup-first"])(
1443
runtimePolicy: expect.objectContaining({ cwd: worktreePath }),
1444
}),
1445
);
1445
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
1446
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
1447
);
1448
1449
effectIt.effect("reads current startup state after waiting for the workspace lease", () =>
apps/server/src/orchestration-v2/ProviderTurnStartService.testkit.ts
+2
-1
@@ -1,4 +1,5 @@
1
import { SourceControlProviderError, SourceControlProviderKind } from "@t3tools/contracts";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as ServerConfig from "../config.ts";
5
import * as GitManager from "../git/GitManager.ts";
@@ -58,5 +59,5 @@ export const layerRealGit = GitWorkflow.layer.pipe(
59
Layer.provideMerge(GitVcsDriver.layer),
60
Layer.provideMerge(VcsProcess.layer),
61
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "t3-recreate-" })),
61
- Layer.provideMerge(NodeServices.layer),
62
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
63
);
apps/server/src/orchestration-v2/PullRequestSyncReactor.test.ts
+3
-6
@@ -25,7 +25,7 @@ import {
25
import { assert, describe, it } from "@effect/vitest";
26
import * as Cache from "effect/Cache";
27
import * as Clock from "effect/Clock";
28
-import * as Crypto from "effect/Crypto";
28
+import * as SecureRandom from "effect/crypto/SecureRandom";
29
import * as DateTime from "effect/DateTime";
30
import * as Deferred from "effect/Deferred";
31
import * as Duration from "effect/Duration";
@@ -52,10 +52,7 @@ type SyncCommand = Extract<
52
>;
53
type LinkCommand = Extract<OrchestrationCommand, { readonly type: "thread.pull-request.link" }>;
54
55
-const testCrypto = Crypto.make({
56
- randomBytes: (size) => new Uint8Array(size).fill(1),
57
- digest: (_algorithm, data) => Effect.succeed(data),
58
-});
55
+const testCrypto = SecureRandom.make((size) => new Uint8Array(size).fill(1));
56
57
function makeProject(id: ProjectId = PROJECT_ID): OrchestrationProjectShell {
58
return {
@@ -267,7 +264,7 @@ const makeHarness = Effect.fn("makePullRequestSyncHarness")(function* (options:
264
streamDomainEvents: Stream.fromQueue(domainEvents),
265
}),
266
Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
270
- Layer.succeed(Crypto.Crypto, testCrypto),
267
+ Layer.succeed(SecureRandom.SecureRandom, testCrypto),
268
);
269
270
return {
apps/server/src/orchestration-v2/PullRequestSyncReactor.ts
+4
-4
@@ -20,7 +20,7 @@ import { sourceControlDefinitions } from "../sourceControl/sourceControlDefiniti
20
import * as Cause from "effect/Cause";
21
import * as Clock from "effect/Clock";
22
import * as Context from "effect/Context";
23
-import * as Crypto from "effect/Crypto";
23
+import * as SecureRandom from "effect/crypto/SecureRandom";
24
import * as DateTime from "effect/DateTime";
25
import * as Effect from "effect/Effect";
26
import * as Layer from "effect/Layer";
@@ -333,7 +333,7 @@ export const make = Effect.gen(function* () {
333
const projections = yield* ProjectionStore.ProjectionStoreV2;
334
const pullRequests = yield* PullRequestService.PullRequestService;
335
const git = yield* GitManager.GitManager;
336
- const crypto = yield* Crypto.Crypto;
336
+ const random = yield* SecureRandom.SecureRandom;
337
338
const lastSyncedAt = new Map<string, number>();
339
const requested = new Set<string>();
@@ -443,7 +443,7 @@ export const make = Effect.gen(function* () {
443
}
444
const url = siblingChangeRequestUrl(link.url, layer.number);
445
if (url === null) continue;
446
- const uuid = yield* crypto.randomUUIDv4();
446
+ const uuid = yield* random.uuidV4();
447
yield* engine.dispatch({
448
type: "thread.pull-request.link",
449
commandId: CommandId.make(`server:pr-stack-link:${thread.id}:${uuid}`),
@@ -455,7 +455,7 @@ export const make = Effect.gen(function* () {
455
linkedThisSweep.add(dedupeKey);
456
}
457
if (changed) {
458
- const uuid = yield* crypto.randomUUIDv4();
458
+ const uuid = yield* random.uuidV4();
459
yield* engine.dispatch({
460
type: "thread.pull-request-link.sync",
461
commandId: CommandId.make(`server:pr-sync:${thread.id}:${uuid}`),
apps/server/src/orchestration-v2/PullRequestWatchReactor.ts
+3
-3
@@ -17,7 +17,7 @@ import {
17
import * as Cause from "effect/Cause";
18
import * as Clock from "effect/Clock";
19
import * as Context from "effect/Context";
20
-import * as Crypto from "effect/Crypto";
20
+import * as SecureRandom from "effect/crypto/SecureRandom";
21
import * as Effect from "effect/Effect";
22
import * as Exit from "effect/Exit";
23
import * as Layer from "effect/Layer";
@@ -196,7 +196,7 @@ export const make = Effect.gen(function* () {
196
const engine = yield* Orchestrator.OrchestratorV2;
197
const projections = yield* ProjectionStore.ProjectionStoreV2;
198
const pullRequests = yield* PullRequestService.PullRequestService;
199
- const crypto = yield* Crypto.Crypto;
199
+ const random = yield* SecureRandom.SecureRandom;
200
const bootedAt = yield* Clock.currentTimeMillis;
201
const lives = new Map<string, WatchLife>();
202
@@ -276,7 +276,7 @@ export const make = Effect.gen(function* () {
276
wake?: { readonly text: string; readonly notification: OrchestrationV2Notification },
277
endedWatch?: ThreadPullRequestWatch,
278
) {
279
- const uuid = yield* crypto.randomUUIDv4();
279
+ const uuid = yield* random.uuidV4();
280
yield* engine.dispatch({
281
type: "thread.pull-request-watch.sync",
282
commandId: CommandId.make(`server:pr-watch:${target.thread.id}:${uuid}`),
apps/server/src/orchestration-v2/ThreadLaunchService.test.ts
+1
-1
@@ -1113,7 +1113,7 @@ it.effect.each(["stable", "upstream/release"])(
1113
Effect.provide(
1114
GitVcsDriver.layer.pipe(
1115
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "launch-remote-git-" })),
1116
- Layer.provideMerge(NodeServices.layer),
1116
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1117
),
1118
),
1119
),
apps/server/src/orchestration-v2/ThreadPullRequestService.test.ts
+7
-16
@@ -9,7 +9,7 @@ import {
9
type OrchestrationV2ServerCommand,
10
} from "@t3tools/contracts";
11
import { describe, expect, it } from "@effect/vitest";
12
-import * as Crypto from "effect/Crypto";
12
+import * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as DateTime from "effect/DateTime";
14
import * as Deferred from "effect/Deferred";
15
import * as Effect from "effect/Effect";
@@ -148,11 +148,8 @@ describe("ThreadPullRequestServiceV2 reads", () => {
148
}),
149
Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
150
Layer.succeed(
151
- Crypto.Crypto,
152
- Crypto.make({
153
- randomBytes: (size) => new Uint8Array(size).fill(1),
154
- digest: (_algorithm, data) => Effect.succeed(data),
155
- }),
151
+ SecureRandom.SecureRandom,
152
+ SecureRandom.make((size) => new Uint8Array(size).fill(1)),
153
),
154
FileSystem.layerNoop({}),
155
);
@@ -263,11 +260,8 @@ describe("ThreadPullRequestServiceV2 reads", () => {
260
}),
261
Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
262
Layer.succeed(
266
- Crypto.Crypto,
267
- Crypto.make({
268
- randomBytes: (size) => new Uint8Array(size).fill(1),
269
- digest: (_algorithm, data) => Effect.succeed(data),
270
- }),
263
+ SecureRandom.SecureRandom,
264
+ SecureRandom.make((size) => new Uint8Array(size).fill(1)),
265
),
266
FileSystem.layerNoop({}),
267
);
@@ -389,11 +383,8 @@ describe("ThreadPullRequestServiceV2 reads", () => {
383
Layer.mock(BackgroundPolicy.BackgroundPolicy)({}),
384
Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
385
Layer.succeed(
392
- Crypto.Crypto,
393
- Crypto.make({
394
- randomBytes: (size) => new Uint8Array(size).fill(1),
395
- digest: (_algorithm, data) => Effect.succeed(data),
396
- }),
386
+ SecureRandom.SecureRandom,
387
+ SecureRandom.make((size) => new Uint8Array(size).fill(1)),
388
),
389
FileSystem.layerNoop({}),
390
);
apps/server/src/orchestration-v2/ThreadPullRequestService.ts
+3
-3
@@ -10,7 +10,7 @@ import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
10
import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
11
import * as Cause from "effect/Cause";
12
import * as Context from "effect/Context";
13
-import * as Crypto from "effect/Crypto";
13
+import * as SecureRandom from "effect/crypto/SecureRandom";
14
import * as Effect from "effect/Effect";
15
import * as FileSystem from "effect/FileSystem";
16
import * as Option from "effect/Option";
@@ -100,7 +100,7 @@ export const make = Effect.gen(function* () {
100
const git = yield* GitManager.GitManager;
101
const pullRequests = yield* PullRequestService.PullRequestService;
102
const repositoryIdentities = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
103
- const crypto = yield* Crypto.Crypto;
103
+ const random = yield* SecureRandom.SecureRandom;
104
const fileSystem = yield* FileSystem.FileSystem;
105
const backgroundPolicy = yield* BackgroundPolicy.BackgroundPolicy;
106
const pendingBackfill = new Map<ThreadId, number>();
@@ -306,7 +306,7 @@ export const make = Effect.gen(function* () {
306
if (!projectWorkspaceMatchesSnapshot(currentProject, project.workspaceRoot)) {
307
return failBackfill([thread]);
308
}
309
- const uuid = yield* crypto.randomUUIDv4();
309
+ const uuid = yield* random.uuidV4();
310
yield* orchestrator.dispatch({
311
type: "thread.pull-request.sync",
312
commandId: CommandId.make(`server:thread-pull-request:${thread.id}:${uuid}`),
apps/server/src/orchestration-v2/ThreadSettlementService.test.ts
+3
-6
@@ -20,7 +20,7 @@ import {
20
type ServerSettingsPatch,
21
} from "@t3tools/contracts";
22
import { applyServerSettingsPatch } from "@t3tools/shared/serverSettings";
23
-import * as Crypto from "effect/Crypto";
23
+import * as SecureRandom from "effect/crypto/SecureRandom";
24
import * as Deferred from "effect/Deferred";
25
import * as Effect from "effect/Effect";
26
import * as FileSystem from "effect/FileSystem";
@@ -465,10 +465,7 @@ describe("autoSettlementSettingsKey", () => {
465
466
type AutoSettleCommand = Extract<OrchestrationV2Command, { readonly type: "thread.auto-settle" }>;
467
468
-const testCrypto = Crypto.make({
469
- randomBytes: (size) => new Uint8Array(size).fill(1),
470
- digest: (_algorithm, data) => Effect.succeed(data),
471
-});
468
+const testCrypto = SecureRandom.make((size) => new Uint8Array(size).fill(1));
469
470
function makeProject(
471
id: ProjectId = PROJECT_ID,
@@ -703,7 +700,7 @@ const makeHarness = Effect.fn("makeThreadSettlementHarness")(function* (options:
700
}),
701
Layer.succeed(ServerSettings.ServerSettingsService, serverSettings),
702
Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
706
- Layer.succeed(Crypto.Crypto, testCrypto),
703
+ Layer.succeed(SecureRandom.SecureRandom, testCrypto),
704
FileSystem.layerNoop({
705
exists: (path) => Effect.succeed(options.existingWorktreePaths?.includes(path) ?? false),
706
}),
apps/server/src/orchestration-v2/ThreadSettlementService.ts
+3
-3
@@ -14,7 +14,7 @@ import {
14
import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
15
import * as Cause from "effect/Cause";
16
import * as Context from "effect/Context";
17
-import * as Crypto from "effect/Crypto";
17
+import * as SecureRandom from "effect/crypto/SecureRandom";
18
import * as DateTime from "effect/DateTime";
19
import * as Effect from "effect/Effect";
20
import * as FiberSet from "effect/FiberSet";
@@ -295,7 +295,7 @@ export const make = Effect.gen(function* () {
295
const settingsService = yield* ServerSettings.ServerSettingsService;
296
const git = yield* GitManager.GitManager;
297
const pullRequests = yield* PullRequestService.PullRequestService;
298
- const crypto = yield* Crypto.Crypto;
298
+ const random = yield* SecureRandom.SecureRandom;
299
const fileSystem = yield* FileSystem.FileSystem;
300
// A shell merge or close sends no event, and the branch lookup caches an open pull request for
301
// a minute, so these threads' next lookup reads the host fresh.
@@ -339,7 +339,7 @@ export const make = Effect.gen(function* () {
339
autoSettleKeepPullRequests: currentSettings.sidebarAutoSettleKeepPullRequests,
340
});
341
if (settledAt === null) return thread;
342
- const uuid = yield* crypto.randomUUIDv4();
342
+ const uuid = yield* random.uuidV4();
343
yield* orchestrator.dispatch({
344
type: "thread.auto-settle",
345
commandId: CommandId.make(`server:auto-settle:${thread.id}:${uuid}`),
apps/server/src/orchestration-v2/runtimeLayer.test.ts
+14
-3
@@ -3,6 +3,7 @@ import { SourceControlProviderKind } from "@t3tools/contracts";
3
import { limitRecoveryCommand } from "./UsageLimitRecoveryWorker.ts";
4
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
5
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import { assert, it } from "@effect/vitest";
9
import { vi } from "vite-plus/test";
@@ -92,7 +93,7 @@ import * as ThreadCommandExecutor from "./ThreadCommandExecutor.ts";
93
import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
94
95
const layerPlatformTest = Layer.merge(
95
- NodeServices.layer,
96
+ Layer.mergeAll(NodeServices.layer, NodeCrypto.layer),
97
Layer.mock(SourceControlProviderRegistry.SourceControlProviderRegistry)({
98
resolveLink: () => Effect.die("unused title link"),
99
}),
@@ -1046,7 +1047,9 @@ it.layer(layerTest)("OrchestrationV2LayerLive", (it) => {
1047
(yield* outbox.listByCommandId(commandId)).map((effect) => effect.request.type),
1048
["provider-thread.rollback"],
1049
);
1049
- const path = yield* Path.Path.pipe(Effect.provide(NodeServices.layer));
1050
+ const path = yield* Path.Path.pipe(
1051
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1052
+ );
1053
yield* orchestrator.dispatch({
1054
type: "thread.create",
1055
createdBy: "user",
@@ -3238,6 +3241,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
3241
Effect.provide(
3242
Layer.mergeAll(
3243
NodeServices.layer,
3244
+ NodeCrypto.layer,
3245
Layer.mock(PullRequestService.PullRequestService)({
3246
watchFingerprint: () => Effect.succeed(null),
3247
detail: () =>
@@ -3366,6 +3370,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
3370
let headSha = "ad70160aaa";
3371
const host = Layer.mergeAll(
3372
NodeServices.layer,
3373
+ NodeCrypto.layer,
3374
Layer.mock(PullRequestService.PullRequestService)({
3375
detail: () =>
3376
Effect.sync(() => ({
@@ -3464,6 +3469,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
3469
let remainingStatus: "pending" | "success" = "pending";
3470
const host = Layer.mergeAll(
3471
NodeServices.layer,
3472
+ NodeCrypto.layer,
3473
Layer.mock(PullRequestService.PullRequestService)({
3474
detail: () =>
3475
Effect.sync(() => ({
@@ -3608,6 +3614,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
3614
);
3615
const host = Layer.mergeAll(
3616
NodeServices.layer,
3617
+ NodeCrypto.layer,
3618
Layer.mock(PullRequestService.PullRequestService)({
3619
detail: () =>
3620
Effect.sync(() => ({
@@ -3706,6 +3713,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
3713
let checks: PullRequestDetail["checks"] = [];
3714
const host = Layer.mergeAll(
3715
NodeServices.layer,
3716
+ NodeCrypto.layer,
3717
Layer.mock(PullRequestService.PullRequestService)({
3718
detail: () =>
3719
Effect.sync(() => ({
@@ -3809,6 +3817,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
3817
let checks: PullRequestDetail["checks"] = [];
3818
const host = Layer.mergeAll(
3819
NodeServices.layer,
3820
+ NodeCrypto.layer,
3821
Layer.mock(PullRequestService.PullRequestService)({
3822
detail: () =>
3823
Effect.sync(() => ({
@@ -3923,6 +3932,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
3932
let reads = 0;
3933
const host = Layer.mergeAll(
3934
NodeServices.layer,
3935
+ NodeCrypto.layer,
3936
Layer.mock(PullRequestService.PullRequestService)({
3937
// The host reports the same fingerprint throughout, so only the deadline can prompt a read.
3938
watchFingerprint: () =>
@@ -4146,6 +4156,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
4156
Effect.provide(
4157
Layer.mergeAll(
4158
NodeServices.layer,
4159
+ NodeCrypto.layer,
4160
Layer.mock(PullRequestService.PullRequestService)({
4161
detail: () => Effect.succeed(detail),
4162
activity: () =>
@@ -6882,7 +6893,7 @@ const layerScratchPromotionTest = ScratchThreadPromotion.layer.pipe(
6893
namedProjectsRoot: "/projects",
6894
}),
6895
),
6885
- Layer.provide(NodeServices.layer),
6896
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
6897
Layer.provideMerge(layerProjectDeletionTest),
6898
);
6899
apps/server/src/orchestration-v2/testkit/OrchestratorReplayRecovery.integration.test.ts
+20
-9
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import * as Effect from "effect/Effect";
@@ -206,7 +207,9 @@ const runCursorRecovery = Effect.fn("runCursorRecovery")(function* (input: {
207
const { phase1Commands, phase1Steps, phase2Commands, phase2Steps } =
208
splitAfterFirstIdle(materialized);
209
const options = {
209
- databaseLayer: SqlitePersistence.layerFromPath(dbPath).pipe(Layer.provide(NodeServices.layer)),
210
+ databaseLayer: SqlitePersistence.layerFromPath(dbPath).pipe(
211
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
212
+ ),
213
};
214
const harness = {
215
...CursorOrchestratorReplayHarness,
@@ -310,7 +313,7 @@ describe("orchestrator replay recovery", () => {
313
};
314
const options = {
315
databaseLayer: SqlitePersistence.layerFromPath(dbPath).pipe(
313
- Layer.provide(NodeServices.layer),
316
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
317
),
318
};
319
@@ -360,7 +363,9 @@ describe("orchestrator replay recovery", () => {
363
assert.lengthOf(projection.providerThreads, 1);
364
}).pipe(
365
provideDeterministicTestRuntime,
363
- Effect.provide(Layer.merge(IdAllocator.layer, NodeServices.layer)),
366
+ Effect.provide(
367
+ Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
368
+ ),
369
),
370
),
371
);
@@ -376,7 +381,9 @@ describe("orchestrator replay recovery", () => {
381
yield* runner.assertComplete;
382
}).pipe(
383
provideDeterministicTestRuntime,
379
- Effect.provide(Layer.merge(IdAllocator.layer, NodeServices.layer)),
384
+ Effect.provide(
385
+ Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
386
+ ),
387
),
388
),
389
);
@@ -408,7 +415,7 @@ describe("orchestrator replay recovery", () => {
415
const { harness, assertComplete } = makeClaudeRestartReplayHarness(transcript);
416
const options = {
417
databaseLayer: SqlitePersistence.layerFromPath(path.join(tempDir, "state.sqlite")).pipe(
411
- Layer.provide(NodeServices.layer),
418
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
419
),
420
};
421
@@ -488,7 +495,9 @@ describe("orchestrator replay recovery", () => {
495
);
496
}).pipe(
497
provideDeterministicTestRuntime,
491
- Effect.provide(Layer.merge(IdAllocator.layer, NodeServices.layer)),
498
+ Effect.provide(
499
+ Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
500
+ ),
501
),
502
),
503
);
@@ -520,7 +529,7 @@ describe("orchestrator replay recovery", () => {
529
const { harness, assertComplete } = makeClaudeRestartReplayHarness(transcript);
530
const options = {
531
databaseLayer: SqlitePersistence.layerFromPath(path.join(tempDir, "state.sqlite")).pipe(
523
- Layer.provide(NodeServices.layer),
532
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
533
),
534
};
535
const childThreadOf = (result: OrchestratorV2ScenarioResult, parentThreadId: ThreadId) =>
@@ -574,7 +583,7 @@ describe("orchestrator replay recovery", () => {
583
harness,
584
{
585
databaseLayer: SqlitePersistence.layerFromPath(snapshotPath).pipe(
577
- Layer.provide(NodeServices.layer),
586
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
587
),
588
recoverOnStartup: true,
589
continueThreadsAfterServerUpdate: false,
@@ -609,7 +618,9 @@ describe("orchestrator replay recovery", () => {
618
);
619
}).pipe(
620
provideDeterministicTestRuntime,
612
- Effect.provide(Layer.merge(IdAllocator.layer, NodeServices.layer)),
621
+ Effect.provide(
622
+ Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
623
+ ),
624
),
625
),
626
);
apps/server/src/orchestration-v2/testkit/OrchestratorReplayRestartBackgroundNote.integration.test.ts
+6
-3
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import { EventId, ProviderDriverKind, type ProviderReplayEntry } from "@t3tools/contracts";
@@ -158,7 +159,7 @@ const runRestart = Effect.fn("runRestart")(function* (input: {
159
const phase2Steps = materialized.steps.slice(firstIdle + 1);
160
const { harness, assertComplete } = makeClaudeRestartReplayHarness(transcript);
161
const layerDatabase = SqlitePersistence.layerFromPath(path.join(tempDir, "state.sqlite")).pipe(
161
- Layer.provide(NodeServices.layer),
162
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
163
);
164
const snapshotPath = path.join(tempDir, "restart-state.sqlite");
165
const scenario = (name: string, steps: typeof materialized.steps) => ({
@@ -217,7 +218,7 @@ const runRestart = Effect.fn("runRestart")(function* (input: {
218
),
219
);
220
const snapshotDatabase = SqlitePersistence.layerFromPath(snapshotPath).pipe(
220
- Layer.provide(NodeServices.layer),
221
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
222
);
223
const settled = projectionFor(before, SCENARIO);
224
assert.equal(settled.runs[0]?.status, "completed");
@@ -292,7 +293,9 @@ describe("restart-cancelled background work", () => {
293
]);
294
}).pipe(
295
provideDeterministicTestRuntime,
295
- Effect.provide(Layer.merge(IdAllocator.layer, NodeServices.layer)),
296
+ Effect.provide(
297
+ Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
298
+ ),
299
),
300
),
301
);
apps/server/src/orchestration-v2/testkit/ProviderReplayHarness.ts
+8
-4
@@ -1,5 +1,6 @@
1
import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
2
import { DEFAULT_SIGNAL_EXPORT } from "@t3tools/shared/observability";
3
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
4
import * as NodeServices from "@effect/platform-node/NodeServices";
5
import type {
6
ManagedPolicyDocument,
@@ -349,7 +350,7 @@ export function layerWithRegistry<Error>(
350
ThreadCommandExecutor.layer,
351
GitVcsDriver.layer.pipe(
352
Layer.provide(layerServerConfig),
352
- Layer.provide(NodeServices.layer),
353
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
354
),
355
),
356
),
@@ -357,11 +358,11 @@ export function layerWithRegistry<Error>(
358
const layerVcsDriverRegistry = VcsDriverRegistry.layer.pipe(
359
Layer.provide(VcsProcess.layer),
360
Layer.provide(layerServerConfig),
360
- Layer.provide(NodeServices.layer),
361
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
362
);
363
const layerCheckpointStore = CheckpointStore.layer.pipe(
364
Layer.provide(layerVcsDriverRegistry),
364
- Layer.provide(NodeServices.layer),
365
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
366
);
367
const layerCheckpointServiceProvided = CheckpointService.layer.pipe(
368
Layer.provide(Layer.mergeAll(layerCheckpointStore, IdAllocator.layer)),
@@ -539,7 +540,10 @@ export function layerWithRegistry<Error>(
540
layerEventSinkProvided,
541
layerContinuationWorkerProvided,
542
layerCommandOutputHubProvided,
542
- ).pipe(Layer.provide(ProviderTurnStartServiceTestkit.layer), Layer.provide(NodeServices.layer));
543
+ ).pipe(
544
+ Layer.provide(ProviderTurnStartServiceTestkit.layer),
545
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
546
+ );
547
548
if (options.runEffectWorker === false) {
549
return layerReplayRuntime;
apps/server/src/peer/PeerForwarding.test.ts
+1
-1
@@ -265,7 +265,7 @@ const makeLaptop = Effect.gen(function* () {
265
McpHttpServer.layerThreadToolkit,
266
).pipe(
267
Layer.provide(DocumentText.layer.pipe(Layer.provideMerge(NodeServices.layer))),
268
- Layer.provideMerge(McpServer.McpServer.layer),
268
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
269
Layer.provide(Layer.mock(ThreadSearch.ThreadSearch)({})),
270
Layer.provide(Layer.mock(ThreadLaunch.ThreadLaunchService)({})),
271
Layer.provide(
apps/server/src/peer/PeerForwarding.ts
+3
-3
@@ -10,7 +10,7 @@ import {
10
OrchestratorMcpThreadWaitResult,
11
} from "@t3tools/contracts";
12
import * as Context from "effect/Context";
13
-import * as Crypto from "effect/Crypto";
13
+import * as Digest from "effect/crypto/Digest";
14
import * as DateTime from "effect/DateTime";
15
import * as Effect from "effect/Effect";
16
import * as Hex from "effect/encoding/Hex";
@@ -94,7 +94,7 @@ export const remoteTarget = (scope: Scope, environmentId: EnvironmentId | undefi
94
const make = Effect.gen(function* () {
95
const peers = yield* PeerMcpClient.PeerMcpClient;
96
const links = yield* PeerLinks.PeerLinks;
97
- const crypto = yield* Crypto.Crypto;
97
+ const crypto = yield* Digest.Digest;
98
const threads = yield* ThreadManagement.ThreadManagementService;
99
100
/**
@@ -117,7 +117,7 @@ const make = Effect.gen(function* () {
117
* key never collide there, and one agent retrying gets its first result.
118
*/
119
const scopedRequestId = (namespace: string, clientRequestId: string) =>
120
- crypto.digest("SHA-256", new TextEncoder().encode(`${namespace}\n${clientRequestId}`)).pipe(
120
+ crypto.digest(Digest.sha256, new TextEncoder().encode(`${namespace}\n${clientRequestId}`)).pipe(
121
Effect.map((digest) => `fwd:${Hex.encode(digest)}`),
122
Effect.orDie,
123
);
apps/server/src/peer/PeerLinkRequests.test.ts
+1
-1
@@ -152,7 +152,7 @@ const makeLaptop = Effect.gen(function* () {
152
Layer.provideMerge(Layer.merge(layerOrchestrator, ServerSettings.layerTest())),
153
);
154
const layerHere = McpHttpServer.layerOrchestratorToolkit.pipe(
155
- Layer.provideMerge(McpServer.McpServer.layer),
155
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
156
Layer.provideMerge(PeerLinkRequests.layer),
157
Layer.provide(Layer.mock(PeerForwarding.PeerForwarding)({})),
158
Layer.provide(Layer.mock(RemoteDelegation.RemoteDelegation)({})),
apps/server/src/peer/PeerLinkRequests.ts
+3
-3
@@ -23,7 +23,7 @@ import {
23
TurnItemId,
24
} from "@t3tools/contracts";
25
import * as Context from "effect/Context";
26
-import * as Crypto from "effect/Crypto";
26
+import * as SecureRandom from "effect/crypto/SecureRandom";
27
import * as DateTime from "effect/DateTime";
28
import * as Effect from "effect/Effect";
29
import * as Layer from "effect/Layer";
@@ -84,7 +84,7 @@ export class PeerLinkRequests extends Context.Service<
84
const make = Effect.gen(function* () {
85
const threadManagement = yield* ThreadManagementService.ThreadManagementService;
86
const peerLinks = yield* PeerLinks.PeerLinks;
87
- const crypto = yield* Crypto.Crypto;
87
+ const random = yield* SecureRandom.SecureRandom;
88
89
const readCard = (threadId: ThreadId, turnItemId: TurnItemId) =>
90
threadManagement
@@ -230,7 +230,7 @@ const make = Effect.gen(function* () {
230
} as const;
231
}
232
}
233
- const key = input.clientRequestId ?? (yield* crypto.randomUUIDv4().pipe(Effect.orDie));
233
+ const key = input.clientRequestId ?? (yield* random.uuidV4());
234
// A retry with the same clientRequestId finds this card and records nothing.
235
const turnItemId = cardId(threadId, scope.requestNamespace, key);
236
if (input.clientRequestId !== undefined) {
apps/server/src/peer/PeerLinks.testkit.ts
+4
-4
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import {
4
EnvironmentHttpApi,
@@ -78,7 +79,7 @@ export const servePeer = <E, R>(
79
Layer.provideMerge(ServerSecretStore.layer),
80
Layer.provideMerge(ServerEnvironment.layerIdentity),
81
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "t3-peer-link-peer-" })),
81
- Layer.provideMerge(NodeServices.layer),
82
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
83
Layer.fresh,
84
Layer.build,
85
);
@@ -103,8 +104,7 @@ export const servePeer = <E, R>(
104
Layer.provide(ServerHttp.layerServerEnvironmentHttpApi),
105
Layer.provide(AuthHttp.layerAuthenticatedAuth),
106
),
106
- tools.pipe(
107
- Layer.provideMerge(McpHttpServer.layerMcpTransport),
107
+ McpHttpServer.layerMcpTransport(tools).pipe(
108
Layer.provide(
109
Layer.mock(McpSessionRegistry.McpSessionRegistry)({
110
// @effect-diagnostics-next-line effectSucceedWithVoid:off - This optional result requires undefined, not the wider void type.
@@ -171,7 +171,7 @@ export const layerLinkingEnvironment = (
171
}),
172
),
173
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-peer-link-here-" })),
174
- Layer.provideMerge(NodeServices.layer),
174
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
175
Layer.fresh,
176
);
177
apps/server/src/peer/PeerLinks.ts
+8
-6
@@ -13,7 +13,8 @@ import {
13
type PeerLinkSummary,
14
} from "@t3tools/contracts";
15
import * as Context from "effect/Context";
16
-import * as Crypto from "effect/Crypto";
16
+import * as Digest from "effect/crypto/Digest";
17
+import * as SecureRandom from "effect/crypto/SecureRandom";
18
import * as DateTime from "effect/DateTime";
19
import * as Duration from "effect/Duration";
20
import * as Effect from "effect/Effect";
@@ -169,7 +170,8 @@ const linkLimitsHold = (peer: { readonly capabilities: ExecutionEnvironmentCapab
170
const make = Effect.gen(function* () {
171
const sql = yield* SqlClient.SqlClient;
172
const secrets = yield* ServerSecretStore.ServerSecretStore;
172
- const crypto = yield* Crypto.Crypto;
173
+ const random = yield* SecureRandom.SecureRandom;
174
+ const digest = yield* Digest.Digest;
175
const httpClient = yield* HttpClient.HttpClient;
176
const environment = yield* ServerEnvironment.ServerEnvironment;
177
const serverSettings = yield* ServerSettings.ServerSettingsService;
@@ -179,7 +181,7 @@ const make = Effect.gen(function* () {
181
);
182
183
/** A fresh name for one link's token; the row records it. */
182
- const newSecretName = crypto.randomBytes(16).pipe(
184
+ const newSecretName = random.randomBytes(16).pipe(
185
Effect.map((bytes) => `peer-link-${Hex.encode(bytes)}`),
186
Effect.orDie,
187
);
@@ -255,11 +257,11 @@ const make = Effect.gen(function* () {
257
),
258
),
259
);
258
- const verifier = Base64Url.encode(yield* crypto.randomBytes(32).pipe(Effect.orDie));
260
+ const verifier = Base64Url.encode(yield* random.randomBytes(32));
261
const challenge = Base64Url.encode(
260
- yield* crypto.digest("SHA-256", new TextEncoder().encode(verifier)).pipe(Effect.orDie),
262
+ yield* digest.digest(Digest.sha256, new TextEncoder().encode(verifier)).pipe(Effect.orDie),
263
);
262
- const state = Base64Url.encode(yield* crypto.randomBytes(16).pipe(Effect.orDie));
264
+ const state = Base64Url.encode(yield* random.randomBytes(16));
265
const resource = `${origin}/mcp`;
266
const decided = yield* client.mcpOAuth
267
.decision({
apps/server/src/peer/RemoteDelegation.test.ts
+1
-1
@@ -565,7 +565,7 @@ const makeLaptop = (
565
Layer.provideMerge(Layer.merge(layerOrchestrator, ServerSettings.layerTest())),
566
);
567
const layerHere = McpHttpServer.layerOrchestratorToolkit.pipe(
568
- Layer.provideMerge(McpServer.McpServer.layer),
568
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
569
Layer.provideMerge(
570
RemoteDelegation.layer.pipe(
571
Layer.provideMerge(PeerForwarding.layer),
apps/server/src/peer/RemoteDelegation.ts
+5
-5
@@ -15,7 +15,7 @@ import {
15
type ThreadId,
16
} from "@t3tools/contracts";
17
import * as Context from "effect/Context";
18
-import * as Crypto from "effect/Crypto";
18
+import * as SecureRandom from "effect/crypto/SecureRandom";
19
import * as Duration from "effect/Duration";
20
import * as Effect from "effect/Effect";
21
import * as Layer from "effect/Layer";
@@ -121,7 +121,7 @@ const make = Effect.gen(function* () {
121
const projections = yield* ProjectionStore.ProjectionStoreV2;
122
const projects = yield* ProjectService.ProjectService;
123
const repositoryIdentities = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
124
- const crypto = yield* Crypto.Crypto;
124
+ const random = yield* SecureRandom.SecureRandom;
125
const hereId = yield* ServerEnvironment.ServerEnvironment.pipe(
126
Effect.flatMap((environment) => environment.getEnvironmentId),
127
);
@@ -256,7 +256,7 @@ const make = Effect.gen(function* () {
256
// One key for the launch there and the record here, so a retry finds both.
257
// Both are scoped to the provider session, as every key a caller passes is:
258
// the forwarder scopes the launch's, and the record's names it.
259
- const key = input.clientRequestId ?? (yield* crypto.randomUUIDv4().pipe(Effect.orDie));
259
+ const key = input.clientRequestId ?? (yield* random.uuidV4());
260
const task = taskPrompt(input);
261
const launched = yield* forwarding.call(
262
scope,
@@ -369,7 +369,7 @@ const make = Effect.gen(function* () {
369
stoppedThere: "ran-out" | "stopped" | undefined,
370
stopCount?: number,
371
) {
372
- const attempt = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
372
+ const attempt = yield* random.uuidV4();
373
yield* threads
374
.dispatch({
375
type: "delegated_task.remote.complete",
@@ -699,7 +699,7 @@ const make = Effect.gen(function* () {
699
const there = followScope(scope.thread, remote);
700
// A later cancel stops what started there since; a retry of this one, nothing new.
701
const key = `cancel:${encodeURIComponent(scope.requestNamespace)}:${
702
- input.clientRequestId ?? (yield* crypto.randomUUIDv4().pipe(Effect.orDie))
702
+ input.clientRequestId ?? (yield* random.uuidV4())
703
}`;
704
if (task.result !== null) {
705
// Best effort: the result stands whether or not the stop gets there.
apps/server/src/persistence/OrchestrationEventStore.sequence.test.ts
+3
-2
@@ -1,5 +1,6 @@
1
import { CommandId, EventId, ProviderSessionId, ThreadId } from "@t3tools/contracts";
2
import { assert, it } from "@effect/vitest";
3
+import * as Arr from "effect/Array";
4
import * as DateTime from "effect/DateTime";
5
import * as Effect from "effect/Effect";
6
import * as Layer from "effect/Layer";
@@ -53,7 +54,7 @@ function eventRow(
54
}
55
56
const seedEvents = Effect.fn("test.seedSequenceEvents")(function* (
56
- rows: ReadonlyArray<ReturnType<typeof eventRow>>,
57
+ rows: Arr.NonEmptyReadonlyArray<ReturnType<typeof eventRow>>,
58
) {
59
const sql = yield* SqlClient.SqlClient;
60
return yield* sql<{
@@ -117,7 +118,7 @@ it.effect(
118
Effect.gen(function* () {
119
const store = yield* OrchestrationEventStore.OrchestrationEventStore;
120
const rows = yield* seedEvents(
120
- Array.from({ length: 1_560 }, (_, index) => {
121
+ Arr.makeBy(1_560, (index) => {
122
const kind = index % 3 === 1 ? "project" : "thread";
123
return eventRow(
124
index,
apps/server/src/policy/ManagedPolicy.ts
+5
-4
@@ -9,7 +9,7 @@ import * as NodeModule from "node:module";
9
import { ManagedPolicyDocument, type ManagedPolicySummary } from "@t3tools/contracts";
10
import * as Config from "effect/Config";
11
import * as Context from "effect/Context";
12
-import * as Crypto from "effect/Crypto";
12
+import * as Digest from "effect/crypto/Digest";
13
import * as Effect from "effect/Effect";
14
import * as Hex from "effect/encoding/Hex";
15
import * as Layer from "effect/Layer";
@@ -53,9 +53,10 @@ export const loadedPolicy = Effect.fn("ManagedPolicy.loadedPolicy")(function* (
53
) {
54
if (policy.document === undefined) return null;
55
const json = yield* encodeDocumentJson(policy.document).pipe(Effect.orDie);
56
- const digest = yield* (yield* Crypto.Crypto)
57
- .digest("SHA-256", new TextEncoder().encode(json))
58
- .pipe(Effect.orDie);
56
+ const digest = yield* (yield* Digest.Digest).digest(
57
+ Digest.sha256,
58
+ new TextEncoder().encode(json),
59
+ );
60
return {
61
source: policy.path,
62
organization: policy.document.organization,
apps/server/src/preview/Manager.ts
+4
-4
@@ -19,7 +19,7 @@ import {
19
normalizePreviewUrl,
20
} from "@t3tools/shared/preview";
21
import * as Context from "effect/Context";
22
-import * as Crypto from "effect/Crypto";
22
+import * as SecureRandom from "effect/crypto/SecureRandom";
23
import * as DateTime from "effect/DateTime";
24
import * as Effect from "effect/Effect";
25
import * as Layer from "effect/Layer";
@@ -119,8 +119,8 @@ const currentIsoTimestamp = DateTime.now.pipe(Effect.map(DateTime.formatIso));
119
120
/** @public */
121
export const make = Effect.gen(function* PreviewManagerMake() {
122
- const crypto = yield* Crypto.Crypto;
123
- const serverEpoch = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
122
+ const random = yield* SecureRandom.SecureRandom;
123
+ const serverEpoch = yield* random.uuidV4();
124
const stateRef = yield* SynchronizedRef.make<ManagerState>(initialState);
125
const eventsPubSub = yield* PubSub.unbounded<PreviewEvent>();
126
const events: Stream.Stream<PreviewEvent> = Stream.fromPubSub(eventsPubSub);
@@ -427,7 +427,7 @@ export const make = Effect.gen(function* PreviewManagerMake() {
427
...session.snapshot,
428
reveal: true,
429
revealRequest: {
430
- id: yield* crypto.randomUUIDv4().pipe(Effect.orDie),
430
+ id: yield* random.uuidV4(),
431
force: input.force,
432
},
433
updatedAt: yield* currentIsoTimestamp,
apps/server/src/preview/PreviewBrowser.test.ts
+6
-4
@@ -1,7 +1,9 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { expect, it } from "@effect/vitest";
5
import * as HostProcess from "@t3tools/shared/HostProcess";
4
-import * as Crypto from "effect/Crypto";
6
+import * as Digest from "effect/crypto/Digest";
7
import type * as Duration from "effect/Duration";
8
import * as DateTime from "effect/DateTime";
9
import * as Effect from "effect/Effect";
@@ -85,9 +87,9 @@ const makeHarness = Effect.fn("test.makePreviewBrowser")(function* (
87
const path = yield* Path.Path;
88
const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-preview-browser-test-" });
89
const archive = options.archive ?? browserArchive;
88
- const crypto = yield* Crypto.Crypto;
90
+ const digest = yield* Digest.Digest;
91
const sha256 =
90
- options.sha256 ?? Hex.encode(yield* crypto.digest("SHA-256", archive).pipe(Effect.orDie));
92
+ options.sha256 ?? Hex.encode(yield* digest.digest(Digest.sha256, archive).pipe(Effect.orDie));
93
const requests: Array<string> = [];
94
const browser = yield* PreviewBrowser.makePreviewBrowser({
95
baseDir,
@@ -121,7 +123,7 @@ const makeHarness = Effect.fn("test.makePreviewBrowser")(function* (
123
return { browser, fs, path, baseDir, installRoot, requests };
124
});
125
124
-it.layer(NodeServices.layer)("PreviewBrowser", (it) => {
126
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("PreviewBrowser", (it) => {
127
it.effect.each(["0.8.0", "1.2.3"])("retains another version when installing %s", (current) =>
128
Effect.gen(function* () {
129
const { browser, fs, path, installRoot, requests } = yield* makeHarness({ version: current });
apps/server/src/preview/ServerBrowser.test.ts
+2
-1
@@ -3,6 +3,7 @@ import * as NodeVM from "node:vm";
3
// @effect-diagnostics-next-line nodeBuiltinImport:off - Playwright download mocks perform real file operations outside the Effect runtime.
4
import * as NodeFSP from "node:fs/promises";
5
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import * as HostProcess from "@t3tools/shared/HostProcess";
9
import { it } from "@effect/vitest";
@@ -384,7 +385,7 @@ const dependencies = Layer.mergeAll(
385
PreviewAgentActivity.layer,
386
).pipe(
387
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "t3-server-browser-" })),
387
- Layer.provideMerge(NodeServices.layer),
388
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
389
);
390
const layer = ServerBrowser.layer.pipe(Layer.provideMerge(dependencies));
391
const ready = Effect.gen(function* () {
apps/server/src/preview/ServerBrowserStream.test.ts
+1
-1
@@ -34,7 +34,7 @@ const makeAuth = (
34
const requests: string[] = [];
35
const layer = Layer.mock(EnvironmentAuth.EnvironmentAuth, {
36
authenticateWebSocketUpgrade: (request) => {
37
- requests.push(request.originalUrl);
37
+ requests.push(request.url);
38
return error
39
? Effect.fail(error)
40
: Effect.succeed({
apps/server/src/preview/ServerBrowserStream.ts
+2
-1
@@ -24,6 +24,7 @@ import { authenticateMediaRequest } from "../auth/http.ts";
24
import { assetResponseHeaders } from "../http.ts";
25
import * as PreviewBrowserHost from "./PreviewBrowserHost.ts";
26
import * as ServerBrowser from "./ServerBrowser.ts";
27
+import { requestUrl } from "../requestUrl.ts";
28
29
const PREVIEW_STREAM_ROUTE_PREFIX = "/api/preview-stream";
30
const TAB_GONE_CODE = 4404;
@@ -53,7 +54,7 @@ const parseMessage = (chunk: Uint8Array | string): unknown => {
54
// Request middleware owns tracing, including long-lived WebSocket sessions.
55
const makeHandler = Effect.fnUntraced(function* (browser: ServerBrowser.ServerBrowser["Service"]) {
56
const request = yield* HttpServerRequest.HttpServerRequest;
56
- const url = HttpServerRequest.toURL(request);
57
+ const url = requestUrl(request);
58
if (Option.isNone(url)) return HttpServerResponse.text("Bad Request", { status: 400 });
59
if (url.value.pathname === `${PREVIEW_STREAM_ROUTE_PREFIX}/download`) {
60
return yield* serveDownload(browser, url.value.searchParams);
apps/server/src/process/agentScope.test.ts
+5
-2
@@ -127,8 +127,11 @@ const withFakeSystemd = <A, E>(
127
),
128
);
129
130
-const unitOf = (launch: { readonly args: ReadonlyArray<string> }) =>
131
- launch.args.find((arg) => arg.startsWith("--unit="))?.slice("--unit=".length) ?? "";
130
+const unitOf = (launch: Pick<ChildProcess.StandardCommand, "args">) =>
131
+ launch.args
132
+ .map(String)
133
+ .find((arg) => arg.startsWith("--unit="))
134
+ ?.slice("--unit=".length) ?? "";
135
136
const sliceOf = (launch: { readonly args: ReadonlyArray<string> }) =>
137
launch.args.find((arg) => arg.startsWith("--slice="))?.slice("--slice=".length) ?? "";
apps/server/src/process/externalLauncher.test.ts
+1
-1
@@ -302,7 +302,7 @@ it.effect.skipIf(windowsHost)(
302
assert.ok(spawned);
303
assert.equal(spawned.command, "powershell.exe");
304
assert.equal(spawned.options.detached, true);
305
- const encodedCommand = spawned.args[spawned.args.length - 1] ?? "";
305
+ const encodedCommand = String(spawned.args[spawned.args.length - 1] ?? "");
306
const decodedCommand = Buffer.from(encodedCommand, "base64").toString("utf16le");
307
assert.equal(
308
decodedCommand,
apps/server/src/project/ManagedProjectFolders.test.ts
+4
-3
@@ -1,4 +1,5 @@
1
import { assert, it } from "@effect/vitest";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import { CommandId, ProjectId, ThreadId, VcsProcessSpawnError } from "@t3tools/contracts";
5
import * as Deferred from "effect/Deferred";
@@ -76,7 +77,7 @@ const layer = (baseDir: string, options?: HarnessOptions) =>
77
Layer.provideMerge(SqlitePersistence.layerMemory),
78
Layer.provideMerge(ServerSettings.layerTest()),
79
Layer.provideMerge(ServerConfig.layerTest(baseDir, baseDir)),
79
- Layer.provideMerge(NodeServices.layer),
80
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
81
);
82
83
const withScratch = <A, E>(
@@ -96,7 +97,7 @@ const withScratch = <A, E>(
97
const fileSystem = yield* FileSystem.FileSystem;
98
const baseDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-managed-folders-" });
99
return yield* body({ baseDir }).pipe(Effect.provide(layer(baseDir, options)));
99
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer));
100
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
101
102
const git = (cwd: string, args: ReadonlyArray<string>) =>
103
ProcessRunner.ProcessRunner.pipe(
@@ -124,7 +125,7 @@ it.effect("offers nothing when the data dir sits inside a Git checkout", () =>
125
const failure = yield* Effect.flip(scratch.ensureScratchProject);
126
assert.equal(failure._tag, "ScratchUnavailableError");
127
}).pipe(Effect.provide(layer(baseDir)));
127
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
128
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
129
);
130
131
it.effect("offers a Scratch folder when Git is not installed", () =>
apps/server/src/project/ManagedProjectFolders.ts
+7
-7
@@ -8,7 +8,7 @@ import {
8
import { newProjectFolderName } from "@t3tools/shared/path";
9
import * as Cause from "effect/Cause";
10
import * as Context from "effect/Context";
11
-import * as Crypto from "effect/Crypto";
11
+import * as SecureRandom from "effect/crypto/SecureRandom";
12
import * as DateTime from "effect/DateTime";
13
import * as Duration from "effect/Duration";
14
import * as Effect from "effect/Effect";
@@ -208,7 +208,7 @@ const make = Effect.gen(function* () {
208
const gitWorkflow = yield* GitWorkflow.GitWorkflowService;
209
const git = yield* GitVcsDriver.GitVcsDriver;
210
const projects = yield* ProjectService.ProjectService;
211
- const crypto = yield* Crypto.Crypto;
211
+ const random = yield* SecureRandom.SecureRandom;
212
213
// Non-recursive mkdir atomically claims a name; racers move on after AlreadyExists.
214
const claimFreeFolder = Effect.fnUntraced(function* <E>(
@@ -261,8 +261,8 @@ const make = Effect.gen(function* () {
261
),
262
);
263
yield* makeScratchFolder(workspaceRoot);
264
- const id = yield* crypto
265
- .randomUUIDv4()
264
+ const id = yield* random
265
+ .uuidV4()
266
.pipe(Effect.mapError((cause) => new ScratchProjectError({ workspaceRoot, cause })));
267
const bootstrapped = yield* projects
268
.bootstrap({
@@ -333,7 +333,7 @@ const make = Effect.gen(function* () {
333
? Effect.succeedSome(folderFor(id.slice(-8)))
334
: attempt === 2
335
? Effect.succeedSome(fullFolder)
336
- : crypto.randomUUIDv4().pipe(
336
+ : random.uuidV4().pipe(
337
Effect.map((uuid) => Option.some(`${fullFolder}-${uuid.slice(0, 8)}`)),
338
Effect.mapError((cause) => new ScratchFolderError({ folder: fullFolder, cause })),
339
),
@@ -427,8 +427,8 @@ const make = Effect.gen(function* () {
427
scaffoldRepository(workspaceRoot, input.name).pipe(
428
Effect.mapError((cause) => new NamedProjectFolderError({ folder: workspaceRoot, cause })),
429
),
430
- crypto
431
- .randomUUIDv4()
430
+ random
431
+ .uuidV4()
432
.pipe(Effect.mapError((cause) => new NamedProjectCreateError({ workspaceRoot, cause }))),
433
]).pipe(Effect.onExit((exit) => (Exit.isSuccess(exit) ? Effect.void : removeFolder)));
434
const [commitError, id] = prepared;
apps/server/src/project/ProjectService.test.ts
+5
-3
@@ -1,7 +1,9 @@
1
+import * as Arr from "effect/Array";
2
import * as Context from "effect/Context";
3
import * as Queue from "effect/Queue";
4
import * as Tracer from "effect/Tracer";
5
import { assert, it } from "@effect/vitest";
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import { CommandId, type Project, ProjectId, ProviderInstanceId } from "@t3tools/contracts";
9
import * as Deferred from "effect/Deferred";
@@ -102,7 +104,7 @@ const layerTestFor = (
104
Layer.provideMerge(SqlitePersistence.layerMemory),
105
Layer.provideMerge(ServerSettings.layerTest()),
106
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "project-service-test-" })),
105
- Layer.provide(NodeServices.layer),
107
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
108
Layer.provideMerge(layerEnrichmentCompletions),
109
);
110
@@ -138,7 +140,7 @@ it.effect("resolves only the requested active project page in creation order", (
140
const service = yield* ProjectService.ProjectService;
141
const enrichment = yield* ProjectEnrichmentService.ProjectEnrichmentService;
142
const changes = yield* enrichment.subscribeChanges;
141
- const rows = Array.from({ length: 6 }, (_, index) => ({
143
+ const rows = Arr.makeBy(6, (index) => ({
144
project_id: `page:${index}`,
145
title: `Project ${index}`,
146
workspace_root: `/work/page-${index}`,
@@ -204,7 +206,7 @@ const layerProjectServiceDependencies = Layer.mergeAll(
206
Layer.provideMerge(SqlitePersistence.layerMemory),
207
Layer.provideMerge(ServerSettings.layerTest()),
208
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "project-service-race-" })),
207
- Layer.provide(NodeServices.layer),
209
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
210
);
211
212
const waitForProject = Effect.fn("ProjectServiceTest.waitForProject")(function* (
apps/server/src/project/ProjectSetupScriptRunner.ts
+4
-6
@@ -9,7 +9,7 @@ import {
9
10
import * as Clock from "effect/Clock";
11
import * as Context from "effect/Context";
12
-import * as Crypto from "effect/Crypto";
12
+import * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as Deferred from "effect/Deferred";
14
import * as Effect from "effect/Effect";
15
import * as Layer from "effect/Layer";
@@ -199,7 +199,7 @@ export const make = Effect.gen(function* () {
199
const threads = yield* ProjectionStore.ProjectionStoreV2;
200
const terminalManager = yield* TerminalManager.TerminalManager;
201
const serverSettings = yield* ServerSettings.ServerSettingsService;
202
- const crypto = yield* Crypto.Crypto;
202
+ const random = yield* SecureRandom.SecureRandom;
203
const serviceScope = yield* Effect.scope;
204
205
const observeTerminalCompletion = Effect.fn("ProjectSetupScriptRunner.observeTerminalCompletion")(
@@ -430,7 +430,7 @@ export const make = Effect.gen(function* () {
430
// Earlier settle shells may still run foreground programs; do not type resumed settles into them.
431
const terminalId =
432
trigger === "settle"
433
- ? `settle-${script.id}-${(yield* crypto.randomUUIDv4().pipe(Effect.orDie)).slice(0, 8)}`
433
+ ? `settle-${script.id}-${(yield* random.uuidV4()).slice(0, 8)}`
434
: `setup-${script.id}`;
435
const cwd = input.worktreePath;
436
const env = {
@@ -442,9 +442,7 @@ export const make = Effect.gen(function* () {
442
COLORTERM: "",
443
};
444
const observe = input.observeCompletion;
445
- const completionToken = observe
446
- ? (yield* crypto.randomUUIDv4().pipe(Effect.orDie)).replaceAll("-", "")
447
- : null;
445
+ const completionToken = observe ? (yield* random.uuidV4()).replaceAll("-", "") : null;
446
const echoedWrapperLines: string[] = [];
447
// Subscribe before opening so neither startup activity nor the sentinel can race the listeners.
448
const observed =
apps/server/src/project/ScratchThreadPromotion.ts
+3
-5
@@ -5,7 +5,7 @@ import {
5
type ThreadId,
6
} from "@t3tools/contracts";
7
import * as Context from "effect/Context";
8
-import * as Crypto from "effect/Crypto";
8
+import * as SecureRandom from "effect/crypto/SecureRandom";
9
import * as Effect from "effect/Effect";
10
import * as Layer from "effect/Layer";
11
import * as Option from "effect/Option";
@@ -48,7 +48,7 @@ const make = Effect.gen(function* () {
48
const projects = yield* ProjectService.ProjectService;
49
const threads = yield* ThreadManagementService.ThreadManagementService;
50
const scheduledTasks = yield* ScheduledTaskService.ScheduledTaskService;
51
- const crypto = yield* Crypto.Crypto;
51
+ const random = yield* SecureRandom.SecureRandom;
52
const path = yield* Path.Path;
53
54
const fail = (reason: string) => (cause: unknown) =>
@@ -128,9 +128,7 @@ const make = Effect.gen(function* () {
128
);
129
});
130
131
- const randomId = crypto
132
- .randomUUIDv4()
133
- .pipe(Effect.mapError(fail("Could not create an id for the project.")));
131
+ const randomId = random.uuidV4();
132
133
// bootstrap returns the project that already owns the folder, so retries reuse it.
134
const createProject = Effect.fn("ScratchThreadPromotion.createProject")(function* (
apps/server/src/provider/AcpRegistryProbe.test.ts
+3
-1
@@ -2,7 +2,9 @@
2
import * as NodePath from "node:path";
3
import * as NodeURL from "node:url";
4
5
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
6
import * as NodeServices from "@effect/platform-node/NodeServices";
7
+import * as Layer from "effect/Layer";
8
import { ProviderInstanceId } from "@t3tools/contracts";
9
import { AcpRegistrySettings } from "@t3tools/provider-acp-registry/settings";
10
import { describe, expect, it } from "@effect/vitest";
@@ -370,7 +372,7 @@ describe("ACP Registry probe", () => {
372
yield* logoutAcpRegistry(input);
373
}).pipe(
374
Effect.provideService(AcpRegistrySupport.AcpRegistryCatalog, catalog),
373
- Effect.provide(NodeServices.layer),
375
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
376
Effect.scoped,
377
);
378
});
apps/server/src/provider/AgentContextBudget.test.ts
+3
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { expect, it } from "@effect/vitest";
4
import { ProviderInstanceId } from "@t3tools/contracts";
@@ -77,7 +78,7 @@ const toolHandlerServices = Layer.mergeAll(
78
Layer.mock(ThreadManagementService)({}),
79
Layer.mock(ThreadSearch)({}),
80
Layer.mock(VcsStatusBroadcaster)({}),
80
-).pipe(Layer.provideMerge(NodeServices.layer));
81
+).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
82
83
const utf8Bytes = (text: string) => Buffer.byteLength(text, "utf8");
84
@@ -132,7 +133,7 @@ it.effect("agent context matches the committed budget", () =>
133
}).pipe(
134
Effect.provide(
135
McpHttpServer.layerTools.pipe(
135
- Layer.provideMerge(McpServer.McpServer.layer),
136
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
137
Layer.provide(toolHandlerServices),
138
),
139
),
apps/server/src/provider/AntigravityAuth.test.ts
+3
-1
@@ -1,4 +1,6 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { assert, it } from "@effect/vitest";
5
import { ProviderInstanceId, ProviderSetupError, type ProviderAuthState } from "@t3tools/contracts";
6
import * as Deferred from "effect/Deferred";
@@ -145,7 +147,7 @@ const makeHarness = Effect.fn("makeAuthTestHarness")(function* (
147
};
148
});
149
148
-it.layer(NodeServices.layer)("AntigravityAuth", (it) => {
150
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("AntigravityAuth", (it) => {
151
it.effect("accepts a delayed duplicate after callback completion starts", () =>
152
Effect.gen(function* () {
153
const harness = yield* makeHarness();
apps/server/src/provider/AntigravityAuth.ts
+5
-5
@@ -5,7 +5,7 @@ import {
5
} from "@t3tools/contracts";
6
import * as Cause from "effect/Cause";
7
import * as Clock from "effect/Clock";
8
-import * as Crypto from "effect/Crypto";
8
+import * as SecureRandom from "effect/crypto/SecureRandom";
9
import * as DateTime from "effect/DateTime";
10
import * as Deferred from "effect/Deferred";
11
import * as Effect from "effect/Effect";
@@ -137,8 +137,8 @@ export const makeAntigravityAuth = Effect.fn("makeAntigravityAuth")(function* <
137
Runtime extends AntigravityAuthRuntime,
138
>(
139
options: AntigravityAuthOptions<Runtime>,
140
-): Effect.fn.Return<AntigravityAuth, never, Crypto.Crypto | Scope.Scope> {
141
- const crypto = yield* Crypto.Crypto;
140
+): Effect.fn.Return<AntigravityAuth, never, SecureRandom.SecureRandom | Scope.Scope> {
141
+ const random = yield* SecureRandom.SecureRandom;
142
const instanceScope = yield* Scope.Scope;
143
const usesBrowser = options.usesBrowser ?? true;
144
const lock = yield* Semaphore.make(1);
@@ -377,8 +377,8 @@ export const makeAntigravityAuth = Effect.fn("makeAntigravityAuth")(function* <
377
if (operation !== "idle") {
378
return yield* setupError("start", "Antigravity setup is already in progress.");
379
}
380
- const flowId = yield* crypto
381
- .randomUUIDv4()
380
+ const flowId = yield* random
381
+ .uuidV4()
382
.pipe(
383
Effect.mapError(() =>
384
setupError("start", "Could not start Google sign-in. Try again."),
apps/server/src/provider/AntigravityInstallation.test.ts
+6
-4
@@ -1,7 +1,9 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { expect, it } from "@effect/vitest";
5
import * as HostProcess from "@t3tools/shared/HostProcess";
4
-import * as Crypto from "effect/Crypto";
6
+import * as Digest from "effect/crypto/Digest";
7
import * as Deferred from "effect/Deferred";
8
import * as Effect from "effect/Effect";
9
import * as Hex from "effect/encoding/Hex";
@@ -58,11 +60,11 @@ const releaseAsset = Effect.fn("test.antigravityReleaseAsset")(function* (
60
archive: Uint8Array = completeArchive,
61
platform: NodeJS.Platform = hostPlatform,
62
) {
61
- const crypto = yield* Crypto.Crypto;
63
+ const digest = yield* Digest.Digest;
64
return {
65
version: "fixture-new",
66
url: "https://dl.google.com/antigravity-test.zip",
65
- sha256: Hex.encode(yield* crypto.digest("SHA-256", archive).pipe(Effect.orDie)),
67
+ sha256: Hex.encode(yield* digest.digest(Digest.sha256, archive).pipe(Effect.orDie)),
68
archiveBytes: archive.byteLength,
69
executable: {
70
name: platform === "win32" ? "agy_acp_server.exe" : "agy_acp_server.par",
@@ -233,7 +235,7 @@ const expectPreviousRelease = Effect.fn("test.expectPreviousAntigravityRelease")
235
expect((yield* installation.state).installedVersion).toBe(previousVersion);
236
});
237
236
-it.layer(NodeServices.layer)("Antigravity installation", (it) => {
238
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("Antigravity installation", (it) => {
239
it.effect("reports missing Node before downloading the standalone provider runtime", () =>
240
Effect.gen(function* () {
241
const { installation, requests, validations } = yield* makeHarness();
apps/server/src/provider/AntigravityInstallation.ts
+4
-4
@@ -6,7 +6,7 @@ import { resolveNodeExecutable, nodeRuntimeUnavailableMessage } from "@t3tools/s
6
import * as Clock from "effect/Clock";
7
import * as Cause from "effect/Cause";
8
import * as Context from "effect/Context";
9
-import * as Crypto from "effect/Crypto";
9
+import * as SecureRandom from "effect/crypto/SecureRandom";
10
import * as Effect from "effect/Effect";
11
import * as Exit from "effect/Exit";
12
import * as Fiber from "effect/Fiber";
@@ -151,7 +151,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
151
) {
152
const fs = yield* FileSystem.FileSystem;
153
const path = yield* Path.Path;
154
- const crypto = yield* Crypto.Crypto;
154
+ const random = yield* SecureRandom.SecureRandom;
155
const http = yield* HttpClient.HttpClient;
156
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
157
const serviceScope = yield* Effect.scope;
@@ -419,7 +419,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
419
Effect.provideService(FileSystem.FileSystem, fs),
420
Effect.provideService(Path.Path, path),
421
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
422
- Effect.provideService(Crypto.Crypto, crypto),
422
+ Effect.provideService(SecureRandom.SecureRandom, random),
423
Effect.mapError((cause) => {
424
if (isInstallationError(cause)) return cause;
425
const detail =
@@ -715,7 +715,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
715
`Google does not publish an Antigravity runtime for ${platform}-${arch}. Use a supported remote environment or a custom executable.`,
716
);
717
}
718
- const operationId = yield* crypto.randomUUIDv4();
718
+ const operationId = yield* random.uuidV4();
719
const next: ProviderInstallState = {
720
driver: DRIVER,
721
operationId,
apps/server/src/provider/AntigravityProvider.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { describe, expect, it } from "@effect/vitest";
4
import {
@@ -121,7 +122,7 @@ const layerTest = ProviderHostLive.layer.pipe(
122
Layer.provideMerge(ServerSecretStore.layer),
123
Layer.provide(
124
ServerConfig.layerTest(process.cwd(), { prefix: "t3-antigravity-provider-test-" }).pipe(
124
- Layer.provideMerge(NodeServices.layer),
125
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
126
),
127
),
128
);
apps/server/src/provider/CodexChatGptAuth.test.ts
+17
-5
@@ -6,6 +6,7 @@ import * as ServerConfig from "../config.ts";
6
import * as CodexManagedTokenBroker from "./CodexManagedTokenBroker.ts";
7
import * as NodeHttp from "node:http";
8
import * as NodeCrypto from "node:crypto";
9
+import * as NodePlatformCrypto from "@effect/platform-node/NodeCrypto";
10
import * as NodeServices from "@effect/platform-node/NodeServices";
11
import { assert, it } from "@effect/vitest";
12
import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
@@ -403,7 +404,9 @@ const makeHarness = makeHarnessFor(instanceId);
404
const provision = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
405
effect.pipe(
406
Effect.scoped,
406
- Effect.provide(Layer.mergeAll(FetchHttpClient.layer, NodeServices.layer)),
407
+ Effect.provide(
408
+ Layer.mergeAll(FetchHttpClient.layer, NodeServices.layer, NodePlatformCrypto.layer),
409
+ ),
410
);
411
it.effect(
412
"changing account registers a new user-owned client and then reuses that registration",
@@ -920,7 +923,9 @@ it.effect(
923
assert.strictEqual(harness.exchanges.length, 2);
924
}).pipe(
925
Effect.scoped,
923
- Effect.provide(Layer.mergeAll(NodeServices.layer, FetchHttpClient.layer)),
926
+ Effect.provide(
927
+ Layer.mergeAll(NodeServices.layer, NodePlatformCrypto.layer, FetchHttpClient.layer),
928
+ ),
929
),
930
);
931
@@ -957,7 +962,9 @@ it.effect(
962
yield* harness.phase("succeeded");
963
}).pipe(
964
Effect.scoped,
960
- Effect.provide(Layer.mergeAll(NodeServices.layer, FetchHttpClient.layer)),
965
+ Effect.provide(
966
+ Layer.mergeAll(NodeServices.layer, NodePlatformCrypto.layer, FetchHttpClient.layer),
967
+ ),
968
),
969
);
970
@@ -991,7 +998,12 @@ it.effect("keeps simultaneous remote accounts and environments independent", ()
998
yield* second.phase("succeeded");
999
assert.strictEqual(Option.getOrThrow(yield* first.auth.read).subject, "user-test");
1000
assert.strictEqual(Option.getOrThrow(yield* second.auth.read).subject, "other-user");
994
- }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, FetchHttpClient.layer))),
1001
+ }).pipe(
1002
+ Effect.scoped,
1003
+ Effect.provide(
1004
+ Layer.mergeAll(NodeServices.layer, NodePlatformCrypto.layer, FetchHttpClient.layer),
1005
+ ),
1006
+ ),
1007
);
1008
1009
it.effect(
@@ -1762,7 +1774,7 @@ const provideBroker = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
1774
Effect.scoped,
1775
Effect.provide(
1776
ServerConfig.layerTest(process.cwd(), { prefix: "t3-renewal-test-" }).pipe(
1765
- Layer.provideMerge(NodeServices.layer),
1777
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodePlatformCrypto.layer)),
1778
),
1779
),
1780
);
apps/server/src/provider/CodexChatGptAuth.ts
+8
-5
@@ -14,7 +14,8 @@ import * as Clock from "effect/Clock";
14
import * as Cause from "effect/Cause";
15
import * as AnalyticsService from "../telemetry/AnalyticsService.ts";
16
import { openAiUserId } from "../telemetry/Identify.ts";
17
-import * as Crypto from "effect/Crypto";
17
+import * as Digest from "effect/crypto/Digest";
18
+import * as SecureRandom from "effect/crypto/SecureRandom";
19
import * as Hex from "effect/encoding/Hex";
20
import * as Exit from "effect/Exit";
21
import { codexAuthCallbackPage, codexAuthReturnUrl } from "./CodexAuthCallbackPage.ts";
@@ -162,7 +163,8 @@ export const makeCodexChatGptAuth = Effect.fn("makeCodexChatGptAuth")(function*
163
options.instanceId,
164
);
165
const secrets = yield* ServerSecretStore.ServerSecretStore;
165
- const crypto = yield* Crypto.Crypto;
166
+ const random = yield* SecureRandom.SecureRandom;
167
+ const digest = yield* Digest.Digest;
168
const environmentLocks = sessionLocks.get(secrets) ?? new Map<string, Semaphore.Semaphore>();
169
sessionLocks.set(secrets, environmentLocks);
170
const lock = environmentLocks.get(store.binding.key) ?? (yield* Semaphore.make(1));
@@ -321,7 +323,8 @@ export const makeCodexChatGptAuth = Effect.fn("makeCodexChatGptAuth")(function*
323
};
324
}).pipe(
325
Effect.provideService(ServerSecretStore.ServerSecretStore, secrets),
324
- Effect.provideService(Crypto.Crypto, crypto),
326
+ Effect.provideService(SecureRandom.SecureRandom, random),
327
+ Effect.provideService(Digest.Digest, digest),
328
);
329
const saveRegistration = Effect.fnUntraced(function* (profile: typeof Registration.Type) {
330
const saved = yield* readRegistrations;
@@ -728,9 +731,9 @@ export const makeCodexChatGptAuth = Effect.fn("makeCodexChatGptAuth")(function*
731
// ID tokens survive renewal but change on sign-in. Bind active children to the
732
// launch profile without putting an identity token or subject in their argv.
733
const profileKey = (record: CodexChatGptCredentials) =>
731
- crypto
734
+ digest
735
.digest(
733
- "SHA-256",
736
+ Digest.sha256,
737
new TextEncoder().encode(
738
JSON.stringify([record.clientId, record.subject, record.idToken ?? null]),
739
),
apps/server/src/provider/CodexInstallation.test.ts
+20
-18
@@ -1,8 +1,10 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import * as ModelManifest from "./ModelManifest.ts";
5
import { expect, it } from "@effect/vitest";
6
import * as HostProcess from "@t3tools/shared/HostProcess";
5
-import * as Crypto from "effect/Crypto";
7
+import * as Digest from "effect/crypto/Digest";
8
import * as Deferred from "effect/Deferred";
9
import * as Effect from "effect/Effect";
10
import * as Hex from "effect/encoding/Hex";
@@ -56,8 +58,8 @@ const makeHarness = Effect.fn("test.makeCodexInstallation")(function* (
58
);
59
}
60
let downloads = 0;
59
- const crypto = yield* Crypto.Crypto;
60
- const sha256 = Hex.encode(yield* crypto.digest("SHA-256", archive).pipe(Effect.orDie));
61
+ const digest = yield* Digest.Digest;
62
+ const sha256 = Hex.encode(yield* digest.digest(Digest.sha256, archive).pipe(Effect.orDie));
63
let runtimeRenameFailures = input.runtimeRenameFailures ?? 0;
64
const failedRenames = yield* Queue.unbounded<void>();
65
const lockingFs: FileSystem.FileSystem = {
@@ -166,7 +168,7 @@ it.effect.each(["0.156.0", "0.156.1", "0.156.2", "0.157.0"])(
168
yield* h.installation.remove();
169
expect(yield* h.fs.exists(h.localBinaryPath)).toBe(true);
170
expect((yield* h.installation.state).source).toBe("local");
169
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
171
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
172
);
173
it.effect.each([
174
{ version: "0.128.9" },
@@ -189,7 +191,7 @@ it.effect.each([
191
expect(installed.executablePath).toBe(executable.executablePath);
192
expect(h.downloads()).toBe(1);
193
expect(yield* h.fs.exists(h.localBinaryPath)).toBe(true);
192
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
194
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
195
);
196
197
const compileNative = Effect.fn("test.compileNative")(function* (
@@ -219,7 +221,7 @@ it.effect("rechecks compatibility after the local executable is replaced", () =>
221
expect((yield* terminalState(h.installation)).phase).toBe("succeeded");
222
expect((yield* h.installation.resolve()).source).toBe("managed");
223
expect(h.downloads()).toBe(1);
222
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
224
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
225
);
226
227
it.effect("rechecks a cached local executable when the shared manifest policy changes", () =>
@@ -251,7 +253,7 @@ it.effect("rechecks a cached local executable when the shared manifest policy ch
253
"--version",
254
"app-server --help",
255
]);
254
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
256
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
257
);
258
259
it.effect("uses bundled Codex compatibility when the remote manifest omits its policy", () =>
@@ -265,7 +267,7 @@ it.effect("uses bundled Codex compatibility when the remote manifest omits its p
267
});
268
expect((yield* h.installation.start).source).toBe("local");
269
expect(h.downloads()).toBe(0);
268
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
270
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
271
);
272
273
it.effect.each([
@@ -304,7 +306,7 @@ int main(int argc, char **argv) {
306
expect(yield* h.installation.start).toMatchObject({ source: "local", phase: "succeeded" });
307
expect((yield* h.installation.resolve()).executablePath).toBe(h.localBinaryPath);
308
expect(h.downloads()).toBe(0);
307
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
309
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
310
);
311
312
it.effect(
@@ -324,7 +326,7 @@ it.effect(
326
);
327
const restarted = yield* makeHarness({ baseDir });
328
expect((yield* restarted.installation.resolve()).version).toBe("0.156.1");
327
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
329
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
330
);
331
332
it.effect("requires an update before running an older activated managed installation", () =>
@@ -354,7 +356,7 @@ it.effect("requires an update before running an older activated managed installa
356
expect((yield* terminalState(restarted.installation)).phase).toBe("succeeded");
357
expect((yield* restarted.installation.resolve()).version).toBe("0.156.1");
358
expect(restarted.downloads()).toBe(1);
357
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
359
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
360
);
361
362
it.effect("rejects corrupted downloads without publishing a runtime", () =>
@@ -368,7 +370,7 @@ it.effect("rejects corrupted downloads without publishing a runtime", () =>
370
expect(state.message).toContain("SHA-256");
371
expect(yield* fs.exists(`${installation.managedDirectory}/active.json`)).toBe(false);
372
expect(yield* fs.exists(`${installation.managedDirectory}/0.156.1`)).toBe(false);
371
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
373
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
374
);
375
376
it.effect.each(["interrupted body", "HTTP 404"] as const)(
@@ -405,7 +407,7 @@ it.effect.each(["interrupted body", "HTTP 404"] as const)(
407
});
408
expect(h.downloads()).toBe(1);
409
expect(yield* h.fs.readDirectory(h.installation.managedDirectory)).toEqual([]);
408
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
410
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
411
);
412
413
it.effect(
@@ -424,7 +426,7 @@ it.effect(
426
});
427
expect(h.downloads()).toBe(0);
428
expect(yield* fs.readFileString(baseDir)).toBe("existing file");
427
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
429
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
430
);
431
432
it.effect("reports a download timeout and cleans the staging directory", () =>
@@ -443,7 +445,7 @@ it.effect("reports a download timeout and cleans the staging directory", () =>
445
});
446
expect(h.downloads()).toBe(1);
447
expect(yield* h.fs.readDirectory(h.installation.managedDirectory)).toEqual([]);
446
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
448
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
449
);
450
451
it.effect("cancels an in-flight download and cleans the staging directory", () =>
@@ -462,7 +464,7 @@ it.effect("cancels an in-flight download and cleans the staging directory", () =
464
),
465
).toEqual([]);
466
expect(yield* fs.exists(`${installation.managedDirectory}/active.json`)).toBe(false);
465
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
467
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
468
);
469
470
it.effect("protects active process leases and removes the runtime after release", () =>
@@ -478,7 +480,7 @@ it.effect("protects active process leases and removes the runtime after release"
480
expect(yield* fs.exists(installation.managedDirectory)).toBe(false);
481
expect((yield* installation.state).installedVersion).toBeNull();
482
expect((yield* installation.state).executablePath).toBeNull();
481
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
483
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
484
);
485
486
it.effect("keeps an activated runtime when a later update fails verification", () =>
@@ -496,7 +498,7 @@ it.effect("keeps an activated runtime when a later update fails verification", (
498
yield* update.installation.start;
499
expect((yield* terminalState(update.installation)).phase).toBe("failed");
500
expect((yield* update.installation.resolve()).version).toBe("0.156.1");
499
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
501
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
502
);
503
504
// Stands in for Windows' bsdtar: CRLF listings, and extraction writes the Windows layout.
apps/server/src/provider/CodexInstallation.ts
+3
-3
@@ -10,7 +10,7 @@ import { resolveCommandPath, resolveSpawnCommand } from "@t3tools/shared/shell";
10
import * as Clock from "effect/Clock";
11
import * as Cause from "effect/Cause";
12
import * as Context from "effect/Context";
13
-import * as Crypto from "effect/Crypto";
13
+import * as SecureRandom from "effect/crypto/SecureRandom";
14
import * as Effect from "effect/Effect";
15
import * as Exit from "effect/Exit";
16
import * as Fiber from "effect/Fiber";
@@ -170,7 +170,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
170
const manifestService = yield* ModelManifest.ModelManifest;
171
const fs = yield* FileSystem.FileSystem;
172
const path = yield* Path.Path;
173
- const crypto = yield* Crypto.Crypto;
173
+ const random = yield* SecureRandom.SecureRandom;
174
const http = yield* HttpClient.HttpClient;
175
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
176
const serviceScope = yield* Effect.scope;
@@ -653,7 +653,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
653
`OpenAI does not publish a Codex runtime for ${platform}-${arch}. Use a supported remote environment or a custom executable.`,
654
);
655
}
656
- const operationId = yield* crypto.randomUUIDv4();
656
+ const operationId = yield* random.uuidV4();
657
const next: ProviderInstallState = {
658
driver: DRIVER,
659
operationId,
apps/server/src/provider/CodexManagedRuntime.test.ts
+2
-1
@@ -4,6 +4,7 @@ import * as HostProcess from "@t3tools/shared/HostProcess";
4
import * as Stream from "effect/Stream";
5
import { ChildProcess, ChildProcessSpawner } from "effect/process";
6
import * as CodexManagedTokenBroker from "./CodexManagedTokenBroker.ts";
7
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
8
import * as NodeServices from "@effect/platform-node/NodeServices";
9
import { assert, it } from "@effect/vitest";
10
import { CodexSettings, EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
@@ -271,7 +272,7 @@ it.live.each(
272
Effect.provide(
273
ServerConfig.layerTest(process.cwd(), {
274
prefix: "t3-managed-runtime-",
274
- }).pipe(Layer.provideMerge(NodeServices.layer)),
275
+ }).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
276
),
277
),
278
);
apps/server/src/provider/CodexToolPresentation.ts
+4
-4
@@ -3,7 +3,7 @@ import type {
3
ToolActivityNativeAppReference,
4
ToolActivitySource,
5
} from "@t3tools/contracts";
6
-import * as Crypto from "effect/Crypto";
6
+import * as Digest from "effect/crypto/Digest";
7
import * as Effect from "effect/Effect";
8
import * as Hex from "effect/encoding/Hex";
9
import type * as EffectCodexSchema from "effect-codex-app-server/schema";
@@ -49,9 +49,9 @@ const nativeAppSourceKey = Effect.fn("CodexToolPresentation.nativeAppSourceKey")
49
) {
50
const key = `native-app:${appId.toLowerCase()}`;
51
if (key.length <= 512) return key;
52
- const crypto = yield* Crypto.Crypto;
52
+ const crypto = yield* Digest.Digest;
53
const digest = Hex.encode(
54
- yield* crypto.digest("SHA-256", new TextEncoder().encode(key)).pipe(Effect.orDie),
54
+ yield* crypto.digest(Digest.sha256, new TextEncoder().encode(key)).pipe(Effect.orDie),
55
);
56
return `${key.slice(0, 512 - digest.length - 1)}:${digest}`;
57
});
@@ -133,7 +133,7 @@ export interface McpToolPresentation {
133
export const mcpToolPresentation = Effect.fn("CodexToolPresentation.mcpToolPresentation")(
134
function* (
135
item: Extract<CodexLifecycleItem, { readonly type: "mcpToolCall" }>,
136
- ): Effect.fn.Return<McpToolPresentation, never, Crypto.Crypto> {
136
+ ): Effect.fn.Return<McpToolPresentation, never, Digest.Digest> {
137
const result = asUnknownRecord(item.result);
138
const metadata = asUnknownRecord(result?._meta);
139
const surface = asUnknownRecord(metadata?.["codex/toolSurface"]);
apps/server/src/provider/Drivers/AntigravityDriver.test.ts
+13
-7
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { expect, it } from "@effect/vitest";
4
import {
@@ -10,6 +11,7 @@ import * as Effect from "effect/Effect";
11
import * as FileSystem from "effect/FileSystem";
12
import * as Layer from "effect/Layer";
13
import * as Path from "effect/Path";
14
+import * as Redacted from "effect/Redacted";
15
import * as Schema from "effect/Schema";
16
import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
17
import { HttpClient } from "effect/http";
@@ -160,20 +162,24 @@ const makeHarness = Effect.fn("makeAntigravityDriverHarness")(function* (
162
return yield* Effect.die("Unexpected process pipeline.");
163
const handle = yield* spawner.spawn(command);
164
const environment = command.options.env ?? {};
165
+ const env = (name: string) => {
166
+ const value = environment[name];
167
+ return Redacted.isRedacted(value) ? Redacted.value(value) : value;
168
+ };
169
launches.push({
170
command: command.command,
165
- args: command.args,
171
+ args: command.args.map(String),
172
cwd: command.options.cwd,
173
extendEnv: command.options.extendEnv,
168
- profileDirectory: environment.GEMINI_HOME,
169
- harnessPath: environment.ANTIGRAVITY_HARNESS_PATH,
170
- forceFileStorage: environment.AGY_ACP_FORCE_FILE_STORAGE,
174
+ profileDirectory: env("GEMINI_HOME"),
175
+ harnessPath: env("ANTIGRAVITY_HARNESS_PATH"),
176
+ forceFileStorage: env("AGY_ACP_FORCE_FILE_STORAGE"),
177
credentialKeys: Object.keys(environment).filter((key) =>
178
blockedCredentialKeys.has(key.toUpperCase()),
179
),
174
- geminiApiKey: environment.GEMINI_API_KEY,
180
+ geminiApiKey: env("GEMINI_API_KEY"),
181
tempDirectory:
176
- environment.ANTIGRAVITY_HARNESS_PATH === undefined ? undefined : environment.TMPDIR,
182
+ environment.ANTIGRAVITY_HARNESS_PATH === undefined ? undefined : env("TMPDIR"),
183
handle,
184
});
185
return handle;
@@ -240,7 +246,7 @@ const makeHarness = Effect.fn("makeAntigravityDriverHarness")(function* (
246
const layerDeps = ServerConfig.layerTest(process.cwd(), {
247
prefix: "t3-antigravity-driver-config-",
248
}).pipe(
243
- Layer.provideMerge(NodeServices.layer),
249
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
250
Layer.provideMerge(
251
Layer.succeed(
252
HttpClient.HttpClient,
apps/server/src/provider/Drivers/AntigravityDriver.ts
+9
-6
@@ -6,7 +6,8 @@ import {
6
NodeRuntimeUnavailableError,
7
nodeRuntimeUnavailableMessage,
8
} from "@t3tools/shared/nodeRuntime";
9
-import * as Crypto from "effect/Crypto";
9
+import * as Digest from "effect/crypto/Digest";
10
+import * as SecureRandom from "effect/crypto/SecureRandom";
11
import * as Deferred from "effect/Deferred";
12
import * as Effect from "effect/Effect";
13
import * as Exit from "effect/Exit";
@@ -75,7 +76,8 @@ export type AntigravityDriverEnv =
76
| AntigravityInstallation.AntigravityInstallation
77
| ProviderHost.ProviderHost
78
| ChildProcessSpawner.ChildProcessSpawner
78
- | Crypto.Crypto
79
+ | Digest.Digest
80
+ | SecureRandom.SecureRandom
81
| FileSystem.FileSystem
82
| HttpClient.HttpClient
83
| IdAllocator.IdAllocatorV2
@@ -102,7 +104,8 @@ export const AntigravityDriver: ProviderDriver<
104
enabled,
105
config,
106
}) {
105
- const crypto = yield* Crypto.Crypto;
107
+ const digest = yield* Digest.Digest;
108
+ const random = yield* SecureRandom.SecureRandom;
109
const fileSystem = yield* FileSystem.FileSystem;
110
const httpClient = yield* HttpClient.HttpClient;
111
const path = yield* Path.Path;
@@ -133,7 +136,7 @@ export const AntigravityDriver: ProviderDriver<
136
host.paths.stateDir,
137
instanceId,
138
).pipe(
136
- Effect.provideService(Crypto.Crypto, crypto),
139
+ Effect.provideService(Digest.Digest, digest),
140
Effect.provideService(Path.Path, path),
141
Effect.mapError(
142
(cause) =>
@@ -255,7 +258,7 @@ export const AntigravityDriver: ProviderDriver<
258
auth,
259
runtimeTempDirectory,
260
}),
258
- }).pipe(Effect.provideService(Crypto.Crypto, crypto));
261
+ }).pipe(Effect.provideService(SecureRandom.SecureRandom, random));
262
return {
263
...runtime,
264
start: () =>
@@ -402,7 +405,7 @@ export const AntigravityDriver: ProviderDriver<
405
}).pipe(
406
Effect.provideService(FileSystem.FileSystem, fileSystem),
407
Effect.provideService(Path.Path, path),
405
- Effect.provideService(Crypto.Crypto, crypto),
408
+ Effect.provideService(Digest.Digest, digest),
409
Effect.provideService(HttpClient.HttpClient, httpClient),
410
);
411
const provider = yield* makeAntigravityProvider(settings, {
apps/server/src/provider/Drivers/AntigravityUsage.ts
+3
-3
@@ -8,7 +8,7 @@ import type {
8
} from "@t3tools/provider-core/server/usage";
9
import * as HostProcess from "@t3tools/shared/HostProcess";
10
import * as Context from "effect/Context";
11
-import * as Crypto from "effect/Crypto";
11
+import * as Digest from "effect/crypto/Digest";
12
import * as Effect from "effect/Effect";
13
import * as FileSystem from "effect/FileSystem";
14
import * as Layer from "effect/Layer";
@@ -28,7 +28,7 @@ export class AntigravityUsage extends Context.Service<
28
>()("t3/provider/Drivers/AntigravityUsage") {}
29
30
const make = Effect.gen(function* () {
31
- const crypto = yield* Crypto.Crypto;
31
+ const digest = yield* Digest.Digest;
32
const fileSystem = yield* FileSystem.FileSystem;
33
const path = yield* Path.Path;
34
const host = yield* ProviderHost.ProviderHost;
@@ -69,7 +69,7 @@ const make = Effect.gen(function* () {
69
host.paths.stateDir,
70
instanceId,
71
).pipe(
72
- Effect.provideService(Crypto.Crypto, crypto),
72
+ Effect.provideService(Digest.Digest, digest),
73
Effect.provideService(Path.Path, path),
74
Effect.mapError(
75
(cause) =>
apps/server/src/provider/Drivers/ClaudeDriver.ts
+2
-2
@@ -1,7 +1,7 @@
1
import { ClaudeSettings, ProviderDriverKind } from "@t3tools/contracts";
2
import * as Cache from "effect/Cache";
3
import * as Duration from "effect/Duration";
4
-import * as Crypto from "effect/Crypto";
4
+import * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as Effect from "effect/Effect";
6
import * as Exit from "effect/Exit";
7
import * as FileSystem from "effect/FileSystem";
@@ -95,7 +95,7 @@ export type ClaudeDriverEnv =
95
| ProviderHost.ProviderHost
96
| ChildProcessSpawner.ChildProcessSpawner
97
| ResetCreditCoordinator.ResetCreditCoordinator
98
- | Crypto.Crypto
98
+ | SecureRandom.SecureRandom
99
| FileSystem.FileSystem
100
| HttpClient.HttpClient
101
| ProviderLatestVersions.ProviderLatestVersions
apps/server/src/provider/Drivers/CodexDriver.test.ts
+3
-2
@@ -3,6 +3,7 @@ import * as CodexManagedTokenBroker from "../CodexManagedTokenBroker.ts";
3
import * as ServerSecretStore from "../../auth/ServerSecretStore.ts";
4
import * as ServerEnvironment from "../../environment/ServerEnvironment.ts";
5
// @effect-diagnostics nodeBuiltinImport:off
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import * as NodePath from "node:path";
9
import { expect, it } from "@effect/vitest";
@@ -45,7 +46,7 @@ import * as ProviderHostLive from "../ProviderHostLive.ts";
46
const layerDeps = ServerConfig.layerTest(process.cwd(), {
47
prefix: "t3-codex-driver-maintenance-",
48
}).pipe(
48
- Layer.provideMerge(NodeServices.layer),
49
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
50
Layer.provideMerge(IdAllocator.layer),
51
Layer.provideMerge(McpProviderSessions.layer),
52
Layer.provideMerge(
@@ -653,7 +654,7 @@ it.layer(layerTest)("CodexDriver", (it) => {
654
if (!ChildProcess.isStandardCommand(command) || command.command !== brewPath) {
655
return Effect.die("Provider resolution must not execute a provider or updater");
656
}
656
- probes.push(command.args);
657
+ probes.push(command.args.map(String));
658
const stdout =
659
command.args[0] === "--prefix"
660
? brewPrefix
apps/server/src/provider/Drivers/CodexDriver.ts
+4
-2
@@ -1,5 +1,6 @@
1
import { CodexSettings, ProviderDriverKind } from "@t3tools/contracts";
2
-import * as Crypto from "effect/Crypto";
2
+import * as Digest from "effect/crypto/Digest";
3
+import * as SecureRandom from "effect/crypto/SecureRandom";
4
import * as Effect from "effect/Effect";
5
import * as FileSystem from "effect/FileSystem";
6
import * as Path from "effect/Path";
@@ -98,7 +99,8 @@ export type CodexDriverEnv =
99
| ProviderHost.ProviderHost
100
| ChildProcessSpawner.ChildProcessSpawner
101
| ResetCreditCoordinator.ResetCreditCoordinator
101
- | Crypto.Crypto
102
+ | Digest.Digest
103
+ | SecureRandom.SecureRandom
104
| FileSystem.FileSystem
105
| HttpClient.HttpClient
106
| ProviderLatestVersions.ProviderLatestVersions
apps/server/src/provider/GrokProvider.test.ts
+5
-3
@@ -2,7 +2,9 @@
2
import * as NodePath from "node:path";
3
import * as NodeURL from "node:url";
4
5
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
6
import * as NodeServices from "@effect/platform-node/NodeServices";
7
+import * as Layer from "effect/Layer";
8
import { describe, expect, it } from "@effect/vitest";
9
import * as Effect from "effect/Effect";
10
import * as Fiber from "effect/Fiber";
@@ -196,7 +198,7 @@ describe("buildGrokModelCapabilities", () => {
198
});
199
});
200
199
-it.layer(NodeServices.layer)("checkGrokProviderStatus", (it) => {
201
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("checkGrokProviderStatus", (it) => {
202
it.effect("reports an installed CLI as unhealthy when --version exits non-zero", () =>
203
Effect.gen(function* () {
204
const secretStderr = "broken grok install: secret-token-value";
@@ -551,7 +553,7 @@ describe("Grok usage limits", () => {
553
});
554
});
555
554
-it.layer(NodeServices.layer)("readGrokAccount", (it) => {
556
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("readGrokAccount", (it) => {
557
it.effect("reads the configured Grok home and prefers the current login scope to legacy", () =>
558
Effect.gen(function* () {
559
const fs = yield* FileSystem.FileSystem;
@@ -722,7 +724,7 @@ it.layer(NodeServices.layer)("readGrokAccount", (it) => {
724
);
725
});
726
725
-it.layer(NodeServices.layer)("readGrokAccount email", (it) => {
727
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("readGrokAccount email", (it) => {
728
it.effect("names the account whose limits were read, and nothing for other auth", () =>
729
Effect.gen(function* () {
730
const current = '"https://auth.x.ai::b1a00492-073a-47ea-816f-4c329264a828"';
apps/server/src/provider/KiroProvider.test.ts
+3
-1
@@ -1,8 +1,10 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import { KiroSettings } from "@t3tools/provider-kiro/settings";
5
import * as Deferred from "effect/Deferred";
6
import * as Effect from "effect/Effect";
7
+import * as Layer from "effect/Layer";
8
import * as Queue from "effect/Queue";
9
import * as Schema from "effect/Schema";
10
import * as Sink from "effect/Sink";
@@ -118,7 +120,7 @@ const check = (
120
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, cli.spawner),
121
);
122
return { snapshot, invoked: cli.invoked };
121
- }).pipe(Effect.provide(NodeServices.layer));
123
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
124
125
describe("KiroProvider", () => {
126
it.effect("reports a CLI whose version probe exits nonzero as failing to run", () =>
apps/server/src/provider/ProviderCredentialStore.ts
+4
-4
@@ -1,4 +1,4 @@
1
-import * as Crypto from "effect/Crypto";
1
+import * as Digest from "effect/crypto/Digest";
2
import * as Effect from "effect/Effect";
3
import * as Hex from "effect/encoding/Hex";
4
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
@@ -8,10 +8,10 @@ export const make = Effect.fn("ProviderCredentialStore.make")(function* (
8
bindingId: string,
9
) {
10
const secrets = yield* ServerSecretStore.ServerSecretStore;
11
- const crypto = yield* Crypto.Crypto;
11
+ const digest = yield* Digest.Digest;
12
// Hash the tuple so arbitrary bindings cannot escape or exceed a filename.
13
- const bindingHash = yield* crypto
14
- .digest("SHA-256", new TextEncoder().encode(`${driver.length}:${driver}${bindingId}`))
13
+ const bindingHash = yield* digest
14
+ .digest(Digest.sha256, new TextEncoder().encode(`${driver.length}:${driver}${bindingId}`))
15
.pipe(Effect.map(Hex.encode), Effect.orDie);
16
const key = `provider-auth-${bindingHash}`;
17
return {
apps/server/src/provider/ProviderHostLive.ts
+3
-3
@@ -1,6 +1,6 @@
1
import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
2
import { ProviderCredentialError } from "@t3tools/provider-core/server/errors";
3
-import * as Crypto from "effect/Crypto";
3
+import * as Digest from "effect/crypto/Digest";
4
import * as Effect from "effect/Effect";
5
import * as FileSystem from "effect/FileSystem";
6
import * as Layer from "effect/Layer";
@@ -20,7 +20,7 @@ export const layer = Layer.effect(
20
const serverSettings = yield* ServerSettings.ServerSettingsService;
21
const backgroundPolicy = yield* BackgroundPolicy.BackgroundPolicy;
22
const secrets = yield* ServerSecretStore.ServerSecretStore;
23
- const crypto = yield* Crypto.Crypto;
23
+ const digest = yield* Digest.Digest;
24
const fileSystem = yield* FileSystem.FileSystem;
25
return ProviderHost.ProviderHost.of({
26
paths: {
@@ -68,7 +68,7 @@ export const layer = Layer.effect(
68
),
69
})),
70
Effect.provideService(ServerSecretStore.ServerSecretStore, secrets),
71
- Effect.provideService(Crypto.Crypto, crypto),
71
+ Effect.provideService(Digest.Digest, digest),
72
);
73
}),
74
});
apps/server/src/provider/ProviderInstanceRegistry.test.ts
+2
-1
@@ -5,6 +5,7 @@ import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
5
import * as ClaudeSdk from "@anthropic-ai/claude-agent-sdk";
6
import { describe, expect, it } from "@effect/vitest";
7
import { vi } from "vite-plus/test";
8
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
9
import * as NodeServices from "@effect/platform-node/NodeServices";
10
import {
11
EnvironmentId,
@@ -170,7 +171,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
171
endpoint: Effect.succeed("unused-private-pipe"),
172
}),
173
),
173
- Layer.provideMerge(NodeServices.layer),
174
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
175
Layer.provideMerge(
176
Layer.mock(CodexInstallation.CodexInstallation)({
177
managedDirectory: "unused-managed-installation",
apps/server/src/provider/ProviderInstanceRegistryHydration.ts
+2
-2
@@ -9,7 +9,7 @@ import {
9
ServerSettings,
10
} from "@t3tools/contracts";
11
import * as HostProcess from "@t3tools/shared/HostProcess";
12
-import type * as Crypto from "effect/Crypto";
12
+import type * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as Effect from "effect/Effect";
14
import * as FileSystem from "effect/FileSystem";
15
import * as Layer from "effect/Layer";
@@ -43,7 +43,7 @@ type ProviderInstanceRegistryHydrationEnv =
43
| Path.Path
44
| FileSystem.FileSystem
45
// Secret provider reads.
46
- | Crypto.Crypto
46
+ | SecureRandom.SecureRandom
47
// The Claude runner counts its CLIs as running agents for port discovery.
48
| PortScanner.PortDiscovery;
49
apps/server/src/provider/ProviderRegistry.test.ts
+12
-10
@@ -4,6 +4,7 @@ import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
4
import * as CodexInstallation from "./CodexInstallation.ts";
5
import * as CodexManagedTokenBroker from "./CodexManagedTokenBroker.ts";
6
import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
7
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
8
import * as NodeServices from "@effect/platform-node/NodeServices";
9
import { describe, it, assert, expect } from "@effect/vitest";
10
import * as DateTime from "effect/DateTime";
@@ -330,6 +331,7 @@ const awaitPersistedProvider = (
331
const layerTestNodeServices = Layer.mergeAll(
332
ProviderLatestVersions.layer,
333
NodeServices.layer,
334
+ NodeCrypto.layer,
335
Layer.mock(CodexManagedTokenBroker.CodexManagedTokenBroker)({
336
endpoint: Effect.succeed("unused-private-pipe"),
337
}),
@@ -1141,7 +1143,7 @@ it.layer(
1143
Effect.provide(
1144
ServerConfig.layerTest(process.cwd(), {
1145
prefix: "t3-pi-model-cache-",
1144
- }).pipe(Layer.provideMerge(NodeServices.layer)),
1146
+ }).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
1147
),
1148
),
1149
);
@@ -1277,7 +1279,7 @@ it.layer(
1279
Effect.provide(
1280
ServerConfig.layerTest(process.cwd(), {
1281
prefix: "t3-codex-retired-model-cache-",
1280
- }).pipe(Layer.provideMerge(NodeServices.layer)),
1282
+ }).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
1283
),
1284
),
1285
);
@@ -1548,7 +1550,7 @@ it.layer(
1550
prefix: "t3-provider-registry-shared-workspace-scan-",
1551
}),
1552
),
1551
- Layer.provideMerge(NodeServices.layer),
1553
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1554
),
1555
).pipe(Scope.provide(scope));
1556
@@ -1644,7 +1646,7 @@ it.layer(
1646
prefix: "t3-provider-registry-unhealthy-workspace-",
1647
}),
1648
),
1647
- Layer.provideMerge(NodeServices.layer),
1649
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1650
),
1651
).pipe(Scope.provide(scope));
1652
@@ -1765,7 +1767,7 @@ it.layer(
1767
prefix: "t3-provider-registry-shared-refresh-",
1768
}),
1769
),
1768
- Layer.provideMerge(NodeServices.layer),
1770
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1771
),
1772
).pipe(Scope.provide(scope));
1773
@@ -1873,7 +1875,7 @@ it.layer(
1875
}),
1876
),
1877
Layer.provideMerge(layerBackgroundPolicyAlwaysRun),
1876
- Layer.provideMerge(NodeServices.layer),
1878
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1879
),
1880
).pipe(Scope.provide(scope));
1881
@@ -2162,7 +2164,7 @@ it.layer(
2164
prefix: "t3-provider-registry-opencode-authoritative-persist-",
2165
}),
2166
),
2165
- Layer.provideMerge(NodeServices.layer),
2167
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
2168
),
2169
).pipe(Scope.provide(scope));
2170
@@ -2267,7 +2269,7 @@ it.layer(
2269
}),
2270
),
2271
Layer.provideMerge(layerBackgroundPolicyAlwaysRun),
2270
- Layer.provideMerge(NodeServices.layer),
2272
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
2273
),
2274
).pipe(Scope.provide(scope));
2275
@@ -2360,7 +2362,7 @@ it.layer(
2362
return beforeSpawn.pipe(Effect.andThen(spawner.spawn(command)));
2363
}),
2364
),
2363
- Layer.provideMerge(NodeServices.layer),
2365
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
2366
Layer.provideMerge(layerBackgroundPolicyAlwaysRun),
2367
);
2368
const runtimeServices = yield* Layer.build(layerProviderRegistry).pipe(
@@ -2465,7 +2467,7 @@ it.layer(
2467
Layer.provideMerge(
2468
OpenCodeRuntime.layer.pipe(Layer.provide(OpenCodeServerLedger.layerTest)),
2469
),
2468
- Layer.provideMerge(NodeServices.layer),
2470
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
2471
Layer.provideMerge(layerBackgroundPolicyAlwaysRun),
2472
);
2473
const runtimeServices = yield* Layer.build(layerProviderRegistry).pipe(
apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts
+29
-27
@@ -4,7 +4,9 @@ import * as NodeOS from "node:os";
4
import * as NodeURL from "node:url";
5
import * as NodeFS from "node:fs";
6
7
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
8
import * as NodeServices from "@effect/platform-node/NodeServices";
9
+import * as Layer from "effect/Layer";
10
import { assert, it } from "@effect/vitest";
11
import * as HostProcess from "@t3tools/shared/HostProcess";
12
import * as Deferred from "effect/Deferred";
@@ -91,7 +93,7 @@ describe("AcpSessionRuntime", () => {
93
expect(
94
(yield* runtime.getConfigOptions).find((option) => option.category === "model"),
95
).toMatchObject({ currentValue: "gpt-5.4" });
94
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
96
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
97
);
98
99
it.effect("publishes model changes returned by a config request and live notifications", () =>
@@ -105,7 +107,7 @@ describe("AcpSessionRuntime", () => {
107
expect((yield* updates)[0]?.configOptions).toEqual(selected.configOptions);
108
yield* runtime.request("_test/startup-metadata", {});
109
expect((yield* updates)[0]?.configOptions).toEqual(yield* runtime.getConfigOptions);
108
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
110
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
111
);
112
113
it.effect("waits for native cancellation and drains final updates before another prompt", () =>
@@ -190,7 +192,7 @@ describe("AcpSessionRuntime", () => {
192
}
193
expect(yield* Fiber.join(replacement)).toMatchObject({ stopReason: "end_turn" });
194
expect(promptRequests).toBe(2);
193
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
195
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
196
);
197
198
it.effect("reports an idle child exit and rejects later prompts", () =>
@@ -248,7 +250,7 @@ describe("AcpSessionRuntime", () => {
250
),
251
).toBe(event.error);
252
expect(yield* runtime.notify("_test/exit", {}).pipe(Effect.flip)).toBe(event.error);
251
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
253
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
254
);
255
256
it.effect("retires a native runtime when its prompt caller is interrupted", () =>
@@ -288,7 +290,7 @@ describe("AcpSessionRuntime", () => {
290
})
291
.pipe(Effect.flip),
292
).toBe(events[0]?.error);
291
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
293
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
294
);
295
296
it.effect("fails a pending request when the stderr handler rejects the runtime", () =>
@@ -310,7 +312,7 @@ describe("AcpSessionRuntime", () => {
312
);
313
expect(events[0]?.error).toBe(failure);
314
expect(yield* runtime.initialize().pipe(Effect.flip)).toBe(failure);
313
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
315
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
316
);
317
318
it.effect.each([
@@ -358,7 +360,7 @@ describe("AcpSessionRuntime", () => {
360
},
361
});
362
}
361
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
363
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
364
);
365
366
it.effect("drains large stderr output and keeps auth-sized logging chunks", () =>
@@ -384,7 +386,7 @@ describe("AcpSessionRuntime", () => {
386
expect(lengths.length).toBeGreaterThan(0);
387
expect(Math.max(...lengths)).toBeGreaterThanOrEqual(16_384);
388
expect(Math.max(...lengths)).toBeLessThanOrEqual(32_768);
387
- }).pipe(Effect.provide(NodeServices.layer)),
389
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
390
);
391
392
it.effect("releases a queued event drain when its runtime scope closes", () =>
@@ -414,7 +416,7 @@ describe("AcpSessionRuntime", () => {
416
_tag: "AcpTransportError",
417
detail: "The ACP session runtime is closed.",
418
});
417
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
419
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
420
);
421
422
it.effect("does not restore ambient variables to a sanitized child environment", () =>
@@ -445,7 +447,7 @@ describe("AcpSessionRuntime", () => {
447
inherited: false,
448
explicit: true,
449
});
448
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
450
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
451
);
452
453
it("selects explicit or agent-managed authentication without choosing terminal auth", () => {
@@ -491,7 +493,7 @@ describe("AcpSessionRuntime", () => {
493
}),
494
),
495
Effect.scoped,
494
- Effect.provide(NodeServices.layer),
496
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
497
);
498
});
499
@@ -543,7 +545,7 @@ describe("AcpSessionRuntime", () => {
545
}),
546
),
547
Effect.scoped,
546
- Effect.provide(NodeServices.layer),
548
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
549
);
550
});
551
@@ -587,7 +589,7 @@ describe("AcpSessionRuntime", () => {
589
}),
590
),
591
Effect.scoped,
590
- Effect.provide(NodeServices.layer),
592
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
593
);
594
});
595
@@ -629,7 +631,7 @@ describe("AcpSessionRuntime", () => {
631
}),
632
),
633
Effect.scoped,
632
- Effect.provide(NodeServices.layer),
634
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
635
);
636
});
637
@@ -686,7 +688,7 @@ describe("AcpSessionRuntime", () => {
688
}),
689
),
690
Effect.scoped,
689
- Effect.provide(NodeServices.layer),
691
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
692
),
693
);
694
@@ -724,7 +726,7 @@ describe("AcpSessionRuntime", () => {
726
const afterRestart = yield* collectFirstAssistantItemId;
727
728
expect(afterRestart).not.toBe(beforeRestart);
727
- }).pipe(Effect.provide(NodeServices.layer));
729
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
730
});
731
732
it.effect("drops session updates emitted for a child ACP session", () =>
@@ -767,7 +769,7 @@ describe("AcpSessionRuntime", () => {
769
}),
770
),
771
Effect.scoped,
770
- Effect.provide(NodeServices.layer),
772
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
773
),
774
);
775
@@ -828,7 +830,7 @@ describe("AcpSessionRuntime", () => {
830
}),
831
),
832
Effect.scoped,
831
- Effect.provide(NodeServices.layer),
833
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
834
),
835
);
836
@@ -874,7 +876,7 @@ describe("AcpSessionRuntime", () => {
876
}),
877
),
878
Effect.scoped,
877
- Effect.provide(NodeServices.layer),
879
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
880
),
881
);
882
@@ -921,7 +923,7 @@ describe("AcpSessionRuntime", () => {
923
}),
924
),
925
Effect.scoped,
924
- Effect.provide(NodeServices.layer),
926
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
927
),
928
);
929
@@ -1000,7 +1002,7 @@ describe("AcpSessionRuntime", () => {
1002
}),
1003
),
1004
Effect.scoped,
1003
- Effect.provide(NodeServices.layer),
1005
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1006
);
1007
});
1008
@@ -1049,7 +1051,7 @@ describe("AcpSessionRuntime", () => {
1051
}),
1052
),
1053
Effect.scoped,
1052
- Effect.provide(NodeServices.layer),
1054
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1055
),
1056
);
1057
@@ -1077,7 +1079,7 @@ describe("AcpSessionRuntime", () => {
1079
}),
1080
),
1081
Effect.scoped,
1080
- Effect.provide(NodeServices.layer),
1082
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1083
),
1084
);
1085
@@ -1108,7 +1110,7 @@ describe("AcpSessionRuntime", () => {
1110
}),
1111
),
1112
Effect.scoped,
1111
- Effect.provide(NodeServices.layer),
1113
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1114
),
1115
);
1116
@@ -1145,7 +1147,7 @@ describe("AcpSessionRuntime", () => {
1147
}),
1148
),
1149
Effect.scoped,
1148
- Effect.provide(NodeServices.layer),
1150
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1151
),
1152
);
1153
@@ -1194,7 +1196,7 @@ describe("AcpSessionRuntime", () => {
1196
}),
1197
),
1198
Effect.scoped,
1197
- Effect.provide(NodeServices.layer),
1199
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1200
Effect.ensuring(Effect.sync(() => NodeFS.rmSync(tempDir, { recursive: true, force: true }))),
1201
);
1202
});
@@ -1231,7 +1233,7 @@ describe("AcpSessionRuntime", () => {
1233
}),
1234
),
1235
Effect.scoped,
1234
- Effect.provide(NodeServices.layer),
1236
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1237
Effect.ensuring(Effect.sync(() => NodeFS.rmSync(tempDir, { recursive: true, force: true }))),
1238
);
1239
});
apps/server/src/provider/acp/AntigravityAcpSupport.ts
+2
-2
@@ -7,7 +7,7 @@ import {
7
type RuntimeMode,
8
} from "@t3tools/contracts";
9
import * as HostProcess from "@t3tools/shared/HostProcess";
10
-import * as Crypto from "effect/Crypto";
10
+import * as SecureRandom from "effect/crypto/SecureRandom";
11
import * as Effect from "effect/Effect";
12
import * as FileSystem from "effect/FileSystem";
13
import * as Layer from "effect/Layer";
@@ -111,7 +111,7 @@ export const makeAntigravityAcpRuntime = Effect.fn("makeAntigravityAcpRuntime")(
111
): Effect.fn.Return<
112
AcpSessionRuntime.AcpSessionRuntime["Service"],
113
EffectAcpErrors.AcpError,
114
- Crypto.Crypto | Scope.Scope
114
+ SecureRandom.SecureRandom | Scope.Scope
115
> {
116
const context = yield* Layer.build(
117
AcpSessionRuntime.layer({
apps/server/src/provider/antigravityAuthSupport.ts
+3
-3
@@ -4,7 +4,7 @@ import * as NodeFSP from "node:fs/promises";
4
import type { AntigravityAuthMethod, ProviderInstanceId } from "@t3tools/contracts";
5
import * as HostProcess from "@t3tools/shared/HostProcess";
6
import { resolveNodeExecutable, nodeRuntimeUnavailableMessage } from "@t3tools/shared/nodeRuntime";
7
-import * as Crypto from "effect/Crypto";
7
+import * as Digest from "effect/crypto/Digest";
8
import * as Effect from "effect/Effect";
9
import * as Hex from "effect/encoding/Hex";
10
import * as FileSystem from "effect/FileSystem";
@@ -178,9 +178,9 @@ export interface AntigravityInstanceDirectories {
178
export const resolveAntigravityInstanceDirectories = Effect.fn(
179
"resolveAntigravityInstanceDirectories",
180
)(function* (stateDir: string, instanceId: ProviderInstanceId) {
181
- const crypto = yield* Crypto.Crypto;
181
+ const digest = yield* Digest.Digest;
182
const path = yield* Path.Path;
183
- const key = Hex.encode(yield* crypto.digest("SHA-256", new TextEncoder().encode(instanceId)));
183
+ const key = Hex.encode(yield* digest.digest(Digest.sha256, new TextEncoder().encode(instanceId)));
184
return {
185
profile: path.join(stateDir, "providers", "antigravity", key),
186
runtimeTemp: path.join(stateDir, "antigravity-tmp", key.slice(0, 12)),
apps/server/src/provider/antigravityUsageLimits.test.ts
+18
-16
@@ -1,4 +1,6 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { describe, expect, it } from "@effect/vitest";
5
import * as Context from "effect/Context";
6
import * as DateTime from "effect/DateTime";
@@ -195,7 +197,7 @@ describe("Antigravity subscription limits", () => {
197
});
198
expect(byId.get("gemini-5h")?.resetsAt).toBe("2026-10-21T13:29:53.000Z");
199
expect(byId.get("gemini-weekly")?.resetsAt).toBe("2026-10-28T08:29:53.000Z");
198
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
200
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
201
);
202
203
// Oracle: measure the tolerance from the summary request, after auth.
@@ -216,7 +218,7 @@ describe("Antigravity subscription limits", () => {
218
},
219
});
220
expect((yield* probe).windows[0]?.resetsAt).toBeUndefined();
219
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
221
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
222
);
223
224
// Oracle: keep descriptions, measured resets, and spent buckets.
@@ -268,7 +270,7 @@ describe("Antigravity subscription limits", () => {
270
{ id: "spent", resetsAt: "2026-10-21T15:16:04.000Z" },
271
{ id: "distant", resetsAt: "2026-10-28T12:16:04.000Z" },
272
]);
271
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
273
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
274
);
275
276
// Oracle: the 60-second tolerance applies to both known window lengths.
@@ -325,7 +327,7 @@ describe("Antigravity subscription limits", () => {
327
{ id: "weekly-before", resetsAt: "2026-10-28T10:15:03.000Z" },
328
{ id: "weekly-edge", resetsAt: undefined },
329
]);
328
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
330
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
331
);
332
333
// Oracle: the existing endpoint merge keeps the most-used reading.
@@ -386,7 +388,7 @@ describe("Antigravity subscription limits", () => {
388
resetsAt: "2026-10-27T10:16:04.000Z",
389
},
390
]);
389
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
391
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
392
);
393
394
// Oracle: model quotas have no evidence for the summary-only rule.
@@ -414,7 +416,7 @@ describe("Antigravity subscription limits", () => {
416
{ id: "gemini-weekly", resetsAt: "2026-10-28T10:16:04.000Z", windowDurationMins: 10080 },
417
{ id: "gemini-quota", resetsAt: "2026-10-21T15:16:04.000Z", windowDurationMins: undefined },
418
]);
417
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
419
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
420
);
421
422
it.effect("reports separate Gemini and shared Claude/GPT five-hour and weekly limits", () =>
@@ -441,7 +443,7 @@ describe("Antigravity subscription limits", () => {
443
expect(
444
requests.filter((request) => request.url.endsWith(":retrieveUserQuotaSummary")),
445
).toHaveLength(4);
444
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
446
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
447
);
448
449
it.effect("merges quota groups that only one endpoint reports", () =>
@@ -473,7 +475,7 @@ describe("Antigravity subscription limits", () => {
475
expect(byId.get("gemini-weekly")?.label).toBe("Gemini · Weekly");
476
expect(byId.get("3p-5h")?.usedPercent).toBeCloseTo(70);
477
expect(byId.get("3p-weekly")?.usedPercent).toBe(100);
476
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
478
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
479
);
480
481
it.effect("labels Argon's weekly quota apart from the default Gemini weekly quota", () =>
@@ -495,7 +497,7 @@ describe("Antigravity subscription limits", () => {
497
const byId = new Map(limits.windows.map((window) => [window.id, window]));
498
expect(byId.get("gemini-weekly")?.label).toBe("Gemini · Weekly");
499
expect(byId.get("gemini-argon-wtu-weekly")?.label).toBe("Gemini 4 Argon · Weekly");
498
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
500
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
501
);
502
503
it.effect("keeps one endpoint's quotas when the other fails", () =>
@@ -506,7 +508,7 @@ describe("Antigravity subscription limits", () => {
508
const limits = yield* probe;
509
expect(limits.unavailable).toBeUndefined();
510
expect(limits.windows).toHaveLength(4);
509
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
511
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
512
);
513
514
it.effect("re-reads changed credentials and clears cached access after sign-out", () =>
@@ -525,7 +527,7 @@ describe("Antigravity subscription limits", () => {
527
yield* clear;
528
yield* probe;
529
expect(requests.filter((request) => request.url.endsWith("/token"))).toHaveLength(4);
528
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
530
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
531
);
532
533
it.effect("names one Google account the same way from every sign-in", () =>
@@ -539,7 +541,7 @@ describe("Antigravity subscription limits", () => {
541
expect(machineB.credentialFingerprint).toBe(machineA.credentialFingerprint);
542
expect(otherAccount.credentialFingerprint).not.toBe(machineA.credentialFingerprint);
543
expect(JSON.stringify(machineA)).not.toMatch(/google-user-1|someone@example.com/);
542
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
544
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
545
);
546
547
it.effect("falls back to model quotas without inventing a window duration", () =>
@@ -568,7 +570,7 @@ describe("Antigravity subscription limits", () => {
570
(window) => window.kind === "other" && window.windowDurationMins === undefined,
571
),
572
).toBe(true);
571
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
573
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
574
);
575
576
it.effect("skips disabled and missing fractions and clamps valid percentages", () =>
@@ -591,7 +593,7 @@ describe("Antigravity subscription limits", () => {
593
windowDurationMins: 300,
594
},
595
]);
594
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
596
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
597
);
598
599
it.effect("returns a safe failure when OAuth refresh fails", () =>
@@ -601,7 +603,7 @@ describe("Antigravity subscription limits", () => {
603
expect(limits.windows).toEqual([]);
604
expect(limits.unavailable?.reason).toBe("probeFailed");
605
expect(JSON.stringify(limits)).not.toMatch(/client-secret|refresh-a|access-token/);
604
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
606
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
607
);
608
609
it.effect("does not make network requests for API keys or missing sign-ins", () =>
@@ -611,6 +613,6 @@ describe("Antigravity subscription limits", () => {
613
expect((yield* probe).unavailable?.reason).toBe("unsupported");
614
expect(requests).toEqual([]);
615
}
614
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
616
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
617
);
618
});
apps/server/src/provider/antigravityUsageLimits.ts
+3
-3
@@ -1,7 +1,7 @@
1
import type { AntigravitySettings, ServerProviderUsageWindow } from "@t3tools/contracts";
2
import * as HostProcess from "@t3tools/shared/HostProcess";
3
import * as Clock from "effect/Clock";
4
-import * as Crypto from "effect/Crypto";
4
+import * as Digest from "effect/crypto/Digest";
5
import * as DateTime from "effect/DateTime";
6
import * as Effect from "effect/Effect";
7
import * as FileSystem from "effect/FileSystem";
@@ -188,7 +188,7 @@ export const makeAntigravityUsageProbe = Effect.fn("makeAntigravityUsageProbe")(
188
const fs = yield* FileSystem.FileSystem;
189
const path = yield* Path.Path;
190
const client = (yield* HttpClient.HttpClient).pipe(HttpClient.filterStatusOk);
191
- const crypto = yield* Crypto.Crypto;
191
+ const crypto = yield* Digest.Digest;
192
const platform = yield* HostProcess.Platform;
193
const architecture = yield* HostProcess.Architecture;
194
const tokenPath = path.join(input.profileDirectory, "antigravity-acp", "acp_token.json");
@@ -199,7 +199,7 @@ export const makeAntigravityUsageProbe = Effect.fn("makeAntigravityUsageProbe")(
199
200
const sha256 = (text: string) =>
201
crypto
202
- .digest("SHA-256", new TextEncoder().encode(text))
202
+ .digest(Digest.sha256, new TextEncoder().encode(text))
203
.pipe(
204
Effect.map((digest) =>
205
Array.from(digest, (byte) => byte.toString(16).padStart(2, "0")).join(""),
apps/server/src/provider/resetCreditCoordinator.ts
+7
-10
@@ -1,7 +1,7 @@
1
/** Instances sharing a login directory share credits; serialize redemptions on that directory. */
2
import type { ProviderConsumeResetCreditOutcome } from "@t3tools/contracts";
3
import * as Context from "effect/Context";
4
-import * as Crypto from "effect/Crypto";
4
+import * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as Effect from "effect/Effect";
6
import * as Layer from "effect/Layer";
7
import type * as PlatformError from "effect/PlatformError";
@@ -27,7 +27,7 @@ export class ResetCreditCoordinator extends Context.Service<
27
28
/** @public */
29
export const make = Effect.gen(function* () {
30
- const crypto = yield* Crypto.Crypto;
30
+ const random = yield* SecureRandom.SecureRandom;
31
const statesRef = yield* Ref.make<ReadonlyMap<string, AccountRedemptionState>>(new Map());
32
33
// Create account locks atomically so concurrent first redemptions cannot use separate locks.
@@ -54,7 +54,7 @@ export const make = Effect.gen(function* () {
54
return yield* state.lock.withPermits(1)(
55
Effect.gen(function* () {
56
const existing = yield* Ref.get(state.pendingKey);
57
- const idempotencyKey = existing ?? (yield* crypto.randomUUIDv4());
57
+ const idempotencyKey = existing ?? (yield* random.uuidV4());
58
yield* Ref.set(state.pendingKey, idempotencyKey);
59
const outcome = yield* consume(idempotencyKey).pipe(
60
Effect.tapError((error) =>
@@ -78,13 +78,10 @@ export const layerTest = Layer.effect(
78
let counter = 0;
79
return yield* make.pipe(
80
Effect.provideService(
81
- Crypto.Crypto,
82
- Crypto.make({
83
- randomBytes: (size) => {
84
- counter += 1;
85
- return new Uint8Array(size).fill(counter);
86
- },
87
- digest: (_algorithm, data) => Effect.succeed(data),
81
+ SecureRandom.SecureRandom,
82
+ SecureRandom.make((size) => {
83
+ counter += 1;
84
+ return new Uint8Array(size).fill(counter);
85
}),
86
),
87
);
apps/server/src/pullRequest/PullRequestReadCache.test.ts
+25
-1
@@ -1,13 +1,19 @@
1
import * as NodeV8 from "node:v8";
2
import * as NodeVM from "node:vm";
3
import { assert, it } from "@effect/vitest";
4
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
5
import * as NodeServices from "@effect/platform-node/NodeServices";
6
+import * as Layer from "effect/Layer";
7
import { PullRequestOperationError } from "@t3tools/contracts";
8
import * as Deferred from "effect/Deferred";
9
+import * as Duration from "effect/Duration";
10
import * as Effect from "effect/Effect";
11
import * as Fiber from "effect/Fiber";
12
import * as FileSystem from "effect/FileSystem";
13
+import * as Option from "effect/Option";
14
+import * as Path from "effect/Path";
15
import * as KeyValueStore from "effect/persistence/KeyValueStore";
16
+import * as TestClock from "effect/testing/TestClock";
17
import * as PullRequestReadCache from "./PullRequestReadCache.ts";
18
19
NodeV8.setFlagsFromString("--expose-gc");
@@ -16,7 +22,7 @@ const collectGarbage = NodeVM.runInNewContext("gc") as () => void;
22
const cacheLayer = (directory: string) =>
23
PullRequestReadCache.make.pipe(Effect.provide(KeyValueStore.layerFileSystem(directory)));
24
19
-it.layer(NodeServices.layer)("PR filesystem cache", (it) => {
25
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("PR filesystem cache", (it) => {
26
it.effect("clears in-flight reads before a new service can reuse them", () =>
27
Effect.gen(function* () {
28
const fs = yield* FileSystem.FileSystem;
@@ -46,6 +52,24 @@ it.layer(NodeServices.layer)("PR filesystem cache", (it) => {
52
}),
53
);
54
55
+ it.effect("prunes expired entry files the store wrote", () =>
56
+ Effect.gen(function* () {
57
+ const fs = yield* FileSystem.FileSystem;
58
+ const path = yield* Path.Path;
59
+ const directory = yield* fs.makeTempDirectoryScoped({ prefix: "t3-pr-cache-" });
60
+ const cache = yield* cacheLayer(directory);
61
+ yield* cache.get("summary", Effect.succeed("value"));
62
+ const [entry] = yield* fs.readDirectory(directory);
63
+ assert.isDefined(entry);
64
+ const info = yield* fs.stat(path.join(directory, entry));
65
+ yield* TestClock.setTime(
66
+ Option.getOrThrow(info.mtime).getTime() + Duration.toMillis(Duration.days(2)),
67
+ );
68
+ yield* PullRequestReadCache.pruneExpiredEntryFiles(directory);
69
+ assert.deepStrictEqual(yield* fs.readDirectory(directory), []);
70
+ }),
71
+ );
72
+
73
it.effect("invalidates only the changed scope across restarts and coalesces its next reads", () =>
74
Effect.gen(function* () {
75
const fs = yield* FileSystem.FileSystem;
apps/server/src/pullRequest/PullRequestReadCache.ts
+34
-32
@@ -3,7 +3,8 @@ import * as Clock from "effect/Clock";
3
import * as Equal from "effect/Equal";
4
import * as Hash from "effect/Hash";
5
import { PullRequestOperationError, PullRequestUnavailableError } from "@t3tools/contracts";
6
-import * as Crypto from "effect/Crypto";
6
+import * as Digest from "effect/crypto/Digest";
7
+import * as SecureRandom from "effect/crypto/SecureRandom";
8
import * as Hex from "effect/encoding/Hex";
9
import * as Context from "effect/Context";
10
import * as Duration from "effect/Duration";
@@ -25,9 +26,10 @@ import { detachStackFrame } from "../git/detachStackFrame.ts";
26
import { forkParked } from "../serverActivation.ts";
27
28
const CONCURRENT_READS = 512;
28
-// Entry filenames have the store-id prefix; the scope revisions file does not.
29
+// Entry filenames are the URI-encoded `<storeId>:<key>`; the scope revisions file has
30
+// no store id. Effect before 4.1 wrote `<storeId><key>`, still pruned here.
31
const STORE_ID = "pr-v2";
30
-const ENTRY_FILE_NAME = new RegExp(`^${STORE_ID}[0-9a-f]{64}$`);
32
+const ENTRY_FILE_NAME = new RegExp(`^${STORE_ID}(?:%3A)?[0-9a-f]{64}$`);
33
/**
34
* A file untouched for a day is long expired; the day only leaves slack for
35
* clock changes.
@@ -80,12 +82,13 @@ export class PullRequestReadCache extends Context.Service<
82
83
export const make = Effect.gen(function* () {
84
const backing = yield* KeyValueStore.KeyValueStore;
83
- const crypto = yield* Crypto.Crypto;
85
+ const random = yield* SecureRandom.SecureRandom;
86
+ const digester = yield* Digest.Digest;
87
const clock = yield* Clock.Clock;
88
let enabled = true;
89
const lock = yield* Semaphore.make(CONCURRENT_READS);
90
const digest = (key: string) =>
88
- crypto.digest("SHA-256", new TextEncoder().encode(key)).pipe(Effect.map(Hex.encode));
91
+ digester.digest(Digest.sha256, new TextEncoder().encode(key)).pipe(Effect.map(Hex.encode));
92
const revisions = yield* Cache.makeWith(
93
() =>
94
backing.get("revisions").pipe(
@@ -155,7 +158,6 @@ export const make = Effect.gen(function* () {
158
).payload;
159
}).pipe(
160
Effect.catchTags({
158
- PlatformError: () => read,
161
KeyValueStoreError: () => read,
162
PersistenceError: () => read,
163
SchemaError: () => read,
@@ -170,7 +172,7 @@ export const make = Effect.gen(function* () {
172
const next = Object.fromEntries(
173
Object.entries(current).filter(([, value]) => value.expiresAt > now),
174
);
173
- next[scope] = { revision: yield* crypto.randomUUIDv4(), expiresAt: now + 60_000 };
175
+ next[scope] = { revision: yield* random.uuidV4(), expiresAt: now + 60_000 };
176
const encoded = yield* Schema.encodeEffect(revisionCodec)(next);
177
yield* backing.set("revisions", encoded);
178
yield* Cache.set(revisions, undefined, next);
@@ -190,33 +192,33 @@ export const make = Effect.gen(function* () {
192
* The persisted cache drops an expired entry only when it is read again, so
193
* files for PRs nobody reopens would otherwise stay forever.
194
*/
193
-const pruneExpiredEntryFiles = Effect.fn("PullRequestReadCache.pruneExpiredEntryFiles")(function* (
194
- directory: string,
195
-) {
196
- const fileSystem = yield* FileSystem.FileSystem;
197
- const path = yield* Path.Path;
198
- const cutoff = (yield* Clock.currentTimeMillis) - Duration.toMillis(ENTRY_FILE_MAX_AGE);
199
- const entries = (yield* fileSystem.readDirectory(directory)).filter((name) =>
200
- ENTRY_FILE_NAME.test(name),
201
- );
202
- const [, failures] = yield* Effect.partition(entries, (name) => {
203
- const entryPath = path.join(directory, name);
204
- return fileSystem.stat(entryPath).pipe(
205
- Effect.flatMap((info) =>
206
- Option.exists(info.mtime, (mtime) => mtime.getTime() < cutoff)
207
- ? fileSystem.remove(entryPath)
208
- : Effect.void,
209
- ),
210
- Effect.catchReason("PlatformError", "NotFound", () => Effect.void),
195
+export const pruneExpiredEntryFiles = Effect.fn("PullRequestReadCache.pruneExpiredEntryFiles")(
196
+ function* (directory: string) {
197
+ const fileSystem = yield* FileSystem.FileSystem;
198
+ const path = yield* Path.Path;
199
+ const cutoff = (yield* Clock.currentTimeMillis) - Duration.toMillis(ENTRY_FILE_MAX_AGE);
200
+ const entries = (yield* fileSystem.readDirectory(directory)).filter((name) =>
201
+ ENTRY_FILE_NAME.test(name),
202
);
212
- });
213
- if (failures.length > 0) {
214
- yield* Effect.logWarning("Failed to prune some PR cache files", {
215
- failed: failures.length,
216
- cause: failures[0],
203
+ const [, failures] = yield* Effect.partition(entries, (name) => {
204
+ const entryPath = path.join(directory, name);
205
+ return fileSystem.stat(entryPath).pipe(
206
+ Effect.flatMap((info) =>
207
+ Option.exists(info.mtime, (mtime) => mtime.getTime() < cutoff)
208
+ ? fileSystem.remove(entryPath)
209
+ : Effect.void,
210
+ ),
211
+ Effect.catchReason("PlatformError", "NotFound", () => Effect.void),
212
+ );
213
});
218
- }
219
-});
214
+ if (failures.length > 0) {
215
+ yield* Effect.logWarning("Failed to prune some PR cache files", {
216
+ failed: failures.length,
217
+ cause: failures[0],
218
+ });
219
+ }
220
+ },
221
+);
222
223
export const layer = Layer.unwrap(
224
Effect.gen(function* () {
apps/server/src/pullRequest/PullRequestReviewGuideService.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import * as Context from "effect/Context";
@@ -221,7 +222,7 @@ const layerBase = Layer.mergeAll(
222
Layer.provideMerge(VcsProcess.layer),
223
),
224
SqlitePersistence.layerMemory,
224
-).pipe(Layer.provideMerge(NodeServices.layer));
225
+).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
226
227
type Repositories = Effect.Success<typeof makeRepositories>;
228
apps/server/src/pullRequest/PullRequestService.test.ts
+2
-1
@@ -1,4 +1,5 @@
1
import { SourceControlProviderKind } from "@t3tools/contracts";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as KeyValueStore from "effect/persistence/KeyValueStore";
5
import { assert, expect, it } from "@effect/vitest";
@@ -300,7 +301,7 @@ function makeService(input: {
301
PullRequestFilesViewed.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
302
Layer.effect(PullRequestReadCache.PullRequestReadCache, PullRequestReadCache.make).pipe(
303
Layer.provide(KeyValueStore.layerMemory),
303
- Layer.provide(NodeServices.layer),
304
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
305
),
306
),
307
),
apps/server/src/relay/AgentAwarenessRelay.ts
+3
-3
@@ -23,7 +23,7 @@ import {
23
} from "@t3tools/shared/relayJwt";
24
import * as Cause from "effect/Cause";
25
import * as Context from "effect/Context";
26
-import * as Crypto from "effect/Crypto";
26
+import * as SecureRandom from "effect/crypto/SecureRandom";
27
import * as DateTime from "effect/DateTime";
28
import * as Effect from "effect/Effect";
29
import * as Fiber from "effect/Fiber";
@@ -377,7 +377,7 @@ export const make = Effect.gen(function* () {
377
const serverEnvironment = yield* ServerEnvironment.ServerEnvironment;
378
const threads = yield* ThreadManagement.ThreadManagementService;
379
const projects = yield* ProjectService.ProjectService;
380
- const crypto = yield* Crypto.Crypto;
380
+ const random = yield* SecureRandom.SecureRandom;
381
const scope = yield* Effect.scope;
382
const cloudLinkKeyPair = yield* getOrCreateEnvironmentKeyPairFromSecretStore(secrets);
383
const startedAt = (yield* DateTime.now).epochMilliseconds;
@@ -490,7 +490,7 @@ export const make = Effect.gen(function* () {
490
environmentId,
491
threadId,
492
state: input.state,
493
- jti: yield* crypto.randomUUIDv4(),
493
+ jti: yield* random.uuidV4(),
494
});
495
496
yield* Effect.logInfo("publishing agent activity for thread", {
apps/server/src/requestUrl.ts
new
+14
@@ -0,0 +1,14 @@
1
+import * as Option from "effect/Option";
2
+import { HttpServerRequest } from "effect/http";
3
+
4
+/**
5
+ * `HttpServerRequest.toURL` that honors `X-Forwarded-Proto: https`. Effect 4.1
6
+ * stopped reading it, but TLS-terminating proxies in front of the server
7
+ * (Tailscale Serve, tunnels) rely on it for OAuth, DPoP and pairing URLs.
8
+ */
9
+export const requestUrl = (request: HttpServerRequest.HttpServerRequest): Option.Option<URL> =>
10
+ HttpServerRequest.toURL(
11
+ request.headers["x-forwarded-proto"] === "https" && request.protocol !== "https"
12
+ ? request.modify({ protocol: "https" })
13
+ : request,
14
+ );
apps/server/src/resourceTelemetry/NativeTelemetryClient.ts
+6
-6
@@ -16,7 +16,7 @@ import {
16
} from "@t3tools/contracts";
17
import * as Cause from "effect/Cause";
18
import * as Context from "effect/Context";
19
-import * as Crypto from "effect/Crypto";
19
+import * as SecureRandom from "effect/crypto/SecureRandom";
20
import * as DateTime from "effect/DateTime";
21
import * as Deferred from "effect/Deferred";
22
import * as Duration from "effect/Duration";
@@ -365,7 +365,7 @@ function canCommandNativeTelemetrySidecar(
365
export const make = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(function* () {
366
const binary = yield* ResourceMonitorBinary.ResourceMonitorBinary;
367
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
368
- const crypto = yield* Crypto.Crypto;
368
+ const random = yield* SecureRandom.SecureRandom;
369
const config = yield* ServerConfig.ServerConfig;
370
const initializedAt = yield* DateTime.now;
371
const state = yield* Ref.make(initialState);
@@ -864,7 +864,7 @@ export const make = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(fu
864
reason: Option.getOrElse(current.lastError, () => "sidecar is not running"),
865
});
866
}
867
- const requestId = yield* crypto.randomUUIDv4().pipe(
867
+ const requestId = yield* random.uuidV4().pipe(
868
Effect.mapError(
869
(cause) =>
870
new NativeTelemetryCommandFailed({
@@ -923,7 +923,7 @@ export const make = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(fu
923
});
924
}
925
926
- const requestId = yield* crypto.randomUUIDv4().pipe(
926
+ const requestId = yield* random.uuidV4().pipe(
927
Effect.mapError(
928
(cause) =>
929
new NativeTelemetryCommandFailed({
@@ -978,8 +978,8 @@ export const make = Effect.fn("resourceTelemetry.nativeTelemetryClient.make")(fu
978
});
979
}
980
981
- const requestId = yield* crypto
982
- .randomUUIDv4()
981
+ const requestId = yield* random
982
+ .uuidV4()
983
.pipe(
984
Effect.mapError(
985
(cause) => new NativeTelemetryCommandFailed({ operation: "createRequestId", cause }),
apps/server/src/scheduledTasks/ScheduledTaskService.ts
+9
-9
@@ -28,7 +28,7 @@ import {
28
} from "@t3tools/contracts";
29
import * as Cause from "effect/Cause";
30
import * as Context from "effect/Context";
31
-import * as Crypto from "effect/Crypto";
31
+import * as SecureRandom from "effect/crypto/SecureRandom";
32
import * as Data from "effect/Data";
33
import * as DateTime from "effect/DateTime";
34
import * as Effect from "effect/Effect";
@@ -435,7 +435,7 @@ export const layer = Layer.effect(
435
ScheduledTaskService,
436
Effect.gen(function* () {
437
const sql = yield* SqlClient.SqlClient;
438
- const crypto = yield* Crypto.Crypto;
438
+ const random = yield* SecureRandom.SecureRandom;
439
const threadLaunch = yield* ThreadLaunchService.ThreadLaunchService;
440
const threadManagement = yield* ThreadManagementService.ThreadManagementService;
441
const managedFolders = yield* ManagedProjectFolders.ManagedProjectFolders;
@@ -573,7 +573,7 @@ export const layer = Layer.effect(
573
),
574
);
575
576
- const newWebhookToken = crypto.randomBytes(32).pipe(
576
+ const newWebhookToken = random.randomBytes(32).pipe(
577
Effect.map((bytes) => Buffer.from(bytes).toString("base64url")),
578
Effect.mapError((cause) => taskError("Could not generate webhook token.", { cause })),
579
);
@@ -1219,8 +1219,8 @@ export const layer = Layer.effect(
1219
const now = yield* localNow;
1220
const uuid =
1221
input.commandId === undefined
1222
- ? yield* crypto
1223
- .randomUUIDv4()
1222
+ ? yield* random
1223
+ .uuidV4()
1224
.pipe(
1225
Effect.mapError((cause) =>
1226
taskError("Could not generate schedule task id.", { cause }),
@@ -1950,8 +1950,8 @@ export const layer = Layer.effect(
1950
observeDelivery(request, outcome, receivedAt, now);
1951
const deliveryId = ScheduledTaskWebhookDeliveryId.make(
1952
request.relayDeliveryId === undefined
1953
- ? `delivery:${yield* crypto
1954
- .randomUUIDv4()
1953
+ ? `delivery:${yield* random
1954
+ .uuidV4()
1955
.pipe(
1956
Effect.mapError((cause) => taskError("Could not generate delivery id.", { cause })),
1957
)}`
@@ -2180,7 +2180,7 @@ export const layer = Layer.effect(
2180
claimAcquired = false;
2181
return { _tag: "accepted", deliveryId, outcome } as const;
2182
}
2183
- const frameId = yield* crypto.randomBytes(6).pipe(
2183
+ const frameId = yield* random.randomBytes(6).pipe(
2184
Effect.map((bytes) => Buffer.from(bytes).toString("hex")),
2185
Effect.mapError((cause) => taskError("Could not generate frame id.", { cause })),
2186
);
@@ -2333,7 +2333,7 @@ export const layer = Layer.effect(
2333
const prepared = yield* Effect.gen(function* () {
2334
const task = yield* decodePendingTask(entry.task_json);
2335
const request = yield* decodePendingRequest(entry.request_json);
2336
- const frameId = Buffer.from(yield* crypto.randomBytes(6)).toString("hex");
2336
+ const frameId = Buffer.from(yield* random.randomBytes(6)).toString("hex");
2337
return { task, rendered: renderWebhookPrompt(task.prompt, request, frameId) };
2338
}).pipe(Effect.exit);
2339
if (Exit.isFailure(prepared)) {
apps/server/src/scheduledTasks/ScheduledTaskService.webhook.test.ts
+3
-3
@@ -10,7 +10,7 @@ import {
10
SecretRequestError,
11
} from "@t3tools/contracts";
12
import * as DateTime from "effect/DateTime";
13
-import * as Crypto from "effect/Crypto";
13
+import * as SecureRandom from "effect/crypto/SecureRandom";
14
import * as Deferred from "effect/Deferred";
15
import * as Effect from "effect/Effect";
16
import * as Exit from "effect/Exit";
@@ -185,9 +185,9 @@ const withService = <A, E>(
185
options.frameGate === undefined && options.onFrame === undefined
186
? NodePlatformCrypto.layer
187
: Layer.effect(
188
- Crypto.Crypto,
188
+ SecureRandom.SecureRandom,
189
Effect.gen(function* () {
190
- const crypto = yield* Crypto.Crypto;
190
+ const crypto = yield* SecureRandom.SecureRandom;
191
return {
192
...crypto,
193
randomBytes: (size: number) =>
apps/server/src/server.ts
+4
-1
@@ -11,6 +11,7 @@ import * as DelegatedTaskQuestionReactor from "./orchestration-v2/DelegatedTaskQ
11
import * as NodeHttp from "node:http";
12
13
import * as NodeHttpServer from "@effect/platform-node/NodeHttpServer";
14
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
15
import * as NodeServices from "@effect/platform-node/NodeServices";
16
import { EnvironmentHttpApi, type RepositoryIdentity } from "@t3tools/contracts";
17
import * as Cause from "effect/Cause";
@@ -372,7 +373,9 @@ const layerHttpServer = Layer.unwrap(
373
}),
374
).pipe(Layer.provide(ManagedPolicy.layer));
375
375
-const layerPlatformServices = DocumentText.layer.pipe(Layer.provideMerge(NodeServices.layer));
376
+const layerPlatformServices = DocumentText.layer.pipe(
377
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
378
+);
379
380
const layerPersistence = Layer.empty.pipe(Layer.provideMerge(SqlitePersistence.layerConfig));
381
apps/server/src/serverOwnership.ts
+4
-4
@@ -5,7 +5,7 @@ import * as NodeSqlite from "node:sqlite";
5
6
import { SERVER_EXIT_CODE_STATE_DIR_OWNED } from "@t3tools/contracts";
7
import * as HostProcess from "@t3tools/shared/HostProcess";
8
-import * as Crypto from "effect/Crypto";
8
+import * as SecureRandom from "effect/crypto/SecureRandom";
9
import * as Duration from "effect/Duration";
10
import * as Effect from "effect/Effect";
11
import * as FileSystem from "effect/FileSystem";
@@ -184,9 +184,9 @@ export const acquireServerOwnership = Effect.fn("acquireServerOwnership")(functi
184
statePath: string,
185
) {
186
const stateDir = NodePath.dirname(statePath);
187
- const crypto = yield* Crypto.Crypto;
188
- const ownerId = yield* crypto
189
- .randomUUIDv4()
187
+ const random = yield* SecureRandom.SecureRandom;
188
+ const ownerId = yield* random
189
+ .uuidV4()
190
.pipe(Effect.mapError((cause) => new ServerOwnershipError({ stateDir, cause })));
191
const lockPath = NodePath.join(stateDir, "server-owner.sqlite");
192
const lock = yield* Effect.acquireRelease(
apps/server/src/serverRuntimeStartup.ts
+7
-5
@@ -14,7 +14,7 @@ import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
14
import * as Cause from "effect/Cause";
15
import * as Console from "effect/Console";
16
import * as Context from "effect/Context";
17
-import * as Crypto from "effect/Crypto";
17
+import * as SecureRandom from "effect/crypto/SecureRandom";
18
import * as DateTime from "effect/DateTime";
19
import * as Deferred from "effect/Deferred";
20
import * as Effect from "effect/Effect";
@@ -261,8 +261,8 @@ const resolveWelcomeBase = Effect.gen(function* () {
261
});
262
263
const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
264
- const crypto = yield* Crypto.Crypto;
265
- const randomUUID = crypto.randomUUIDv4();
264
+ const random = yield* SecureRandom.SecureRandom;
265
+ const randomUUID = random.uuidV4();
266
const serverConfig = yield* ServerConfig.ServerConfig;
267
const projects = yield* ProjectService.ProjectService;
268
const threads = yield* ThreadManagement.ThreadManagementService;
@@ -451,7 +451,7 @@ const make = Effect.fn("serverRuntimeStartup.make")(function* (options?: Startup
451
const lifecycleEvents = yield* ServerLifecycleEvents.ServerLifecycleEvents;
452
const serverSettings = yield* ServerSettings.ServerSettingsService;
453
const serverEnvironment = yield* ServerEnvironment.ServerEnvironment;
454
- const crypto = yield* Crypto.Crypto;
454
+ const random = yield* SecureRandom.SecureRandom;
455
const launcher = yield* ServiceLauncherClient.ServiceLauncherClient;
456
457
const commandGate = yield* makeCommandGate;
@@ -557,7 +557,9 @@ const make = Effect.fn("serverRuntimeStartup.make")(function* (options?: Startup
557
autoBootstrap: (serverConfig.autoBootstrapProjectFromCwd
558
? runStartupPhase(
559
"welcome.autobootstrap",
560
- resolveAutoBootstrapWelcomeTargets.pipe(Effect.provideService(Crypto.Crypto, crypto)),
560
+ resolveAutoBootstrapWelcomeTargets.pipe(
561
+ Effect.provideService(SecureRandom.SecureRandom, random),
562
+ ),
563
)
564
: Effect.succeed({})
565
).pipe(Effect.map((targets): AutoBootstrapWelcomeTargets => targets)),
apps/server/src/serverRuntimeState.test.ts
+8
-7
@@ -3,6 +3,7 @@ import * as NodeFS from "node:fs";
3
import * as NodeSqlite from "node:sqlite";
4
5
import { assert, describe, it } from "@effect/vitest";
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import * as HostProcess from "@t3tools/shared/HostProcess";
9
import * as Effect from "effect/Effect";
@@ -145,7 +146,7 @@ describe("server ownership", () => {
146
}),
147
),
148
Layer.succeed(HostProcess.Environment, {}),
148
- ).pipe(Layer.provideMerge(NodeServices.layer));
149
+ ).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
150
const makeState = ServerRuntimeState.makePersistedServerRuntimeState({
151
config: { host: undefined, devUrl: undefined },
152
port: 3773,
@@ -373,7 +374,7 @@ describe("server ownership", () => {
374
assert.include(result.failure.message, "t3 service restart");
375
assert.include(result.failure.message, "No server was stopped");
376
}
376
- }).pipe(Effect.provide(NodeServices.layer)),
377
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
378
);
379
380
it.effect(
@@ -392,7 +393,7 @@ describe("server ownership", () => {
393
if (result._tag !== "Failure") return;
394
assert.equal(result.failure._tag, "OlderBootServiceError");
395
assert.equal(Runtime.getErrorExitCode(result.failure), 78);
395
- }).pipe(Effect.provide(NodeServices.layer)),
396
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
397
);
398
399
it.effect("refuses while the loaded service has not restarted into its lock-aware update", () =>
@@ -406,7 +407,7 @@ describe("server ownership", () => {
407
},
408
});
409
assert.equal(result._tag === "Failure" && result.failure._tag, "OlderBootServiceError");
409
- }).pipe(Effect.provide(NodeServices.layer)),
410
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
411
);
412
413
it.effect("allows lock-aware stable services that are loaded or stopped and enabled", () =>
@@ -429,7 +430,7 @@ describe("server ownership", () => {
430
const { result } = yield* startBesideBootService({ ...fixture, activeVersion: "0.1.0" });
431
assert.equal(result._tag, "Success");
432
}
432
- }).pipe(Effect.provide(NodeServices.layer)),
433
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
434
);
435
436
it.effect("allows services that cannot compete for this home", () =>
@@ -466,7 +467,7 @@ describe("server ownership", () => {
467
const { result } = yield* startBesideBootService(fixture);
468
assert.equal(result._tag, "Success");
469
}
469
- }).pipe(Effect.provide(NodeServices.layer)),
470
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
471
);
472
473
it.effect("allows startup when the service configuration or manager is unavailable", () =>
@@ -484,7 +485,7 @@ describe("server ownership", () => {
485
const { result } = yield* startBesideBootService({ platform: "darwin", ...fixture });
486
assert.equal(result._tag, "Success");
487
}
487
- }).pipe(Effect.provide(NodeServices.layer)),
488
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
489
);
490
});
491
});
apps/server/src/serverSettings.test.ts
+612
-575
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import {
4
DEFAULT_SERVER_SETTINGS,
@@ -101,7 +102,7 @@ const recordProviderUsage = (provider: string, instanceId: string | null = provi
102
`;
103
});
104
104
-it.layer(NodeServices.layer)("server settings", (it) => {
105
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings", (it) => {
106
it.effect("serializes concurrent model preference edits without cancelling duplicate adds", () =>
107
Effect.gen(function* () {
108
const service = yield* ServerSettingsModule.ServerSettingsService;
@@ -2011,643 +2012,679 @@ it.layer(NodeServices.layer)("server settings", (it) => {
2012
);
2013
});
2014
2014
-it.layer(NodeServices.layer)("server settings under a managed policy", (it) => {
2015
- const policy: ManagedPolicyDocument = {
2016
- schemaVersion: 1,
2017
- organization: "Example Corp",
2018
- settings: {
2019
- defaultRuntimeMode: { value: "approval-required", locked: false },
2020
- enableAgentDeviceAccess: { value: false, locked: true },
2021
- },
2022
- };
2015
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))(
2016
+ "server settings under a managed policy",
2017
+ (it) => {
2018
+ const policy: ManagedPolicyDocument = {
2019
+ schemaVersion: 1,
2020
+ organization: "Example Corp",
2021
+ settings: {
2022
+ defaultRuntimeMode: { value: "approval-required", locked: false },
2023
+ enableAgentDeviceAccess: { value: false, locked: true },
2024
+ },
2025
+ };
2026
2024
- it.effect("uses policy defaults until the user picks something else", () =>
2025
- Effect.gen(function* () {
2026
- const service = yield* ServerSettingsModule.ServerSettingsService;
2027
- const config = yield* ServerConfig.ServerConfig;
2028
- const fs = yield* FileSystem.FileSystem;
2027
+ it.effect("uses policy defaults until the user picks something else", () =>
2028
+ Effect.gen(function* () {
2029
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2030
+ const config = yield* ServerConfig.ServerConfig;
2031
+ const fs = yield* FileSystem.FileSystem;
2032
2030
- assert.equal((yield* service.getSettings).defaultRuntimeMode, "approval-required");
2033
+ assert.equal((yield* service.getSettings).defaultRuntimeMode, "approval-required");
2034
2032
- // The built-in default differs from the policy's, so choosing it must persist.
2033
- yield* service.updateSettings({ defaultRuntimeMode: "full-access" });
2034
- assert.equal((yield* service.getSettings).defaultRuntimeMode, "full-access");
2035
- assert.include(yield* fs.readFileString(config.settingsPath), '"full-access"');
2035
+ // The built-in default differs from the policy's, so choosing it must persist.
2036
+ yield* service.updateSettings({ defaultRuntimeMode: "full-access" });
2037
+ assert.equal((yield* service.getSettings).defaultRuntimeMode, "full-access");
2038
+ assert.include(yield* fs.readFileString(config.settingsPath), '"full-access"');
2039
2037
- // Choosing the policy's value leaves nothing in the file to outlive the policy.
2038
- yield* service.updateSettings({ defaultRuntimeMode: "approval-required" });
2039
- assert.notInclude(yield* fs.readFileString(config.settingsPath), "defaultRuntimeMode");
2040
- }).pipe(Effect.provide(layerServerSettings(policy))),
2041
- );
2040
+ // Choosing the policy's value leaves nothing in the file to outlive the policy.
2041
+ yield* service.updateSettings({ defaultRuntimeMode: "approval-required" });
2042
+ assert.notInclude(yield* fs.readFileString(config.settingsPath), "defaultRuntimeMode");
2043
+ }).pipe(Effect.provide(layerServerSettings(policy))),
2044
+ );
2045
2043
- it.effect("keeps a stored value that equals a policy default through unrelated writes", () =>
2044
- Effect.gen(function* () {
2045
- const service = yield* ServerSettingsModule.ServerSettingsService;
2046
- const config = yield* ServerConfig.ServerConfig;
2047
- const fs = yield* FileSystem.FileSystem;
2048
- yield* fs.writeFileString(
2049
- config.settingsPath,
2050
- JSON.stringify({ defaultRuntimeMode: "approval-required" }),
2051
- );
2046
+ it.effect("keeps a stored value that equals a policy default through unrelated writes", () =>
2047
+ Effect.gen(function* () {
2048
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2049
+ const config = yield* ServerConfig.ServerConfig;
2050
+ const fs = yield* FileSystem.FileSystem;
2051
+ yield* fs.writeFileString(
2052
+ config.settingsPath,
2053
+ JSON.stringify({ defaultRuntimeMode: "approval-required" }),
2054
+ );
2055
2053
- yield* service.updateSettings({ defaultAutoPull: true });
2054
- assert.include(yield* fs.readFileString(config.settingsPath), '"approval-required"');
2055
- }).pipe(Effect.provide(layerServerSettings(policy))),
2056
- );
2056
+ yield* service.updateSettings({ defaultAutoPull: true });
2057
+ assert.include(yield* fs.readFileString(config.settingsPath), '"approval-required"');
2058
+ }).pipe(Effect.provide(layerServerSettings(policy))),
2059
+ );
2060
2058
- it.effect("keeps stored values under whole-object policy defaults, and only the user's", () =>
2059
- Effect.gen(function* () {
2060
- const service = yield* ServerSettingsModule.ServerSettingsService;
2061
- const config = yield* ServerConfig.ServerConfig;
2062
- const fs = yield* FileSystem.FileSystem;
2063
- const selection = {
2064
- ...DEFAULT_SERVER_SETTINGS.textGenerationModelSelection,
2065
- model: "managed",
2066
- };
2067
- const chosenModel = { instanceId: ProviderInstanceId.make("codex"), model: "gpt-mini" };
2068
- yield* fs.writeFileString(
2069
- config.settingsPath,
2070
- JSON.stringify({
2071
- storageCleanup: { logsAfterDays: 30, browserArtifactsAfterDays: 7 },
2072
- textGenerationModelSelection: selection,
2073
- }),
2074
- );
2061
+ it.effect("keeps stored values under whole-object policy defaults, and only the user's", () =>
2062
+ Effect.gen(function* () {
2063
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2064
+ const config = yield* ServerConfig.ServerConfig;
2065
+ const fs = yield* FileSystem.FileSystem;
2066
+ const selection = {
2067
+ ...DEFAULT_SERVER_SETTINGS.textGenerationModelSelection,
2068
+ model: "managed",
2069
+ };
2070
+ const chosenModel = { instanceId: ProviderInstanceId.make("codex"), model: "gpt-mini" };
2071
+ yield* fs.writeFileString(
2072
+ config.settingsPath,
2073
+ JSON.stringify({
2074
+ storageCleanup: { logsAfterDays: 30, browserArtifactsAfterDays: 7 },
2075
+ textGenerationModelSelection: selection,
2076
+ }),
2077
+ );
2078
2076
- // Picking another model on the policy's instance differs from the policy in one field only.
2077
- yield* service.updateSettings({ defaultAutoPull: true, defaultModelSelection: chosenModel });
2078
- const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2079
- assert.deepEqual(stored.storageCleanup, { logsAfterDays: 30, browserArtifactsAfterDays: 7 });
2080
- // Model selections are saved whole, never as the fields that differ from the policy's.
2081
- assert.deepEqual(stored.textGenerationModelSelection, selection);
2082
- assert.deepEqual(stored.defaultModelSelection, chosenModel);
2083
- // The switch the server derives from the policy's idle compaction stays out of the file.
2084
- assert.notProperty(stored, "compactIdleThreads");
2085
- }).pipe(
2086
- Effect.provide(
2087
- layerServerSettings({
2088
- schemaVersion: 1,
2089
- organization: "Example Corp",
2090
- settings: {
2091
- storageCleanup: {
2092
- value: { ...DEFAULT_SERVER_SETTINGS.storageCleanup, logsAfterDays: 30 },
2093
- locked: false,
2094
- },
2095
- "textGenerationModelSelection.model": { value: "managed", locked: false },
2096
- defaultModelSelection: {
2097
- value: { instanceId: "codex", model: "gpt-managed" },
2098
- locked: false,
2079
+ // Picking another model on the policy's instance differs from the policy in one field only.
2080
+ yield* service.updateSettings({
2081
+ defaultAutoPull: true,
2082
+ defaultModelSelection: chosenModel,
2083
+ });
2084
+ const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2085
+ assert.deepEqual(stored.storageCleanup, {
2086
+ logsAfterDays: 30,
2087
+ browserArtifactsAfterDays: 7,
2088
+ });
2089
+ // Model selections are saved whole, never as the fields that differ from the policy's.
2090
+ assert.deepEqual(stored.textGenerationModelSelection, selection);
2091
+ assert.deepEqual(stored.defaultModelSelection, chosenModel);
2092
+ // The switch the server derives from the policy's idle compaction stays out of the file.
2093
+ assert.notProperty(stored, "compactIdleThreads");
2094
+ }).pipe(
2095
+ Effect.provide(
2096
+ layerServerSettings({
2097
+ schemaVersion: 1,
2098
+ organization: "Example Corp",
2099
+ settings: {
2100
+ storageCleanup: {
2101
+ value: { ...DEFAULT_SERVER_SETTINGS.storageCleanup, logsAfterDays: 30 },
2102
+ locked: false,
2103
+ },
2104
+ "textGenerationModelSelection.model": { value: "managed", locked: false },
2105
+ defaultModelSelection: {
2106
+ value: { instanceId: "codex", model: "gpt-managed" },
2107
+ locked: false,
2108
+ },
2109
+ idleCompaction: { value: "beforeCacheExpires", locked: false },
2110
},
2100
- idleCompaction: { value: "beforeCacheExpires", locked: false },
2101
- },
2102
- }),
2111
+ }),
2112
+ ),
2113
),
2104
- ),
2105
- );
2114
+ );
2115
2107
- it.effect(
2108
- "keeps an idle compaction choice saved before idleCompaction over a policy default",
2109
- () =>
2110
- // The file holds only the legacy switch: off differs from the policy's default, on matches it.
2111
- Effect.forEach([false, true], (compactIdleThreads) =>
2112
- Effect.gen(function* () {
2113
- const service = yield* ServerSettingsModule.ServerSettingsService;
2114
- const config = yield* ServerConfig.ServerConfig;
2115
- const fs = yield* FileSystem.FileSystem;
2116
- const chosen = compactIdleThreads ? "beforeCacheExpires" : "onReturn";
2117
- yield* fs.writeFileString(config.settingsPath, JSON.stringify({ compactIdleThreads }));
2118
-
2119
- assert.equal((yield* service.getSettings).idleCompaction, chosen);
2120
- yield* service.updateSettings({ defaultAutoPull: true });
2121
- // What applies once the policy is gone is still the user's choice.
2122
- const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2123
- assert.equal(globalIdleCompaction(stored), chosen);
2124
- }).pipe(
2125
- Effect.provide(
2126
- layerServerSettings({
2127
- schemaVersion: 1,
2128
- organization: "Example Corp",
2129
- settings: { idleCompaction: { value: "beforeCacheExpires", locked: false } },
2130
- }),
2116
+ it.effect(
2117
+ "keeps an idle compaction choice saved before idleCompaction over a policy default",
2118
+ () =>
2119
+ // The file holds only the legacy switch: off differs from the policy's default, on matches it.
2120
+ Effect.forEach([false, true], (compactIdleThreads) =>
2121
+ Effect.gen(function* () {
2122
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2123
+ const config = yield* ServerConfig.ServerConfig;
2124
+ const fs = yield* FileSystem.FileSystem;
2125
+ const chosen = compactIdleThreads ? "beforeCacheExpires" : "onReturn";
2126
+ yield* fs.writeFileString(config.settingsPath, JSON.stringify({ compactIdleThreads }));
2127
+
2128
+ assert.equal((yield* service.getSettings).idleCompaction, chosen);
2129
+ yield* service.updateSettings({ defaultAutoPull: true });
2130
+ // What applies once the policy is gone is still the user's choice.
2131
+ const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2132
+ assert.equal(globalIdleCompaction(stored), chosen);
2133
+ }).pipe(
2134
+ Effect.provide(
2135
+ layerServerSettings({
2136
+ schemaVersion: 1,
2137
+ organization: "Example Corp",
2138
+ settings: { idleCompaction: { value: "beforeCacheExpires", locked: false } },
2139
+ }),
2140
+ ),
2141
),
2142
),
2133
- ),
2134
- );
2143
+ );
2144
2136
- it.effect("lays locks over the user's own and per-project values without persisting them", () =>
2137
- Effect.gen(function* () {
2138
- const service = yield* ServerSettingsModule.ServerSettingsService;
2139
- const config = yield* ServerConfig.ServerConfig;
2140
- const fs = yield* FileSystem.FileSystem;
2141
- const projectId = ProjectId.make("project-locked");
2142
- yield* fs.writeFileString(
2143
- config.settingsPath,
2144
- JSON.stringify({
2145
- enableAgentDeviceAccess: true,
2146
- projectSettingsOverrides: { [projectId]: { enableAgentDeviceAccess: true } },
2147
- }),
2148
- );
2145
+ it.effect("lays locks over the user's own and per-project values without persisting them", () =>
2146
+ Effect.gen(function* () {
2147
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2148
+ const config = yield* ServerConfig.ServerConfig;
2149
+ const fs = yield* FileSystem.FileSystem;
2150
+ const projectId = ProjectId.make("project-locked");
2151
+ yield* fs.writeFileString(
2152
+ config.settingsPath,
2153
+ JSON.stringify({
2154
+ enableAgentDeviceAccess: true,
2155
+ projectSettingsOverrides: { [projectId]: { enableAgentDeviceAccess: true } },
2156
+ }),
2157
+ );
2158
2150
- const settings = yield* service.getSettings;
2151
- assert.isFalse(settings.enableAgentDeviceAccess);
2152
- assert.isFalse(settings.projectSettingsOverrides[projectId]?.enableAgentDeviceAccess);
2153
- assert.deepEqual(service.managedPolicy, {
2154
- organization: "Example Corp",
2155
- lockedSettings: ["enableAgentDeviceAccess"],
2156
- });
2159
+ const settings = yield* service.getSettings;
2160
+ assert.isFalse(settings.enableAgentDeviceAccess);
2161
+ assert.isFalse(settings.projectSettingsOverrides[projectId]?.enableAgentDeviceAccess);
2162
+ assert.deepEqual(service.managedPolicy, {
2163
+ organization: "Example Corp",
2164
+ lockedSettings: ["enableAgentDeviceAccess"],
2165
+ });
2166
2158
- const rejected = yield* service
2159
- .updateSettings({ enableAgentDeviceAccess: true, defaultAutoPull: true })
2160
- .pipe(Effect.flip);
2161
- assert.equal(rejected.operation, "write-managed-setting");
2162
- assert.equal(rejected.managedSetting, "enableAgentDeviceAccess");
2163
- assert.equal(
2164
- rejected.message,
2165
- "enableAgentDeviceAccess is managed by Example Corp and cannot be changed.",
2166
- );
2167
- assert.isFalse((yield* service.getSettings).defaultAutoPull);
2167
+ const rejected = yield* service
2168
+ .updateSettings({ enableAgentDeviceAccess: true, defaultAutoPull: true })
2169
+ .pipe(Effect.flip);
2170
+ assert.equal(rejected.operation, "write-managed-setting");
2171
+ assert.equal(rejected.managedSetting, "enableAgentDeviceAccess");
2172
+ assert.equal(
2173
+ rejected.message,
2174
+ "enableAgentDeviceAccess is managed by Example Corp and cannot be changed.",
2175
+ );
2176
+ assert.isFalse((yield* service.getSettings).defaultAutoPull);
2177
2169
- const projectRejected = yield* service
2170
- .updateSettings({
2171
- projectSettingsOverrides: { [projectId]: { enableAgentDeviceAccess: true } },
2172
- })
2173
- .pipe(Effect.flip);
2174
- assert.equal(projectRejected.managedSetting, "enableAgentDeviceAccess");
2178
+ const projectRejected = yield* service
2179
+ .updateSettings({
2180
+ projectSettingsOverrides: { [projectId]: { enableAgentDeviceAccess: true } },
2181
+ })
2182
+ .pipe(Effect.flip);
2183
+ assert.equal(projectRejected.managedSetting, "enableAgentDeviceAccess");
2184
2176
- // Unrelated writes, and writes that keep the locked value, go through.
2177
- yield* service.updateSettings({ enableAgentDeviceAccess: false, defaultAutoPull: true });
2178
- assert.isTrue((yield* service.getSettings).defaultAutoPull);
2185
+ // Unrelated writes, and writes that keep the locked value, go through.
2186
+ yield* service.updateSettings({ enableAgentDeviceAccess: false, defaultAutoPull: true });
2187
+ assert.isTrue((yield* service.getSettings).defaultAutoPull);
2188
2180
- // The user's own value stays on disk, ready for when the policy is removed.
2181
- const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2182
- assert.isTrue(stored.enableAgentDeviceAccess);
2183
- }).pipe(Effect.provide(layerServerSettings(policy))),
2184
- );
2185
- it.effect("accepts a project override that brings the locked value inside a new setting", () =>
2186
- Effect.gen(function* () {
2187
- const service = yield* ServerSettingsModule.ServerSettingsService;
2188
- const projectId = ProjectId.make("project-text-generation");
2189
- const selection = { instanceId: ProviderInstanceId.make("codex"), model: "gpt-locked" };
2189
+ // The user's own value stays on disk, ready for when the policy is removed.
2190
+ const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2191
+ assert.isTrue(stored.enableAgentDeviceAccess);
2192
+ }).pipe(Effect.provide(layerServerSettings(policy))),
2193
+ );
2194
+ it.effect("accepts a project override that brings the locked value inside a new setting", () =>
2195
+ Effect.gen(function* () {
2196
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2197
+ const projectId = ProjectId.make("project-text-generation");
2198
+ const selection = { instanceId: ProviderInstanceId.make("codex"), model: "gpt-locked" };
2199
2191
- yield* service.updateSettings({
2192
- projectSettingsOverrides: { [projectId]: { textGenerationModelSelection: selection } },
2193
- });
2200
+ yield* service.updateSettings({
2201
+ projectSettingsOverrides: { [projectId]: { textGenerationModelSelection: selection } },
2202
+ });
2203
2195
- const project = (yield* service.getSettings).projectSettingsOverrides[projectId];
2196
- assert.equal(project?.textGenerationModelSelection?.model, "gpt-locked");
2197
- }).pipe(
2198
- Effect.provide(
2199
- layerServerSettings({
2200
- schemaVersion: 1,
2201
- organization: "Example Corp",
2202
- settings: { "textGenerationModelSelection.model": { value: "gpt-locked", locked: true } },
2203
- }),
2204
+ const project = (yield* service.getSettings).projectSettingsOverrides[projectId];
2205
+ assert.equal(project?.textGenerationModelSelection?.model, "gpt-locked");
2206
+ }).pipe(
2207
+ Effect.provide(
2208
+ layerServerSettings({
2209
+ schemaVersion: 1,
2210
+ organization: "Example Corp",
2211
+ settings: {
2212
+ "textGenerationModelSelection.model": { value: "gpt-locked", locked: true },
2213
+ },
2214
+ }),
2215
+ ),
2216
),
2205
- ),
2206
- );
2217
+ );
2218
2208
- it.effect("compares a project's partial override with a locked entry by the keys it holds", () =>
2209
- Effect.gen(function* () {
2210
- const service = yield* ServerSettingsModule.ServerSettingsService;
2211
- const codexId = ProviderInstanceId.make("codex");
2212
- const projectWith = (enabled: boolean) => ({
2213
- projectSettingsOverrides: {
2214
- [ProjectId.make("project-codex")]: { providerInstances: { [codexId]: { enabled } } },
2215
- },
2216
- });
2219
+ it.effect(
2220
+ "compares a project's partial override with a locked entry by the keys it holds",
2221
+ () =>
2222
+ Effect.gen(function* () {
2223
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2224
+ const codexId = ProviderInstanceId.make("codex");
2225
+ const projectWith = (enabled: boolean) => ({
2226
+ projectSettingsOverrides: {
2227
+ [ProjectId.make("project-codex")]: { providerInstances: { [codexId]: { enabled } } },
2228
+ },
2229
+ });
2230
2218
- yield* service.updateSettings(projectWith(true));
2219
- const refused = yield* service.updateSettings(projectWith(false)).pipe(Effect.flip);
2220
- assert.equal(refused.managedSetting, "providerInstances.codex");
2221
- }).pipe(
2222
- Effect.provide(
2223
- layerServerSettings({
2224
- schemaVersion: 1,
2225
- organization: "Example Corp",
2226
- settings: {
2227
- "providerInstances.codex": { value: { driver: "codex", enabled: true }, locked: true },
2228
- },
2229
- }),
2230
- ),
2231
- ),
2232
- );
2231
+ yield* service.updateSettings(projectWith(true));
2232
+ const refused = yield* service.updateSettings(projectWith(false)).pipe(Effect.flip);
2233
+ assert.equal(refused.managedSetting, "providerInstances.codex");
2234
+ }).pipe(
2235
+ Effect.provide(
2236
+ layerServerSettings({
2237
+ schemaVersion: 1,
2238
+ organization: "Example Corp",
2239
+ settings: {
2240
+ "providerInstances.codex": {
2241
+ value: { driver: "codex", enabled: true },
2242
+ locked: true,
2243
+ },
2244
+ },
2245
+ }),
2246
+ ),
2247
+ ),
2248
+ );
2249
2234
- it.effect("lowers default runtime modes above the ceiling without rewriting them", () =>
2235
- Effect.gen(function* () {
2236
- const service = yield* ServerSettingsModule.ServerSettingsService;
2237
- const config = yield* ServerConfig.ServerConfig;
2238
- const fs = yield* FileSystem.FileSystem;
2239
- const raised = ProjectId.make("project-raised");
2240
- const supervised = ProjectId.make("project-supervised");
2241
- yield* fs.writeFileString(
2242
- config.settingsPath,
2243
- JSON.stringify({
2244
- defaultRuntimeMode: "auto",
2245
- projectSettingsOverrides: {
2246
- [raised]: { defaultRuntimeMode: "full-access" },
2247
- [supervised]: { defaultRuntimeMode: "approval-required" },
2248
- },
2249
- }),
2250
- );
2250
+ it.effect("lowers default runtime modes above the ceiling without rewriting them", () =>
2251
+ Effect.gen(function* () {
2252
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2253
+ const config = yield* ServerConfig.ServerConfig;
2254
+ const fs = yield* FileSystem.FileSystem;
2255
+ const raised = ProjectId.make("project-raised");
2256
+ const supervised = ProjectId.make("project-supervised");
2257
+ yield* fs.writeFileString(
2258
+ config.settingsPath,
2259
+ JSON.stringify({
2260
+ defaultRuntimeMode: "auto",
2261
+ projectSettingsOverrides: {
2262
+ [raised]: { defaultRuntimeMode: "full-access" },
2263
+ [supervised]: { defaultRuntimeMode: "approval-required" },
2264
+ },
2265
+ }),
2266
+ );
2267
2252
- const settings = yield* service.getSettings;
2253
- assert.equal(settings.defaultRuntimeMode, "auto-accept-edits");
2254
- assert.equal(
2255
- settings.projectSettingsOverrides[raised]?.defaultRuntimeMode,
2256
- "auto-accept-edits",
2257
- );
2258
- assert.equal(
2259
- settings.projectSettingsOverrides[supervised]?.defaultRuntimeMode,
2260
- "approval-required",
2261
- );
2268
+ const settings = yield* service.getSettings;
2269
+ assert.equal(settings.defaultRuntimeMode, "auto-accept-edits");
2270
+ assert.equal(
2271
+ settings.projectSettingsOverrides[raised]?.defaultRuntimeMode,
2272
+ "auto-accept-edits",
2273
+ );
2274
+ assert.equal(
2275
+ settings.projectSettingsOverrides[supervised]?.defaultRuntimeMode,
2276
+ "approval-required",
2277
+ );
2278
2263
- yield* service.updateSettings({ defaultAutoPull: true });
2264
- const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2265
- assert.equal(stored.defaultRuntimeMode, "auto");
2266
- assert.equal(stored.projectSettingsOverrides[raised].defaultRuntimeMode, "full-access");
2267
- }).pipe(
2268
- Effect.provide(
2269
- layerServerSettings({
2270
- schemaVersion: 1,
2271
- organization: "Example Corp",
2272
- limits: { maxRuntimeMode: "auto-accept-edits" },
2273
- }),
2279
+ yield* service.updateSettings({ defaultAutoPull: true });
2280
+ const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2281
+ assert.equal(stored.defaultRuntimeMode, "auto");
2282
+ assert.equal(stored.projectSettingsOverrides[raised].defaultRuntimeMode, "full-access");
2283
+ }).pipe(
2284
+ Effect.provide(
2285
+ layerServerSettings({
2286
+ schemaVersion: 1,
2287
+ organization: "Example Corp",
2288
+ limits: { maxRuntimeMode: "auto-accept-edits" },
2289
+ }),
2290
+ ),
2291
),
2275
- ),
2276
- );
2277
-});
2278
-
2279
-it.layer(NodeServices.layer)("server settings under a provider policy", (it) => {
2280
- const claude = ProviderDriverKind.make("claudeAgent");
2281
- const codex = ProviderDriverKind.make("codex");
2282
- const cursor = ProviderDriverKind.make("cursor");
2283
- const bedrock = { name: "CLAUDE_CODE_USE_BEDROCK", value: "1", sensitive: false };
2284
- const policy: ManagedPolicyDocument = {
2285
- schemaVersion: 1,
2286
- organization: "Example Corp",
2287
- limits: {
2288
- providers: {
2289
- allowedDrivers: [claude, codex],
2290
- instances: {
2291
- [claude]: {
2292
- locked: true,
2293
- environment: [{ name: bedrock.name, value: bedrock.value }],
2294
- binaryPath: "/opt/claude/bin/claude",
2292
+ );
2293
+ },
2294
+);
2295
+
2296
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))(
2297
+ "server settings under a provider policy",
2298
+ (it) => {
2299
+ const claude = ProviderDriverKind.make("claudeAgent");
2300
+ const codex = ProviderDriverKind.make("codex");
2301
+ const cursor = ProviderDriverKind.make("cursor");
2302
+ const bedrock = { name: "CLAUDE_CODE_USE_BEDROCK", value: "1", sensitive: false };
2303
+ const policy: ManagedPolicyDocument = {
2304
+ schemaVersion: 1,
2305
+ organization: "Example Corp",
2306
+ limits: {
2307
+ providers: {
2308
+ allowedDrivers: [claude, codex],
2309
+ instances: {
2310
+ [claude]: {
2311
+ locked: true,
2312
+ environment: [{ name: bedrock.name, value: bedrock.value }],
2313
+ binaryPath: "/opt/claude/bin/claude",
2314
+ },
2315
+ [codex]: { locked: false, launchArgs: "-c model_provider=gateway" },
2316
},
2296
- [codex]: { locked: false, launchArgs: "-c model_provider=gateway" },
2317
},
2318
},
2299
- },
2300
- };
2319
+ };
2320
2302
- it.effect("refuses enabling a driver the policy leaves out, and keeps existing ones", () =>
2303
- Effect.gen(function* () {
2304
- const service = yield* ServerSettingsModule.ServerSettingsService;
2305
- const config = yield* ServerConfig.ServerConfig;
2306
- const fs = yield* FileSystem.FileSystem;
2307
- const cursorId = ProviderInstanceId.make("cursor_work");
2308
- yield* fs.writeFileString(
2309
- config.settingsPath,
2310
- JSON.stringify({
2311
- providerInstances: {
2312
- [cursorId]: { driver: cursor, enabled: true },
2313
- // A default instance id is no proof of its driver.
2314
- codex: { driver: cursor, enabled: true },
2315
- },
2316
- textGenerationModelSelection: { instanceId: cursorId, model: "auto" },
2317
- }),
2318
- );
2321
+ it.effect("refuses enabling a driver the policy leaves out, and keeps existing ones", () =>
2322
+ Effect.gen(function* () {
2323
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2324
+ const config = yield* ServerConfig.ServerConfig;
2325
+ const fs = yield* FileSystem.FileSystem;
2326
+ const cursorId = ProviderInstanceId.make("cursor_work");
2327
+ yield* fs.writeFileString(
2328
+ config.settingsPath,
2329
+ JSON.stringify({
2330
+ providerInstances: {
2331
+ [cursorId]: { driver: cursor, enabled: true },
2332
+ // A default instance id is no proof of its driver.
2333
+ codex: { driver: cursor, enabled: true },
2334
+ },
2335
+ textGenerationModelSelection: { instanceId: cursorId, model: "auto" },
2336
+ }),
2337
+ );
2338
2320
- const settings = yield* service.getSettings;
2321
- // Never deleted: the instance stays for its threads, and the registry shows it unavailable.
2322
- assert.equal(settings.providerInstances[cursorId]?.driver, cursor);
2323
- // Built-in text generation does not fall back onto a disallowed driver either.
2324
- assert.equal(settings.textGenerationModelSelection.instanceId, "claudeAgent");
2339
+ const settings = yield* service.getSettings;
2340
+ // Never deleted: the instance stays for its threads, and the registry shows it unavailable.
2341
+ assert.equal(settings.providerInstances[cursorId]?.driver, cursor);
2342
+ // Built-in text generation does not fall back onto a disallowed driver either.
2343
+ assert.equal(settings.textGenerationModelSelection.instanceId, "claudeAgent");
2344
2326
- const rejected = yield* service
2327
- .updateProviderInstance({
2328
- operation: "create",
2329
- instanceId: ProviderInstanceId.make("cursor_new"),
2330
- instance: { driver: cursor, enabled: true },
2331
- })
2332
- .pipe(Effect.flip);
2333
- assert.equal(rejected.operation, "use-disallowed-provider");
2334
- assert.equal(rejected.message, "Example Corp's policy does not allow the Cursor provider.");
2335
- // Switching it on for one project is enabling it too.
2336
- const perProject = yield* service
2337
- .updateSettings({
2338
- projectSettingsOverrides: {
2339
- [ProjectId.make("project-a")]: { providerInstances: { [cursorId]: { enabled: true } } },
2340
- },
2341
- })
2342
- .pipe(Effect.flip);
2343
- assert.equal(perProject.operation, "use-disallowed-provider");
2345
+ const rejected = yield* service
2346
+ .updateProviderInstance({
2347
+ operation: "create",
2348
+ instanceId: ProviderInstanceId.make("cursor_new"),
2349
+ instance: { driver: cursor, enabled: true },
2350
+ })
2351
+ .pipe(Effect.flip);
2352
+ assert.equal(rejected.operation, "use-disallowed-provider");
2353
+ assert.equal(rejected.message, "Example Corp's policy does not allow the Cursor provider.");
2354
+ // Switching it on for one project is enabling it too.
2355
+ const perProject = yield* service
2356
+ .updateSettings({
2357
+ projectSettingsOverrides: {
2358
+ [ProjectId.make("project-a")]: {
2359
+ providerInstances: { [cursorId]: { enabled: true } },
2360
+ },
2361
+ },
2362
+ })
2363
+ .pipe(Effect.flip);
2364
+ assert.equal(perProject.operation, "use-disallowed-provider");
2365
2345
- // The client echoes a default instance that was running before it was configured.
2346
- yield* service.updateProviderInstance({
2347
- operation: "upsert",
2348
- instanceId: ProviderInstanceId.make("cursor"),
2349
- instance: { driver: cursor, enabled: true },
2350
- });
2366
+ // The client echoes a default instance that was running before it was configured.
2367
+ yield* service.updateProviderInstance({
2368
+ operation: "upsert",
2369
+ instanceId: ProviderInstanceId.make("cursor"),
2370
+ instance: { driver: cursor, enabled: true },
2371
+ });
2372
2352
- // Turning it off, or removing it, is still the user's call.
2353
- yield* service.updateProviderInstance({
2354
- operation: "upsert",
2355
- instanceId: cursorId,
2356
- instance: { driver: cursor, enabled: false },
2357
- });
2358
- yield* service.updateProviderInstance({ operation: "remove", instanceId: cursorId });
2359
- assert.isUndefined((yield* service.getSettings).providerInstances[cursorId]);
2360
- }).pipe(Effect.provide(layerServerSettings(policy))),
2361
- );
2373
+ // Turning it off, or removing it, is still the user's call.
2374
+ yield* service.updateProviderInstance({
2375
+ operation: "upsert",
2376
+ instanceId: cursorId,
2377
+ instance: { driver: cursor, enabled: false },
2378
+ });
2379
+ yield* service.updateProviderInstance({ operation: "remove", instanceId: cursorId });
2380
+ assert.isUndefined((yield* service.getSettings).providerInstances[cursorId]);
2381
+ }).pipe(Effect.provide(layerServerSettings(policy))),
2382
+ );
2383
2363
- it.effect("keeps a locked Codex pin from being bypassed by managed setup", () =>
2364
- Effect.gen(function* () {
2365
- const service = yield* ServerSettingsModule.ServerSettingsService;
2366
- const config = yield* ServerConfig.ServerConfig;
2367
- const fs = yield* FileSystem.FileSystem;
2368
- const codexId = ProviderInstanceId.make("codex_chatgpt");
2369
- yield* fs.writeFileString(
2370
- config.settingsPath,
2371
- JSON.stringify({
2372
- providerInstances: { [codexId]: { driver: codex, config: { setupMode: "managed" } } },
2373
- }),
2374
- );
2384
+ it.effect("keeps a locked Codex pin from being bypassed by managed setup", () =>
2385
+ Effect.gen(function* () {
2386
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2387
+ const config = yield* ServerConfig.ServerConfig;
2388
+ const fs = yield* FileSystem.FileSystem;
2389
+ const codexId = ProviderInstanceId.make("codex_chatgpt");
2390
+ yield* fs.writeFileString(
2391
+ config.settingsPath,
2392
+ JSON.stringify({
2393
+ providerInstances: { [codexId]: { driver: codex, config: { setupMode: "managed" } } },
2394
+ }),
2395
+ );
2396
2376
- const effective = (yield* service.getSettings).providerInstances[codexId];
2377
- assert.deepEqual(effective?.config, { binaryPath: "/opt/gateway/codex" });
2378
- // A stored value stays for when the policy is gone; a new one is refused.
2379
- const refused = yield* service
2380
- .updateProviderInstance({
2397
+ const effective = (yield* service.getSettings).providerInstances[codexId];
2398
+ assert.deepEqual(effective?.config, { binaryPath: "/opt/gateway/codex" });
2399
+ // A stored value stays for when the policy is gone; a new one is refused.
2400
+ const refused = yield* service
2401
+ .updateProviderInstance({
2402
+ operation: "upsert",
2403
+ instanceId: ProviderInstanceId.make("codex_new"),
2404
+ instance: { driver: codex, config: { setupMode: "managed" } },
2405
+ })
2406
+ .pipe(Effect.flip);
2407
+ assert.equal(refused.managedSetting, "providerInstances.codex_new.config.setupMode");
2408
+ // Adding a Codex instance sends the default setup, which leaves the pin in charge.
2409
+ yield* service.updateProviderInstance({
2410
operation: "upsert",
2382
- instanceId: ProviderInstanceId.make("codex_new"),
2383
- instance: { driver: codex, config: { setupMode: "managed" } },
2384
- })
2385
- .pipe(Effect.flip);
2386
- assert.equal(refused.managedSetting, "providerInstances.codex_new.config.setupMode");
2387
- // Adding a Codex instance sends the default setup, which leaves the pin in charge.
2388
- yield* service.updateProviderInstance({
2389
- operation: "upsert",
2390
- instanceId: ProviderInstanceId.make("codex_cli"),
2391
- instance: { driver: codex, config: { setupMode: "existing" } },
2392
- });
2393
- }).pipe(
2394
- Effect.provide(
2395
- layerServerSettings({
2396
- schemaVersion: 1,
2397
- organization: "Example Corp",
2398
- limits: {
2399
- providers: {
2400
- instances: { [codex]: { locked: true, binaryPath: "/opt/gateway/codex" } },
2411
+ instanceId: ProviderInstanceId.make("codex_cli"),
2412
+ instance: { driver: codex, config: { setupMode: "existing" } },
2413
+ });
2414
+ }).pipe(
2415
+ Effect.provide(
2416
+ layerServerSettings({
2417
+ schemaVersion: 1,
2418
+ organization: "Example Corp",
2419
+ limits: {
2420
+ providers: {
2421
+ instances: { [codex]: { locked: true, binaryPath: "/opt/gateway/codex" } },
2422
+ },
2423
},
2402
- },
2403
- }),
2424
+ }),
2425
+ ),
2426
),
2405
- ),
2406
- );
2427
+ );
2428
2408
- it.effect("pins instance fields at read time and refuses edits to locked ones", () =>
2409
- Effect.gen(function* () {
2410
- const service = yield* ServerSettingsModule.ServerSettingsService;
2411
- const config = yield* ServerConfig.ServerConfig;
2412
- const fs = yield* FileSystem.FileSystem;
2413
- const claudeId = ProviderInstanceId.make("claudeAgent");
2414
- const codexId = ProviderInstanceId.make("codex");
2415
- const userVariable = { name: "MY_FLAG", value: "on", sensitive: false };
2416
- yield* fs.writeFileString(
2417
- config.settingsPath,
2418
- JSON.stringify({
2419
- providerInstances: {
2420
- [claudeId]: {
2421
- driver: claude,
2422
- environment: [{ ...bedrock, value: "0" }, userVariable, { ...bedrock, value: "2" }],
2423
- config: { binaryPath: "/usr/local/bin/claude" },
2429
+ it.effect("pins instance fields at read time and refuses edits to locked ones", () =>
2430
+ Effect.gen(function* () {
2431
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2432
+ const config = yield* ServerConfig.ServerConfig;
2433
+ const fs = yield* FileSystem.FileSystem;
2434
+ const claudeId = ProviderInstanceId.make("claudeAgent");
2435
+ const codexId = ProviderInstanceId.make("codex");
2436
+ const userVariable = { name: "MY_FLAG", value: "on", sensitive: false };
2437
+ yield* fs.writeFileString(
2438
+ config.settingsPath,
2439
+ JSON.stringify({
2440
+ providerInstances: {
2441
+ [claudeId]: {
2442
+ driver: claude,
2443
+ environment: [{ ...bedrock, value: "0" }, userVariable, { ...bedrock, value: "2" }],
2444
+ config: { binaryPath: "/usr/local/bin/claude" },
2445
+ },
2446
},
2425
- },
2426
- }),
2427
- );
2447
+ }),
2448
+ );
2449
2429
- const effective = yield* service.getSettings;
2430
- const claudeInstance = effective.providerInstances[claudeId];
2431
- assert.deepEqual(claudeInstance?.environment, [bedrock, userVariable]);
2432
- assert.deepEqual(claudeInstance?.config, { binaryPath: "/opt/claude/bin/claude" });
2433
- // The implicit default Codex instance gets the unlocked default too.
2434
- assert.deepEqual(effective.providerInstances[codexId]?.config, {
2435
- launchArgs: "-c model_provider=gateway",
2436
- });
2450
+ const effective = yield* service.getSettings;
2451
+ const claudeInstance = effective.providerInstances[claudeId];
2452
+ assert.deepEqual(claudeInstance?.environment, [bedrock, userVariable]);
2453
+ assert.deepEqual(claudeInstance?.config, { binaryPath: "/opt/claude/bin/claude" });
2454
+ // The implicit default Codex instance gets the unlocked default too.
2455
+ assert.deepEqual(effective.providerInstances[codexId]?.config, {
2456
+ launchArgs: "-c model_provider=gateway",
2457
+ });
2458
2438
- const lockedBinary = yield* service
2439
- .updateProviderInstance({
2459
+ const lockedBinary = yield* service
2460
+ .updateProviderInstance({
2461
+ operation: "upsert",
2462
+ instanceId: claudeId,
2463
+ instance: { ...claudeInstance!, config: { binaryPath: "/tmp/claude" } },
2464
+ })
2465
+ .pipe(Effect.flip);
2466
+ assert.equal(lockedBinary.operation, "write-managed-setting");
2467
+ assert.equal(
2468
+ lockedBinary.managedSetting,
2469
+ "providerInstances.claudeAgent.config.binaryPath",
2470
+ );
2471
+ const lockedVariable = yield* service
2472
+ .updateProviderInstance({
2473
+ operation: "upsert",
2474
+ instanceId: claudeId,
2475
+ instance: { ...claudeInstance!, environment: [userVariable] },
2476
+ })
2477
+ .pipe(Effect.flip);
2478
+ assert.equal(
2479
+ lockedVariable.managedSetting,
2480
+ "providerInstances.claudeAgent.environment.CLAUDE_CODE_USE_BEDROCK",
2481
+ );
2482
+
2483
+ // Saving what the client was shown, plus an unrelated edit, goes through without baking
2484
+ // the policy into the file: the user's own values come back once the policy is removed.
2485
+ yield* service.updateProviderInstance({
2486
operation: "upsert",
2487
instanceId: claudeId,
2442
- instance: { ...claudeInstance!, config: { binaryPath: "/tmp/claude" } },
2443
- })
2444
- .pipe(Effect.flip);
2445
- assert.equal(lockedBinary.operation, "write-managed-setting");
2446
- assert.equal(lockedBinary.managedSetting, "providerInstances.claudeAgent.config.binaryPath");
2447
- const lockedVariable = yield* service
2448
- .updateProviderInstance({
2488
+ instance: { ...claudeInstance!, displayName: "Claude (work)" },
2489
+ });
2490
+ yield* service.updateProviderInstance({
2491
operation: "upsert",
2450
- instanceId: claudeId,
2451
- instance: { ...claudeInstance!, environment: [userVariable] },
2452
- })
2453
- .pipe(Effect.flip);
2454
- assert.equal(
2455
- lockedVariable.managedSetting,
2456
- "providerInstances.claudeAgent.environment.CLAUDE_CODE_USE_BEDROCK",
2457
- );
2458
-
2459
- // Saving what the client was shown, plus an unrelated edit, goes through without baking
2460
- // the policy into the file: the user's own values come back once the policy is removed.
2461
- yield* service.updateProviderInstance({
2462
- operation: "upsert",
2463
- instanceId: claudeId,
2464
- instance: { ...claudeInstance!, displayName: "Claude (work)" },
2465
- });
2466
- yield* service.updateProviderInstance({
2467
- operation: "upsert",
2468
- instanceId: codexId,
2469
- instance: effective.providerInstances[codexId]!,
2470
- });
2471
- const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2472
- assert.deepEqual(stored.providerInstances[claudeId], {
2473
- driver: claude,
2474
- displayName: "Claude (work)",
2475
- environment: [{ ...bedrock, value: "0" }, { ...bedrock, value: "2" }, userVariable],
2476
- config: { binaryPath: "/usr/local/bin/claude" },
2477
- });
2478
- assert.isUndefined(stored.providerInstances[codexId]);
2479
-
2480
- // Unlocked fields are the user's to override.
2481
- yield* service.updateProviderInstance({
2482
- operation: "upsert",
2483
- instanceId: codexId,
2484
- instance: { driver: codex, config: { launchArgs: "--mine" } },
2485
- });
2486
- assert.deepEqual((yield* service.getSettings).providerInstances[codexId]?.config, {
2487
- launchArgs: "--mine",
2488
- });
2489
- }).pipe(Effect.provide(layerServerSettings(policy))),
2490
- );
2491
-});
2492
+ instanceId: codexId,
2493
+ instance: effective.providerInstances[codexId]!,
2494
+ });
2495
+ const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2496
+ assert.deepEqual(stored.providerInstances[claudeId], {
2497
+ driver: claude,
2498
+ displayName: "Claude (work)",
2499
+ environment: [{ ...bedrock, value: "0" }, { ...bedrock, value: "2" }, userVariable],
2500
+ config: { binaryPath: "/usr/local/bin/claude" },
2501
+ });
2502
+ assert.isUndefined(stored.providerInstances[codexId]);
2503
2493
-it.layer(NodeServices.layer)("server settings under a runtime mode ceiling", (it) => {
2494
- const claude = ProviderDriverKind.make("claudeAgent");
2495
- const acpRegistry = ProviderDriverKind.make("acpRegistry");
2496
- const policy: ManagedPolicyDocument = {
2497
- schemaVersion: 1,
2498
- organization: "Example Corp",
2499
- limits: {
2500
- maxRuntimeMode: "auto-accept-edits",
2501
- providers: {
2502
- instances: {
2503
- [claude]: {
2504
- locked: false,
2505
- environment: [{ name: "CLAUDE_CODE_USE_BEDROCK", value: "1" }],
2506
- binaryPath: "/opt/claude/bin/claude",
2504
+ // Unlocked fields are the user's to override.
2505
+ yield* service.updateProviderInstance({
2506
+ operation: "upsert",
2507
+ instanceId: codexId,
2508
+ instance: { driver: codex, config: { launchArgs: "--mine" } },
2509
+ });
2510
+ assert.deepEqual((yield* service.getSettings).providerInstances[codexId]?.config, {
2511
+ launchArgs: "--mine",
2512
+ });
2513
+ }).pipe(Effect.provide(layerServerSettings(policy))),
2514
+ );
2515
+ },
2516
+);
2517
+
2518
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))(
2519
+ "server settings under a runtime mode ceiling",
2520
+ (it) => {
2521
+ const claude = ProviderDriverKind.make("claudeAgent");
2522
+ const acpRegistry = ProviderDriverKind.make("acpRegistry");
2523
+ const policy: ManagedPolicyDocument = {
2524
+ schemaVersion: 1,
2525
+ organization: "Example Corp",
2526
+ limits: {
2527
+ maxRuntimeMode: "auto-accept-edits",
2528
+ providers: {
2529
+ instances: {
2530
+ [claude]: {
2531
+ locked: false,
2532
+ environment: [{ name: "CLAUDE_CODE_USE_BEDROCK", value: "1" }],
2533
+ binaryPath: "/opt/claude/bin/claude",
2534
+ },
2535
},
2536
},
2537
},
2510
- },
2511
- };
2538
+ };
2539
2513
- it.effect("keeps the secret of a variable it hides when the instance is saved", () => {
2514
- const shared = ServerSecretStore.layer.pipe(
2515
- Layer.provideMerge(Layer.fresh(SqlitePersistence.layerMemory)),
2516
- Layer.provideMerge(
2517
- Layer.fresh(ServerConfig.layerTest(process.cwd(), { prefix: "t3code-hidden-secret-" })),
2518
- ),
2519
- );
2520
- const withPolicy = <A, E>(
2521
- document: ManagedPolicyDocument | undefined,
2522
- use: (service: ServerSettingsModule.ServerSettingsService["Service"]) => Effect.Effect<A, E>,
2523
- ) =>
2524
- ServerSettingsModule.ServerSettingsService.pipe(
2525
- Effect.flatMap(use),
2526
- Effect.provide(
2527
- ServerSettingsModule.layer.pipe(Layer.provide(ManagedPolicy.layerTest(document))),
2540
+ it.effect("keeps the secret of a variable it hides when the instance is saved", () => {
2541
+ const shared = ServerSecretStore.layer.pipe(
2542
+ Layer.provideMerge(Layer.fresh(SqlitePersistence.layerMemory)),
2543
+ Layer.provideMerge(
2544
+ Layer.fresh(ServerConfig.layerTest(process.cwd(), { prefix: "t3code-hidden-secret-" })),
2545
),
2546
);
2530
- const claudeId = ProviderInstanceId.make("claudeAgent");
2531
- const token = { name: "ANTHROPIC_API_KEY", value: "sk-kept", sensitive: true };
2532
- return Effect.gen(function* () {
2533
- yield* withPolicy(undefined, (service) =>
2534
- service.updateProviderInstance({
2535
- operation: "upsert",
2536
- instanceId: claudeId,
2537
- instance: { driver: claude, environment: [token] },
2538
- }),
2539
- );
2540
- // The ceiling shows only pinned variables, so the client saves without the token.
2541
- yield* withPolicy(policy, (service) =>
2542
- service.getSettings.pipe(
2543
- Effect.flatMap((settings) =>
2544
- service.updateProviderInstance({
2545
- operation: "upsert",
2546
- instanceId: claudeId,
2547
- instance: { ...settings.providerInstances[claudeId]!, displayName: "Claude (work)" },
2548
- }),
2547
+ const withPolicy = <A, E>(
2548
+ document: ManagedPolicyDocument | undefined,
2549
+ use: (
2550
+ service: ServerSettingsModule.ServerSettingsService["Service"],
2551
+ ) => Effect.Effect<A, E>,
2552
+ ) =>
2553
+ ServerSettingsModule.ServerSettingsService.pipe(
2554
+ Effect.flatMap(use),
2555
+ Effect.provide(
2556
+ ServerSettingsModule.layer.pipe(Layer.provide(ManagedPolicy.layerTest(document))),
2557
),
2550
- ),
2551
- );
2552
- const restored = yield* withPolicy(undefined, (service) => service.getSettings);
2553
- assert.equal(restored.providerInstances[claudeId]?.environment?.[0]?.value, token.value);
2554
- }).pipe(Effect.provide(shared));
2555
- });
2556
-
2557
- it.effect("ignores stored launch configuration and refuses new values", () =>
2558
- Effect.gen(function* () {
2559
- const service = yield* ServerSettingsModule.ServerSettingsService;
2560
- const config = yield* ServerConfig.ServerConfig;
2561
- const fs = yield* FileSystem.FileSystem;
2558
+ );
2559
const claudeId = ProviderInstanceId.make("claudeAgent");
2563
- const registryId = ProviderInstanceId.make("acp_devin");
2564
- const userVariable = { name: "CLAUDE_CONFIG_DIR", value: "/tmp/allow-all", sensitive: false };
2565
- const storedClaude = {
2566
- driver: claude,
2567
- environment: [userVariable, { ...userVariable, value: "/tmp/later-wins" }],
2568
- config: {
2569
- binaryPath: "/tmp/wrapper",
2570
- launchArgs: "--dangerously-skip-permissions",
2571
- homePath: "/tmp/allow-all",
2560
+ const token = { name: "ANTHROPIC_API_KEY", value: "sk-kept", sensitive: true };
2561
+ return Effect.gen(function* () {
2562
+ yield* withPolicy(undefined, (service) =>
2563
+ service.updateProviderInstance({
2564
+ operation: "upsert",
2565
+ instanceId: claudeId,
2566
+ instance: { driver: claude, environment: [token] },
2567
+ }),
2568
+ );
2569
+ // The ceiling shows only pinned variables, so the client saves without the token.
2570
+ yield* withPolicy(policy, (service) =>
2571
+ service.getSettings.pipe(
2572
+ Effect.flatMap((settings) =>
2573
+ service.updateProviderInstance({
2574
+ operation: "upsert",
2575
+ instanceId: claudeId,
2576
+ instance: {
2577
+ ...settings.providerInstances[claudeId]!,
2578
+ displayName: "Claude (work)",
2579
+ },
2580
+ }),
2581
+ ),
2582
+ ),
2583
+ );
2584
+ const restored = yield* withPolicy(undefined, (service) => service.getSettings);
2585
+ assert.equal(restored.providerInstances[claudeId]?.environment?.[0]?.value, token.value);
2586
+ }).pipe(Effect.provide(shared));
2587
+ });
2588
+
2589
+ it.effect("ignores stored launch configuration and refuses new values", () =>
2590
+ Effect.gen(function* () {
2591
+ const service = yield* ServerSettingsModule.ServerSettingsService;
2592
+ const config = yield* ServerConfig.ServerConfig;
2593
+ const fs = yield* FileSystem.FileSystem;
2594
+ const claudeId = ProviderInstanceId.make("claudeAgent");
2595
+ const registryId = ProviderInstanceId.make("acp_devin");
2596
+ const userVariable = {
2597
+ name: "CLAUDE_CONFIG_DIR",
2598
+ value: "/tmp/allow-all",
2599
+ sensitive: false,
2600
+ };
2601
+ const storedClaude = {
2602
+ driver: claude,
2603
+ environment: [userVariable, { ...userVariable, value: "/tmp/later-wins" }],
2604
+ config: {
2605
+ binaryPath: "/tmp/wrapper",
2606
+ launchArgs: "--dangerously-skip-permissions",
2607
+ homePath: "/tmp/allow-all",
2608
+ autoCompactWindow: "300000",
2609
+ },
2610
+ };
2611
+ yield* fs.writeFileString(
2612
+ config.settingsPath,
2613
+ JSON.stringify({
2614
+ providerInstances: {
2615
+ [claudeId]: storedClaude,
2616
+ [registryId]: {
2617
+ driver: acpRegistry,
2618
+ config: { agentId: "devin", commandPath: "/tmp/agent", commandArgs: ["--yolo"] },
2619
+ },
2620
+ },
2621
+ }),
2622
+ );
2623
+
2624
+ // Even an unlocked pin wins, and the user's launch values and variables are not used.
2625
+ const effective = yield* service.getSettings;
2626
+ const claudeInstance = effective.providerInstances[claudeId]!;
2627
+ assert.deepEqual(claudeInstance.config, {
2628
+ binaryPath: "/opt/claude/bin/claude",
2629
autoCompactWindow: "300000",
2573
- },
2574
- };
2575
- yield* fs.writeFileString(
2576
- config.settingsPath,
2577
- JSON.stringify({
2578
- providerInstances: {
2579
- [claudeId]: storedClaude,
2580
- [registryId]: {
2630
+ });
2631
+ assert.deepEqual(claudeInstance.environment, [
2632
+ { name: "CLAUDE_CODE_USE_BEDROCK", value: "1", sensitive: false },
2633
+ ]);
2634
+ assert.deepEqual(effective.providerInstances[registryId]?.config, { agentId: "devin" });
2635
+
2636
+ const refused = (instance: typeof claudeInstance) =>
2637
+ service
2638
+ .updateProviderInstance({ operation: "upsert", instanceId: claudeId, instance })
2639
+ .pipe(Effect.flip);
2640
+ const launchArgs = yield* refused({
2641
+ ...claudeInstance,
2642
+ config: { ...claudeInstance.config!, launchArgs: "--permission-mode bypassPermissions" },
2643
+ });
2644
+ assert.equal(launchArgs.operation, "write-managed-setting");
2645
+ assert.equal(launchArgs.managedSetting, "providerInstances.claudeAgent.config.launchArgs");
2646
+ const binary = yield* refused({
2647
+ ...claudeInstance,
2648
+ config: { ...claudeInstance.config!, binaryPath: "/tmp/other-wrapper" },
2649
+ });
2650
+ assert.equal(binary.managedSetting, "providerInstances.claudeAgent.config.binaryPath");
2651
+ const environment = yield* refused({
2652
+ ...claudeInstance,
2653
+ environment: [{ name: "NODE_OPTIONS", value: "--require /tmp/x.js", sensitive: false }],
2654
+ });
2655
+ assert.equal(environment.managedSetting, "providerInstances.claudeAgent.environment");
2656
+ const commandArgs = yield* service
2657
+ .updateProviderInstance({
2658
+ operation: "upsert",
2659
+ instanceId: registryId,
2660
+ instance: {
2661
driver: acpRegistry,
2582
- config: { agentId: "devin", commandPath: "/tmp/agent", commandArgs: ["--yolo"] },
2662
+ config: { agentId: "devin", commandArgs: ["--dangerously-skip-permissions"] },
2663
},
2584
- },
2585
- }),
2586
- );
2664
+ })
2665
+ .pipe(Effect.flip);
2666
+ assert.equal(commandArgs.managedSetting, "providerInstances.acp_devin.config.commandArgs");
2667
2588
- // Even an unlocked pin wins, and the user's launch values and variables are not used.
2589
- const effective = yield* service.getSettings;
2590
- const claudeInstance = effective.providerInstances[claudeId]!;
2591
- assert.deepEqual(claudeInstance.config, {
2592
- binaryPath: "/opt/claude/bin/claude",
2593
- autoCompactWindow: "300000",
2594
- });
2595
- assert.deepEqual(claudeInstance.environment, [
2596
- { name: "CLAUDE_CODE_USE_BEDROCK", value: "1", sensitive: false },
2597
- ]);
2598
- assert.deepEqual(effective.providerInstances[registryId]?.config, { agentId: "devin" });
2668
+ // Unrelated writes carry the stored instance through unchanged, duplicates included.
2669
+ yield* service.updateSettings({ defaultAutoPull: true });
2670
2600
- const refused = (instance: typeof claudeInstance) =>
2601
- service
2602
- .updateProviderInstance({ operation: "upsert", instanceId: claudeId, instance })
2603
- .pipe(Effect.flip);
2604
- const launchArgs = yield* refused({
2605
- ...claudeInstance,
2606
- config: { ...claudeInstance.config!, launchArgs: "--permission-mode bypassPermissions" },
2607
- });
2608
- assert.equal(launchArgs.operation, "write-managed-setting");
2609
- assert.equal(launchArgs.managedSetting, "providerInstances.claudeAgent.config.launchArgs");
2610
- const binary = yield* refused({
2611
- ...claudeInstance,
2612
- config: { ...claudeInstance.config!, binaryPath: "/tmp/other-wrapper" },
2613
- });
2614
- assert.equal(binary.managedSetting, "providerInstances.claudeAgent.config.binaryPath");
2615
- const environment = yield* refused({
2616
- ...claudeInstance,
2617
- environment: [{ name: "NODE_OPTIONS", value: "--require /tmp/x.js", sensitive: false }],
2618
- });
2619
- assert.equal(environment.managedSetting, "providerInstances.claudeAgent.environment");
2620
- const commandArgs = yield* service
2621
- .updateProviderInstance({
2671
+ // What the client was shown saves, with user-owned edits, and the stored values survive.
2672
+ yield* service.updateProviderInstance({
2673
operation: "upsert",
2623
- instanceId: registryId,
2674
+ instanceId: claudeId,
2675
instance: {
2625
- driver: acpRegistry,
2626
- config: { agentId: "devin", commandArgs: ["--dangerously-skip-permissions"] },
2676
+ ...claudeInstance,
2677
+ displayName: "Claude (work)",
2678
+ config: { ...claudeInstance.config!, autoCompactWindow: "400000" },
2679
},
2628
- })
2629
- .pipe(Effect.flip);
2630
- assert.equal(commandArgs.managedSetting, "providerInstances.acp_devin.config.commandArgs");
2631
-
2632
- // Unrelated writes carry the stored instance through unchanged, duplicates included.
2633
- yield* service.updateSettings({ defaultAutoPull: true });
2634
-
2635
- // What the client was shown saves, with user-owned edits, and the stored values survive.
2636
- yield* service.updateProviderInstance({
2637
- operation: "upsert",
2638
- instanceId: claudeId,
2639
- instance: {
2640
- ...claudeInstance,
2680
+ });
2681
+ const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2682
+ assert.deepEqual(stored.providerInstances[claudeId], {
2683
+ ...storedClaude,
2684
displayName: "Claude (work)",
2642
- config: { ...claudeInstance.config!, autoCompactWindow: "400000" },
2643
- },
2644
- });
2645
- const stored = JSON.parse(yield* fs.readFileString(config.settingsPath));
2646
- assert.deepEqual(stored.providerInstances[claudeId], {
2647
- ...storedClaude,
2648
- displayName: "Claude (work)",
2649
- config: { ...storedClaude.config, autoCompactWindow: "400000" },
2650
- });
2651
- }).pipe(Effect.provide(layerServerSettings(policy))),
2652
- );
2653
-});
2685
+ config: { ...storedClaude.config, autoCompactWindow: "400000" },
2686
+ });
2687
+ }).pipe(Effect.provide(layerServerSettings(policy))),
2688
+ );
2689
+ },
2690
+);
apps/server/src/sourceControl/SourceControlRepositoryService.test.ts
+9
-8
@@ -1,5 +1,6 @@
1
import { SourceControlProviderKind } from "@t3tools/contracts";
2
import * as NodePath from "@effect/platform-node/NodePath";
3
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
4
import * as NodeServices from "@effect/platform-node/NodeServices";
5
import { assert, it } from "@effect/vitest";
6
import * as Effect from "effect/Effect";
@@ -98,7 +99,7 @@ function layer(input: {
99
Layer.provide(Layer.succeed(FileSystem.FileSystem, input.fileSystem)),
100
Layer.provideMerge(NodePath.layer),
101
)
101
- : layerService.pipe(Layer.provideMerge(NodeServices.layer));
102
+ : layerService.pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
103
}
104
105
const lookupFailingWith = (cause: unknown, detail: string) =>
@@ -191,7 +192,7 @@ it.effect("clones a looked-up repository after creating missing parent directori
192
}),
193
),
194
);
194
- }).pipe(Effect.provide(NodeServices.layer)),
195
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
196
);
197
198
it.effect.each(["--bare", "source.git"])(
@@ -225,7 +226,7 @@ it.effect.each(["--bare", "source.git"])(
226
prefix: "t3-clone-options-config-",
227
}),
228
),
228
- Layer.provideMerge(NodeServices.layer),
229
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
230
),
231
),
232
),
@@ -288,7 +289,7 @@ it.effect("reports clone progress from git's stderr and keeps its error text on
289
error.detail,
290
"fatal: early EOF fatal: unable to access 'https://github.com/octocat/t3code.git/': could not resolve host",
291
);
291
- }).pipe(Effect.provide(NodeServices.layer)),
292
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
293
);
294
295
function rejectingSsh(
@@ -337,7 +338,7 @@ const cloneInTemporaryDirectory = (
338
destinationPath: path.join(parent, "t3code"),
339
});
340
}).pipe(Effect.provide(layer({ git }).pipe(Layer.orDie)));
340
- }).pipe(Effect.provide(NodeServices.layer));
341
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
342
343
it.effect("retries a clone over HTTPS when the SSH login is refused", () =>
344
Effect.gen(function* () {
@@ -486,7 +487,7 @@ it.effect("strips embedded credentials from the remote URL it reports", () =>
487
);
488
assert.equal(result.remoteUrl, "https://github.com/octocat/t3code.git");
489
assert.equal(result.cloneUrl, "https://user:s3cret@github.com/octocat/t3code.git");
489
- }).pipe(Effect.provide(NodeServices.layer)),
490
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
491
);
492
493
it.effect("discards only a directory git wrote to", () =>
@@ -517,7 +518,7 @@ it.effect("discards only a directory git wrote to", () =>
518
assert.deepStrictEqual(yield* fs.readDirectory(partial), []);
519
assert.deepStrictEqual(yield* fs.readDirectory(foreign), ["notes.txt"]);
520
assert.strictEqual(yield* fs.readFileString(replaced), "not a directory");
520
- }).pipe(Effect.provide(NodeServices.layer)),
521
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
522
);
523
524
it.effect("redacts query tokens and userinfo containing '@' from reported URLs", () =>
@@ -538,7 +539,7 @@ it.effect("redacts query tokens and userinfo containing '@' from reported URLs",
539
});
540
assert.equal(nested.remoteUrl, "https://github.com/octocat/t3code.git");
541
}).pipe(Effect.provide(layer({})));
541
- }).pipe(Effect.provide(NodeServices.layer)),
542
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
543
);
544
545
it.effect("preserves destination probe failures instead of treating them as missing paths", () => {
apps/server/src/storageCleanup.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import * as Effect from "effect/Effect";
4
import * as Context from "effect/Context";
@@ -580,7 +581,7 @@ const pausedMeasurementFixture = (storageCleanup?: StorageCleanupSettings) =>
581
});
582
const cleanupTestLayer = GitVcsDriver.layer.pipe(
583
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "storage-cleanup-" })),
583
- Layer.provideMerge(NodeServices.layer),
584
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
585
);
586
const runCleanupTest = <A, E>(
587
effect: Effect.Effect<
apps/server/src/telemetry/AnalyticsService.test.ts
+2
-1
@@ -1,4 +1,5 @@
1
import * as NodeHttpServer from "@effect/platform-node/NodeHttpServer";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import { assert, it } from "@effect/vitest";
5
import * as Clock from "effect/Clock";
@@ -169,7 +170,7 @@ const sendFor = (
170
return batches;
171
});
172
172
-it.layer(NodeServices.layer)("AnalyticsService test", (it) => {
173
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("AnalyticsService test", (it) => {
174
it.effect("waits for desktop shell consent and honors a late telemetry opt-out", () =>
175
Effect.gen(function* () {
176
const env: NodeJS.ProcessEnv = { T3CODE_DESKTOP_SHELL_DISCOVERY_PENDING: "1" };
apps/server/src/telemetry/AnalyticsService.ts
+3
-3
@@ -5,7 +5,7 @@ import * as Clock from "effect/Clock";
5
import * as Config from "effect/Config";
6
import * as ConfigProvider from "effect/ConfigProvider";
7
import * as Context from "effect/Context";
8
-import * as Crypto from "effect/Crypto";
8
+import * as SecureRandom from "effect/crypto/SecureRandom";
9
import * as DateTime from "effect/DateTime";
10
import * as Effect from "effect/Effect";
11
import * as Exit from "effect/Exit";
@@ -144,7 +144,7 @@ export const make = Effect.gen(function* () {
144
const httpClient = yield* HttpClient.HttpClient;
145
const serverConfig = yield* ServerConfig.ServerConfig;
146
const { distinctId, installId } = yield* getTelemetryIdentity;
147
- const crypto = yield* Crypto.Crypto;
147
+ const crypto = yield* SecureRandom.SecureRandom;
148
const bufferRef = yield* Ref.make<ReadonlyArray<BufferedAnalyticsEvent>>([]);
149
const deliveryRef = yield* Ref.make<DeliveryState>({
150
failedBatch: [],
@@ -312,7 +312,7 @@ export const make = Effect.gen(function* () {
312
if (!(yield* telemetryEnabled) || !distinctId) return;
313
314
// Catch Node UUID defects too; best-effort telemetry drops events without UUIDs.
315
- const uuid = yield* Effect.exit(crypto.randomUUIDv7());
315
+ const uuid = yield* Effect.exit(crypto.uuidV7());
316
if (Exit.isFailure(uuid)) return;
317
318
const enqueueResult = yield* enqueueBufferedEvent(uuid.value, event, properties);
apps/server/src/telemetry/Identify.test.ts
+5
-4
@@ -1,6 +1,7 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
3
-import * as Crypto from "effect/Crypto";
4
+import * as Digest from "effect/crypto/Digest";
5
import * as Effect from "effect/Effect";
6
import * as Hex from "effect/encoding/Hex";
7
import * as FileSystem from "effect/FileSystem";
@@ -21,9 +22,9 @@ interface CapturedLog {
22
}
23
24
const sha256 = Effect.fn("test.sha256")(function* (value: string) {
24
- const crypto = yield* Crypto.Crypto;
25
+ const digest = yield* Digest.Digest;
26
return Hex.encode(
26
- yield* crypto.digest("SHA-256", new TextEncoder().encode(value)).pipe(Effect.orDie),
27
+ yield* digest.digest(Digest.sha256, new TextEncoder().encode(value)).pipe(Effect.orDie),
28
);
29
});
30
@@ -69,7 +70,7 @@ const writeHomeFile = Effect.fn("test.writeHomeFile")(function* (
70
return filePath;
71
});
72
72
-it.layer(NodeServices.layer)("telemetry identity", (it) => {
73
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("telemetry identity", (it) => {
74
it.effect("keeps the old distinct_id rule and a fixed install id as logins change", () =>
75
Effect.gen(function* () {
76
const config = yield* ServerConfig.ServerConfig;
apps/server/src/telemetry/Identify.ts
+3
-3
@@ -1,4 +1,4 @@
1
-import * as Crypto from "effect/Crypto";
1
+import * as SecureRandom from "effect/crypto/SecureRandom";
2
import * as Effect from "effect/Effect";
3
import * as Base64Url from "effect/encoding/Base64Url";
4
import * as FileSystem from "effect/FileSystem";
@@ -225,8 +225,8 @@ const upsertAnonymousId = Effect.gen(function* () {
225
return existing.value;
226
}
227
228
- const anonymousId = yield* Crypto.Crypto.pipe(
229
- Effect.flatMap((crypto) => crypto.randomUUIDv4()),
228
+ const anonymousId = yield* SecureRandom.SecureRandom.pipe(
229
+ Effect.flatMap((crypto) => crypto.uuidV4()),
230
Effect.mapError(
231
(cause) =>
232
new TelemetryAnonymousIdGenerationError({
apps/server/src/terminal/Manager.test.ts
+6
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import {
@@ -406,7 +407,11 @@ it("bounds long partial lines and joins surrogate pairs across chunk boundaries"
407
});
408
409
it.layer(
409
- Layer.merge(NodeServices.layer, ProcessRunner.layer.pipe(Layer.provide(NodeServices.layer))),
410
+ Layer.mergeAll(
411
+ NodeServices.layer,
412
+ NodeCrypto.layer,
413
+ ProcessRunner.layer.pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
414
+ ),
415
{ excludeTestServices: true },
416
)("TerminalManager", (it) => {
417
it.effect("spawns lazily and reuses running terminal per thread", () =>
apps/server/src/textGeneration/GrokTextGeneration.test.ts
+2
-1
@@ -4,6 +4,7 @@ import * as NodeOS from "node:os";
4
import * as NodeURL from "node:url";
5
import * as NodeFS from "node:fs";
6
7
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
8
import * as NodeServices from "@effect/platform-node/NodeServices";
9
import { it } from "@effect/vitest";
10
import * as Effect from "effect/Effect";
@@ -25,7 +26,7 @@ const mockAgentPath = NodePath.join(__dirname, "../provider/testFixtures/grok-te
26
27
const layerGrokTextGenerationTest = ServerConfig.ServerConfig.layerTest(process.cwd(), {
28
prefix: "t3code-grok-text-generation-test-",
28
-}).pipe(Layer.provideMerge(NodeServices.layer));
29
+}).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
30
31
function makeAcpGrokWrapper(dir: string, env: Record<string, string>): string {
32
return writeFakeCli({
apps/server/src/triage/TriageService.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { GitCommandError } from "@t3tools/contracts";
4
import { assert, it } from "@effect/vitest";
@@ -39,7 +40,7 @@ it("falls back to main when the server's version has no tag", () => {
40
const TestLayer = GitVcsDriver.layer.pipe(
41
Layer.provideMerge(ServerConfig.layerTest(process.cwd(), { prefix: "t3-triage-service-" })),
42
Layer.provideMerge(VcsProcess.layer),
42
- Layer.provideMerge(NodeServices.layer),
43
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
44
);
45
46
const RELEASE_COMMIT = "7027b1f";
apps/server/src/usage/UsageService.test.ts
+2
-1
@@ -9,6 +9,7 @@ import * as NodeZlib from "node:zlib";
9
10
import { assert, describe, it } from "@effect/vitest";
11
import { vi } from "vite-plus/test";
12
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
13
import * as NodeServices from "@effect/platform-node/NodeServices";
14
import * as HostProcess from "@t3tools/shared/HostProcess";
15
import { mergeUsage } from "@t3tools/shared/usageMerge";
@@ -169,7 +170,7 @@ const layerService = (input: {
170
Layer.provideMerge(
171
ServerConfig.layerTest(process.cwd(), NodePath.join(input.home, input.prefix)),
172
),
172
- Layer.provideMerge(NodeServices.layer),
173
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
174
Layer.provideMerge(Layer.succeed(HostProcess.Platform, input.platform ?? "linux")),
175
Layer.provideMerge(Layer.succeed(HostProcess.Hostname, input.hostname ?? "usage-test-host")),
176
Layer.provideMerge(ServerSettings.layerTest(input.settings)),
apps/server/src/usage/cliproxyApi.ts
+5
-5
@@ -6,7 +6,7 @@ import {
6
type UsageLimitSourceConfig,
7
} from "@t3tools/contracts";
8
import * as Cause from "effect/Cause";
9
-import * as Crypto from "effect/Crypto";
9
+import * as Digest from "effect/crypto/Digest";
10
import * as DateTime from "effect/DateTime";
11
import * as Effect from "effect/Effect";
12
import * as Hex from "effect/encoding/Hex";
@@ -156,12 +156,12 @@ const creditRedeemRequestId = Effect.fn("CliproxyApi.creditRedeemRequestId")(fun
156
accountId: string,
157
creditId: string,
158
) {
159
- const crypto = yield* Crypto.Crypto;
159
+ const digest = yield* Digest.Digest;
160
const name = new TextEncoder().encode(`${accountId}:${creditId}`);
161
const input = new Uint8Array(CREDIT_REDEEM_NAMESPACE.length + name.length);
162
input.set(CREDIT_REDEEM_NAMESPACE);
163
input.set(name, CREDIT_REDEEM_NAMESPACE.length);
164
- const bytes = (yield* crypto.digest("SHA-1", input).pipe(Effect.orDie)).slice(0, 16);
164
+ const bytes = (yield* digest.digest(Digest.sha1, input).pipe(Effect.orDie)).slice(0, 16);
165
bytes[6] = (bytes[6]! & 0x0f) | 0x50;
166
bytes[8] = (bytes[8]! & 0x3f) | 0x80;
167
const hex = Hex.encode(bytes);
@@ -170,7 +170,7 @@ const creditRedeemRequestId = Effect.fn("CliproxyApi.creditRedeemRequestId")(fun
170
171
export const makeCliproxyApi = Effect.gen(function* () {
172
const client = yield* HttpClient.HttpClient;
173
- const crypto = yield* Crypto.Crypto;
173
+ const digest = yield* Digest.Digest;
174
175
const management = Effect.fn("CliproxyApi.management")(function* (
176
config: UsageLimitSourceConfig,
@@ -401,7 +401,7 @@ export const makeCliproxyApi = Effect.gen(function* () {
401
redeem_request_id: yield* creditRedeemRequestId(
402
account.id_token?.chatgpt_account_id ?? account.id,
403
creditId,
404
- ).pipe(Effect.provideService(Crypto.Crypto, crypto)),
404
+ ).pipe(Effect.provideService(Digest.Digest, digest)),
405
credit_id: creditId,
406
});
407
const response = yield* decodeConsumeResponse(body);
apps/server/src/vcs/GitVcsDriver.test.ts
+14
-10
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import * as Cause from "effect/Cause";
4
import * as Clock from "effect/Clock";
@@ -35,11 +36,11 @@ const layerServerConfig = ServerConfig.layerTest(process.cwd(), {
36
const layerGitContract = Layer.mergeAll(GitVcsDriver.layerVcs, GitVcsDriver.layer).pipe(
37
Layer.provide(layerServerConfig),
38
Layer.provideMerge(VcsProcess.layer),
38
- Layer.provideMerge(NodeServices.layer),
39
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
40
);
41
const layerGitCaptureContract = Layer.merge(
42
layerGitContract,
42
- ProcessRunner.layer.pipe(Layer.provide(NodeServices.layer)),
43
+ ProcessRunner.layer.pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
44
);
45
46
const runGit = (cwd: string, args: ReadonlyArray<string>) =>
@@ -1110,7 +1111,10 @@ const vcsProcessSpawning = (command: string) =>
1111
Effect.map(VcsProcess.make, (vcsProcess) =>
1112
VcsProcess.VcsProcess.of({ run: (input) => vcsProcess.run({ ...input, command }) }),
1113
),
1113
- ).pipe(Layer.provide(ProcessRunner.layer), Layer.provideMerge(NodeServices.layer));
1114
+ ).pipe(
1115
+ Layer.provide(ProcessRunner.layer),
1116
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1117
+ );
1118
1119
it.effect("GitVcsDriver treats a missing git executable as outside any repository", () =>
1120
Effect.gen(function* () {
@@ -1123,7 +1127,7 @@ it.effect("GitVcsDriver treats a missing git executable as outside any repositor
1127
1128
assert.strictEqual(yield* driver.isInsideWorkTree(cwd), false);
1129
assert.strictEqual(yield* driver.detectRepository(cwd), null);
1126
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
1130
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
1131
);
1132
1133
it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")(
@@ -1159,7 +1163,7 @@ it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")(
1163
assert.strictEqual(error._tag, "VcsProcessSpawnError");
1164
const detectionError = yield* driver.detectRepository(process.cwd()).pipe(Effect.flip);
1165
assert.strictEqual(detectionError._tag, "VcsProcessSpawnError");
1162
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
1166
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
1167
);
1168
1169
const gitCommandCount = (operation: string, outcome: string) =>
@@ -1212,7 +1216,7 @@ it.effect("GitVcsDriver meters each git command once under its operation", () =>
1216
assert.strictEqual(timing.count, 2);
1217
assert.strictEqual(timing.sum, 500);
1218
}).pipe(
1215
- Effect.provide(NodeServices.layer),
1219
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1220
Effect.provideService(Metric.MetricRegistry, new Map()),
1221
),
1222
);
@@ -1236,7 +1240,7 @@ it.effect("GitVcsDriver counts an allowed non-zero exit as a success", () =>
1240
assert.strictEqual(timing.count, 1);
1241
assert.strictEqual(timing.sum, 250);
1242
}).pipe(
1239
- Effect.provide(NodeServices.layer),
1243
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1244
Effect.provideService(Metric.MetricRegistry, new Map()),
1245
),
1246
);
@@ -1257,7 +1261,7 @@ it.effect("GitVcsDriver counts a failed git command as a failure", () =>
1261
assert.strictEqual(timing.count, 1);
1262
assert.strictEqual(timing.sum, 250);
1263
}).pipe(
1260
- Effect.provide(NodeServices.layer),
1264
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1265
Effect.provideService(Metric.MetricRegistry, new Map()),
1266
),
1267
);
@@ -1322,7 +1326,7 @@ it.effect("git metrics finalize cancellation without exposing arbitrary operatio
1326
assert.strictEqual(timing.count, 1);
1327
assert.strictEqual(timing.sum, 250);
1328
}).pipe(
1325
- Effect.provide(NodeServices.layer),
1329
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1330
Effect.provideService(Metric.MetricRegistry, new Map()),
1331
),
1332
);
@@ -1378,7 +1382,7 @@ it.effect("git metrics count fsync fallback and transient retry subprocesses sep
1382
assert.strictEqual(timing.count, 3);
1383
assert.strictEqual(timing.sum, 750);
1384
}).pipe(
1381
- Effect.provide(NodeServices.layer),
1385
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1386
Effect.provideService(Metric.MetricRegistry, new Map()),
1387
),
1388
);
apps/server/src/vcs/GitVcsDriver.ts
+3
-3
@@ -1,7 +1,7 @@
1
import * as NodeBuffer from "node:buffer";
2
3
import * as Context from "effect/Context";
4
-import * as Crypto from "effect/Crypto";
4
+import * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as DateTime from "effect/DateTime";
6
import * as Effect from "effect/Effect";
7
import * as FileSystem from "effect/FileSystem";
@@ -566,7 +566,7 @@ export const makeVcsDriverShape = Effect.fn("makeGitVcsDriverShape")(function* (
566
const fileSystem = yield* FileSystem.FileSystem;
567
const path = yield* Path.Path;
568
const vcsProcess = yield* VcsProcess.VcsProcess;
569
- const crypto = yield* Crypto.Crypto;
569
+ const random = yield* SecureRandom.SecureRandom;
570
const hostPlatform = yield* HostProcess.Platform;
571
const isInsideWorkTree: VcsDriver.VcsDriver["Service"]["isInsideWorkTree"] = (cwd) =>
572
gitCommand(
@@ -910,7 +910,7 @@ export const makeVcsDriverShape = Effect.fn("makeGitVcsDriverShape")(function* (
910
"splitIndex.sharedIndexExpire=never",
911
];
912
const { gitCommonDir, indexPath, headExists } = yield* resolveCaptureRepository(input.cwd);
913
- const indexId = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
913
+ const indexId = yield* random.uuidV4();
914
const tempIndexPath = path.join(gitCommonDir, `t3-checkpoint-index-${indexId}`);
915
const commitEnv: NodeJS.ProcessEnv = {
916
...process.env,
apps/server/src/vcs/GitVcsDriverCore.test.ts
+108
-26
@@ -2,6 +2,7 @@
2
import * as NodeFS from "node:fs";
3
import * as NodeOS from "node:os";
4
import * as NodeURL from "node:url";
5
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
6
import * as NodeServices from "@effect/platform-node/NodeServices";
7
import * as HostProcess from "@t3tools/shared/HostProcess";
8
import { assert, it, describe } from "@effect/vitest";
@@ -21,7 +22,7 @@ import * as Schema from "effect/Schema";
22
import * as Sink from "effect/Sink";
23
import * as Stream from "effect/Stream";
24
import * as TestClock from "effect/testing/TestClock";
24
-import { ChildProcess, ChildProcessSpawner } from "effect/process";
25
+import { ChildProcess, ChildProcessSpawner, CommandLine } from "effect/process";
26
27
import {
28
GitCommandError,
@@ -52,7 +53,7 @@ const layerServerConfig = ServerConfig.layerTest(process.cwd(), {
53
});
54
const layerTest = GitVcsDriver.layer.pipe(
55
Layer.provideMerge(layerServerConfig),
55
- Layer.provideMerge(NodeServices.layer),
56
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
57
);
58
59
const makeNonRepositoryHandle = () =>
@@ -104,7 +105,8 @@ const makeDriverReleasingLock = (
105
const spawner = ChildProcessSpawner.make((command) =>
106
Effect.gen(function* () {
107
const handle = yield* delegate.spawn(command);
107
- if (!ChildProcess.isStandardCommand(command) || !matches(command.args)) return handle;
108
+ if (!ChildProcess.isStandardCommand(command) || !matches(command.args.map(String)))
109
+ return handle;
110
return ChildProcessSpawner.makeHandle({
111
...handle,
112
exitCode: handle.exitCode.pipe(
@@ -176,7 +178,13 @@ describe("Git output collection", () => {
178
assert.deepEqual(withCallbacks, expected);
179
assert.deepEqual(stdoutLines, ["a\\b\0雪", "last "]);
180
assert.deepEqual(stderrLines, ["Receiving é", "Updating 雪", "done"]);
179
- }).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
181
+ }).pipe(
182
+ Effect.provide(
183
+ layerServerConfig.pipe(
184
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
185
+ ),
186
+ ),
187
+ ),
188
);
189
190
it.effect("caps output without line callbacks", () =>
@@ -196,7 +204,13 @@ describe("Git output collection", () => {
204
const error = yield* driver.execute(input).pipe(Effect.flip);
205
assert.equal(error.outputLength, 4);
206
assert.include(error.detail, "exceeded 3 bytes");
199
- }).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
207
+ }).pipe(
208
+ Effect.provide(
209
+ layerServerConfig.pipe(
210
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
211
+ ),
212
+ ),
213
+ ),
214
);
215
});
216
@@ -354,7 +368,7 @@ it.effect.each([
368
if (!ChildProcess.isStandardCommand(command)) {
369
return yield* Effect.die("expected a standard Git command");
370
}
357
- spawnedArgs.push(command.args);
371
+ spawnedArgs.push(command.args.map(String));
372
if (invalidationFailure !== "none" && command.args.includes("--git-common-dir")) {
373
if (invalidationFailure === "non-repository") return makeNonRepositoryHandle();
374
return ChildProcessSpawner.makeHandle({
@@ -447,7 +461,7 @@ it.effect.each(["branch", "detached", "nested", "aliased-root", "aliased-nested"
461
const delegate = yield* ChildProcessSpawner.ChildProcessSpawner;
462
const spawnedArgs: Array<ReadonlyArray<string>> = [];
463
const spawner = ChildProcessSpawner.make((command) => {
450
- if (ChildProcess.isStandardCommand(command)) spawnedArgs.push(command.args);
464
+ if (ChildProcess.isStandardCommand(command)) spawnedArgs.push(command.args.map(String));
465
return delegate.spawn(command);
466
});
467
const driver = yield* makeGitVcsDriverCore().pipe(
@@ -514,7 +528,7 @@ it.effect.each(["bare", "unborn"] as const)(
528
const delegate = yield* ChildProcessSpawner.ChildProcessSpawner;
529
const spawnedArgs: Array<ReadonlyArray<string>> = [];
530
const spawner = ChildProcessSpawner.make((command) => {
517
- if (ChildProcess.isStandardCommand(command)) spawnedArgs.push(command.args);
531
+ if (ChildProcess.isStandardCommand(command)) spawnedArgs.push(command.args.map(String));
532
return delegate.spawn(
533
state === "bare" ? ChildProcess.setEnv(command, { GIT_DIR: cwd }) : command,
534
);
@@ -760,7 +774,7 @@ describe("pullCurrentBranch", () => {
774
ChildProcess.isStandardCommand(command) &&
775
command.args.includes("pull") &&
776
command.args.includes("--ff-only");
763
- if (isPull) onPull?.(command.args);
777
+ if (isPull) onPull?.(command.args.map(String));
778
return isPull
779
? ChildProcessSpawner.makeHandle({
780
...handle,
@@ -921,7 +935,13 @@ describe("pullCurrentBranch", () => {
935
assert.equal(yield* git(cwd, ["rev-parse", "HEAD"]), remoteHead);
936
}).pipe(Effect.provideService(GitVcsDriver.GitVcsDriver, driver));
937
}),
924
- ).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
938
+ ).pipe(
939
+ Effect.provide(
940
+ layerServerConfig.pipe(
941
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
942
+ ),
943
+ ),
944
+ ),
945
);
946
947
it.effect("still fails a pull that Git rejects, whatever its output size", () =>
@@ -943,7 +963,13 @@ describe("pullCurrentBranch", () => {
963
assert.lengthOf(pulls, 1);
964
}).pipe(Effect.provideService(GitVcsDriver.GitVcsDriver, driver));
965
}),
946
- ).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
966
+ ).pipe(
967
+ Effect.provide(
968
+ layerServerConfig.pipe(
969
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
970
+ ),
971
+ ),
972
+ ),
973
);
974
});
975
@@ -1003,7 +1029,13 @@ it.effect("retries an in-flight ref snapshot invalidated by a mutation", () =>
1029
assert.isTrue(refs.refs.some((ref) => ref.name === "feature/during-refresh"));
1030
assert.equal(yield* Ref.get(refScans), 2);
1031
}),
1006
- ).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
1032
+ ).pipe(
1033
+ Effect.provide(
1034
+ layerServerConfig.pipe(
1035
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1036
+ ),
1037
+ ),
1038
+ ),
1039
);
1040
1041
it.effect("invalidates a ref snapshot when a mutation fails after changing Git", () =>
@@ -1035,7 +1067,13 @@ it.effect("invalidates a ref snapshot when a mutation fails after changing Git",
1067
const refs = yield* driver.listRefs({ cwd });
1068
assert.isTrue(refs.refs.some((ref) => ref.name === "feature/partial-failure"));
1069
}),
1038
- ).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
1070
+ ).pipe(
1071
+ Effect.provide(
1072
+ layerServerConfig.pipe(
1073
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1074
+ ),
1075
+ ),
1076
+ ),
1077
);
1078
1079
it.effect("marks the current branch when worktree metadata is unavailable", () =>
@@ -1070,7 +1108,13 @@ it.effect("marks the current branch when worktree metadata is unavailable", () =
1108
assert.isTrue(refs.isRepo);
1109
assert.isTrue(refs.refs.find((ref) => ref.name === initialBranch)?.current);
1110
}),
1073
- ).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
1111
+ ).pipe(
1112
+ Effect.provide(
1113
+ layerServerConfig.pipe(
1114
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1115
+ ),
1116
+ ),
1117
+ ),
1118
);
1119
1120
it.effect("ignores worktree metadata for directories that no longer exist", () =>
@@ -1106,7 +1150,13 @@ it.effect("ignores worktree metadata for directories that no longer exist", () =
1150
1151
assert.equal(refs.refs.find((ref) => ref.name === "stale-worktree")?.worktreePath, null);
1152
}),
1109
- ).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
1153
+ ).pipe(
1154
+ Effect.provide(
1155
+ layerServerConfig.pipe(
1156
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1157
+ ),
1158
+ ),
1159
+ ),
1160
);
1161
1162
it.effect("reads worktrees from git that rejects worktree list -z", () =>
@@ -1157,7 +1207,13 @@ it.effect("reads worktrees from git that rejects worktree list -z", () =>
1207
worktreePath,
1208
);
1209
}),
1160
- ).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
1210
+ ).pipe(
1211
+ Effect.provide(
1212
+ layerServerConfig.pipe(
1213
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1214
+ ),
1215
+ ),
1216
+ ),
1217
);
1218
1219
it.effect("does not report a separate git dir as the worktree of its branch", () =>
@@ -1302,7 +1358,13 @@ it.effect.each([
1358
assert.notProperty(error, "stderr");
1359
assert.notProperty(error, "args");
1360
assert.equal(yield* Ref.get(attempts), "attempts" in scenario ? scenario.attempts : 1);
1305
- }).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
1361
+ }).pipe(
1362
+ Effect.provide(
1363
+ layerServerConfig.pipe(
1364
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1365
+ ),
1366
+ ),
1367
+ ),
1368
);
1369
1370
it.effect("retries a fetch that lost a ref update to another Git process", () =>
@@ -1332,7 +1394,13 @@ it.effect("retries a fetch that lost a ref update to another Git process", () =>
1394
const cwd = yield* makeTmpDir();
1395
yield* driver.fetchRemote({ cwd, remoteName: "origin", refName: "main" });
1396
assert.equal(yield* Ref.get(attempts), 2);
1335
- }).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
1397
+ }).pipe(
1398
+ Effect.provide(
1399
+ layerServerConfig.pipe(
1400
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1401
+ ),
1402
+ ),
1403
+ ),
1404
);
1405
1406
it.effect("lets a worktree checkout that is still working run past five minutes", () =>
@@ -1380,7 +1448,13 @@ it.effect("lets a worktree checkout that is still working run past five minutes"
1448
const result = yield* Fiber.join(creation);
1449
assert.equal(result.worktree.path, worktreePath);
1450
assert.equal(result.worktree.refName, "t3/slow-checkout");
1383
- }).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
1451
+ }).pipe(
1452
+ Effect.provide(
1453
+ layerServerConfig.pipe(
1454
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1455
+ ),
1456
+ ),
1457
+ ),
1458
);
1459
1460
it.effect("cancels a slow submodule checkout without reporting best-effort success", () =>
@@ -1435,7 +1509,13 @@ it.effect("cancels a slow submodule checkout without reporting best-effort succe
1509
assert.isTrue(yield* Deferred.isDone(updateStopped));
1510
assert.equal(yield* Ref.get(claimed), worktreePath);
1511
assert.isEmpty(yield* Ref.get(finished));
1438
- }).pipe(Effect.provide(layerServerConfig.pipe(Layer.provideMerge(NodeServices.layer)))),
1512
+ }).pipe(
1513
+ Effect.provide(
1514
+ layerServerConfig.pipe(
1515
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
1516
+ ),
1517
+ ),
1518
+ ),
1519
);
1520
1521
describe("rejected git refs", () => {
@@ -1455,7 +1535,7 @@ describe("rejected git refs", () => {
1535
Layer.provide(layerServerConfig),
1536
Layer.provideMerge(
1537
Layer.merge(
1458
- NodeServices.layer,
1538
+ Layer.mergeAll(NodeServices.layer, NodeCrypto.layer),
1539
Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
1540
),
1541
),
@@ -1661,7 +1741,7 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
1741
yield* initRepoWithCommit(cwd);
1742
const path = yield* Path.Path;
1743
const refName = "private/deleted-base";
1664
- const locales: Array<string | undefined> = [];
1744
+ const locales: Array<CommandLine.Word | undefined> = [];
1745
const delegate = yield* ChildProcessSpawner.ChildProcessSpawner;
1746
const spawner = ChildProcessSpawner.make((command) => {
1747
if (
@@ -3249,7 +3329,9 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
3329
command.args.includes("ls-files") &&
3330
command.args.includes("--others")
3331
) {
3252
- untrackedScanRoots.push(command.args.slice(command.args.indexOf("--") + 1));
3332
+ untrackedScanRoots.push(
3333
+ command.args.slice(command.args.indexOf("--") + 1).map(String),
3334
+ );
3335
}
3336
return delegate.spawn(command);
3337
});
@@ -4041,7 +4123,7 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
4123
const delegate = yield* ChildProcessSpawner.ChildProcessSpawner;
4124
const countingSpawner = ChildProcessSpawner.make((command) =>
4125
Effect.gen(function* () {
4044
- const args = ChildProcess.isStandardCommand(command) ? command.args : [];
4126
+ const args = ChildProcess.isStandardCommand(command) ? command.args.map(String) : [];
4127
const writesConfig =
4128
(args.includes("worktree") && args.includes("add") && args.includes("-b")) ||
4129
(args[0] === "branch" &&
@@ -4802,7 +4884,7 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
4884
const delegate = yield* ChildProcessSpawner.ChildProcessSpawner;
4885
const spawner = ChildProcessSpawner.make((command) =>
4886
Effect.gen(function* () {
4805
- const args = ChildProcess.isStandardCommand(command) ? command.args : [];
4887
+ const args = ChildProcess.isStandardCommand(command) ? command.args.map(String) : [];
4888
if (args[0] === "remote" && args[1] === "-v") {
4889
listings += 1;
4890
if (listings === 2) yield* Deferred.succeed(bothListed, undefined);
@@ -6017,7 +6099,7 @@ describe("Windows long path configuration", () => {
6099
) {
6100
const layer = GitVcsDriver.layer.pipe(
6101
Layer.provide(layerServerConfig),
6020
- Layer.provideMerge(NodeServices.layer),
6102
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
6103
Layer.provide(Layer.succeed(HostProcess.Platform, platform)),
6104
);
6105
return yield* Effect.gen(function* () {
apps/server/src/vcs/GitVcsDriverCore.ts
+5
-7
@@ -2,7 +2,7 @@ import * as Cache from "effect/Cache";
2
import * as Cause from "effect/Cause";
3
import * as Clock from "effect/Clock";
4
import * as Data from "effect/Data";
5
-import * as Crypto from "effect/Crypto";
5
+import * as Digest from "effect/crypto/Digest";
6
import * as DateTime from "effect/DateTime";
7
import * as Duration from "effect/Duration";
8
import * as Effect from "effect/Effect";
@@ -943,7 +943,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
943
const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
944
const { worktreesDir } = yield* ServerConfig.ServerConfig;
945
const isServerInternalPath = yield* makeIsServerInternalPath;
946
- const crypto = yield* Crypto.Crypto;
946
+ const digest = yield* Digest.Digest;
947
const hostPlatform = yield* HostProcess.Platform;
948
const serviceScope = yield* Effect.scope;
949
const statusFetches = new Map<string, Fiber.Fiber<void, GitCommandError>>();
@@ -3361,7 +3361,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
3361
3362
const cwd = repository.worktreeRoot;
3363
const hashDiff = (diff: string, files: ReadonlyArray<ReviewDiffFileStat>) =>
3364
- crypto.digest("SHA-256", new TextEncoder().encode(JSON.stringify([diff, files]))).pipe(
3364
+ digest.digest(Digest.sha256, new TextEncoder().encode(JSON.stringify([diff, files]))).pipe(
3365
Effect.map(Hex.encode),
3366
Effect.mapError(
3367
(cause) =>
@@ -4142,12 +4142,10 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
4142
let directoryName = targetBranch.replace(/\//g, "-");
4143
// Leave room for files beneath the worktree on Windows, regardless of branch length.
4144
if (directoryName.length > 40) {
4145
- const digest = yield* crypto
4146
- .digest("SHA-256", new TextEncoder().encode(targetBranch))
4147
- .pipe(Effect.orDie);
4145
+ const hash = yield* digest.digest(Digest.sha256, new TextEncoder().encode(targetBranch));
4146
// Avoid splitting a surrogate pair, which Git would list back as a different path.
4147
const prefix = directoryName.slice(0, 23).replace(/[\uD800-\uDBFF]$/, "");
4150
- directoryName = `${prefix}-${Hex.encode(digest).slice(0, 16)}`;
4148
+ directoryName = `${prefix}-${Hex.encode(hash).slice(0, 16)}`;
4149
}
4150
worktreePath = path.join(parentDir, repoName, directoryName);
4151
}
apps/server/src/vcs/VcsDriverRegistry.test.ts
+9
-5
@@ -1,4 +1,5 @@
1
import { assert, it, describe } from "@effect/vitest";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as Effect from "effect/Effect";
5
import * as FileSystem from "effect/FileSystem";
@@ -26,7 +27,7 @@ const DETECT_COMMAND = "rev-parse --is-inside-work-tree --show-toplevel --git-co
27
describe("VcsDriverRegistry", () => {
28
const makeDiskBackedLayer = (rootDir: string, calls: string[]) =>
29
Layer.effect(VcsDriverRegistry.VcsDriverRegistry, VcsDriverRegistry.make).pipe(
29
- Layer.provide(NodeServices.layer),
30
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
31
Layer.provide(
32
Layer.mock(VcsProjectConfig.VcsProjectConfig)({
33
resolveKind: (input) => Effect.succeed(input.requestedKind ?? "auto"),
@@ -57,7 +58,10 @@ describe("VcsDriverRegistry", () => {
58
);
59
}
60
return processOutput("");
60
- }).pipe(Effect.provide(NodeServices.layer), Effect.orDie),
61
+ }).pipe(
62
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
63
+ Effect.orDie,
64
+ ),
65
}),
66
),
67
);
@@ -79,7 +83,7 @@ describe("VcsDriverRegistry", () => {
83
assert.equal(yield* registry.detect({ cwd: repoDir }), null);
84
assert.equal(calls.filter((call) => call === DETECT_COMMAND).length, 2);
85
}).pipe(Effect.provide(makeDiskBackedLayer(repoDir, calls)));
82
- }).pipe(Effect.provide(NodeServices.layer)),
86
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
87
);
88
89
it.effect("detects again when git init creates a repository inside a cached one", () =>
@@ -103,7 +107,7 @@ describe("VcsDriverRegistry", () => {
107
projectDir,
108
);
109
}).pipe(Effect.provide(makeDiskBackedLayer(parentDir, calls)));
106
- }).pipe(Effect.provide(NodeServices.layer)),
110
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
111
);
112
113
it.effect("detects a repository created after a negative lookup", () =>
@@ -122,6 +126,6 @@ describe("VcsDriverRegistry", () => {
126
assert.equal((yield* registry.detect({ cwd: repoDir }))?.repository.rootPath, repoDir);
127
assert.equal(calls.filter((call) => call === DETECT_COMMAND).length, 2);
128
}).pipe(Effect.provide(makeDiskBackedLayer(repoDir, calls)));
125
- }).pipe(Effect.provide(NodeServices.layer)),
129
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
130
);
131
});
apps/server/src/workspace/WorkspaceFileSystem.test.ts
+2
-1
@@ -3,6 +3,7 @@ import * as NodeChildProcess from "node:child_process";
3
import * as NodeFSP from "node:fs/promises";
4
5
import * as NodePath from "@effect/platform-node/NodePath";
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import { it, describe, expect } from "@effect/vitest";
9
import * as Effect from "effect/Effect";
@@ -66,7 +67,7 @@ const layerTest = Layer.empty.pipe(
67
prefix: "t3-workspace-files-test-",
68
}),
69
),
69
- Layer.provideMerge(NodeServices.layer),
70
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
71
);
72
73
const makeTempDir = Effect.gen(function* () {
apps/server/src/ws.test.ts
+2
-1
@@ -1,4 +1,5 @@
1
import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import { assert, it } from "@effect/vitest";
5
import {
@@ -617,7 +618,7 @@ const layerConfigSources = Layer.mergeAll(
618
ServerConfigModule.layerTest(process.cwd(), { prefix: "t3-config-subscription-test-" }),
619
),
620
),
620
- Layer.provideMerge(NodeServices.layer),
621
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
622
);
623
624
it.effect.each([
apps/server/src/ws.ts
+10
-9
@@ -1,6 +1,6 @@
1
import { OrchestrationDispatchCommandError } from "@t3tools/contracts";
2
import * as Context from "effect/Context";
3
-import * as Crypto from "effect/Crypto";
3
+import * as SecureRandom from "effect/crypto/SecureRandom";
4
import * as Orchestrator from "./orchestration-v2/Orchestrator.ts";
5
import * as PeerLinkRequests from "./peer/PeerLinkRequests.ts";
6
import * as PeerLinks from "./peer/PeerLinks.ts";
@@ -271,6 +271,7 @@ import {
271
import * as AgentSessionScanner from "./project/AgentSessionScanner.ts";
272
import * as AgentSessionImporter from "./project/AgentSessionImporter.ts";
273
import * as UsageLimitSources from "./usage/UsageLimitSources.ts";
274
+import { requestUrl } from "./requestUrl.ts";
275
276
const CONFIG_DISCOVERY_TIMEOUT = Duration.seconds(5);
277
const isProviderUploadFeedbackError = Schema.is(ProviderUploadFeedbackError);
@@ -706,7 +707,7 @@ function shouldUseBoundedThreadSnapshot(input: {
707
708
// Keep telemetry per socket; several client types can connect simultaneously.
709
function readClientAnalyticsProps(request: HttpServerRequest.HttpServerRequest) {
709
- const url = HttpServerRequest.toURL(request);
710
+ const url = requestUrl(request);
711
if (Option.isNone(url)) {
712
return {};
713
}
@@ -756,7 +757,7 @@ function readClientAnalyticsProps(request: HttpServerRequest.HttpServerRequest)
757
function readClientOwners(
758
request: HttpServerRequest.HttpServerRequest,
759
): ReadonlyArray<TelemetryOwner> {
759
- const url = HttpServerRequest.toURL(request);
760
+ const url = requestUrl(request);
761
if (Option.isNone(url)) {
762
return [];
763
}
@@ -1338,13 +1339,13 @@ export const layerWsRpc = (
1339
const deviceHostContext =
1340
yield* Effect.context<Effect.Services<ReturnType<typeof remoteSshDeviceHosts>>>();
1341
const orchestrationEngine = yield* Orchestrator.OrchestratorV2;
1341
- const crypto = yield* Crypto.Crypto;
1342
+ const random = yield* SecureRandom.SecureRandom;
1343
// RPC client ids are only unique within one socket; terminals share viewers across sockets.
1343
- const terminalViewerPrefix = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
1344
+ const terminalViewerPrefix = yield* random.uuidV4();
1345
const terminalViewerId = (metadata: { readonly client: { readonly id: number } }) =>
1346
`${terminalViewerPrefix}:${metadata.client.id}`;
1347
const serverCommandId = (tag: string) =>
1347
- crypto.randomUUIDv4().pipe(
1348
+ random.uuidV4().pipe(
1349
Effect.orDie,
1350
Effect.map((id) => CommandId.make(`server:${tag}:${id}`)),
1351
);
@@ -1581,7 +1582,7 @@ export const layerWsRpc = (
1582
provider?.models.find((candidate) => candidate.isDefault)?.slug ??
1583
provider?.models[0]?.slug ??
1584
"default";
1584
- const commandId = CommandId.make(yield* crypto.randomUUIDv4().pipe(Effect.orDie));
1585
+ const commandId = CommandId.make(yield* random.uuidV4());
1586
const launched = yield* Effect.result(
1587
startup.enqueueCommand(
1588
threadLaunch.launch({
@@ -3379,8 +3380,8 @@ export const layer = Layer.unwrap(
3380
"/ws",
3381
Effect.gen(function* () {
3382
const request = yield* HttpServerRequest.HttpServerRequest;
3382
- const requestUrl = HttpServerRequest.toURL(request);
3383
- if (Option.isNone(requestUrl) || !hasCompatibleOrchestrationProtocol(requestUrl.value)) {
3383
+ const url = requestUrl(request);
3384
+ if (Option.isNone(url) || !hasCompatibleOrchestrationProtocol(url.value)) {
3385
return HttpServerResponse.jsonUnsafe(
3386
{
3387
code: "orchestration_protocol_incompatible",
apps/web/src/cloud/dpop.ts
+5
-18
@@ -3,7 +3,8 @@ import {
3
computeDpopJwkThumbprint,
4
DpopPublicJwk,
5
} from "@t3tools/shared/dpop";
6
-import * as Crypto from "effect/Crypto";
6
+import * as Digest from "effect/crypto/Digest";
7
+import * as SecureRandom from "effect/crypto/SecureRandom";
8
import * as Data from "effect/Data";
9
import * as Effect from "effect/Effect";
10
import * as Layer from "effect/Layer";
@@ -27,18 +28,7 @@ const DPOP_KEY_STORE_NAME = "keys";
28
const DPOP_KEY_ID = "relay-dpop-proof-key";
29
const decodeDpopPublicJwk = Schema.decodeUnknownEffect(DpopPublicJwk);
30
30
-export const layer = Layer.succeed(
31
- Crypto.Crypto,
32
- Crypto.make({
33
- randomBytes: (size) => globalThis.crypto.getRandomValues(new Uint8Array(size)),
34
- digest: (algorithm, data) =>
35
- Effect.promise(async () => {
36
- const input = new Uint8Array(data.length);
37
- input.set(data);
38
- return new Uint8Array(await globalThis.crypto.subtle.digest(algorithm, input.buffer));
39
- }),
40
- }),
41
-);
31
+export const layer = Layer.mergeAll(SecureRandom.layerWebCrypto, Digest.layerWebCrypto);
32
33
function dpopError(message: string, cause?: unknown) {
34
return new BrowserDpopError({ message, ...(cause === undefined ? {} : { cause }) });
@@ -150,7 +140,7 @@ export const createBrowserDpopProof = Effect.fn("dpop.createBrowserDpopProof")(f
140
}): Effect.fn.Return<
141
{ readonly proof: string; readonly thumbprint: string },
142
BrowserDpopError,
153
- Crypto.Crypto
143
+ SecureRandom.SecureRandom
144
> {
145
const normalizedUrl = yield* Effect.try({
146
try: () => new URL(input.url),
@@ -158,10 +148,7 @@ export const createBrowserDpopProof = Effect.fn("dpop.createBrowserDpopProof")(f
148
});
149
normalizedUrl.search = "";
150
normalizedUrl.hash = "";
161
- const jti = yield* Crypto.Crypto.pipe(
162
- Effect.flatMap((crypto) => crypto.randomUUIDv4()),
163
- Effect.mapError((cause) => dpopError("Could not generate DPoP proof identifier.", cause)),
164
- );
151
+ const jti = yield* SecureRandom.SecureRandom.pipe(Effect.flatMap((random) => random.uuidV4()));
152
const proof = yield* Effect.tryPromise({
153
try: () =>
154
new SignJWT({
apps/web/src/cloud/managedRelayLayer.ts
+3
-3
@@ -1,6 +1,6 @@
1
import { ManagedRelay } from "@t3tools/client-runtime/relay";
2
import { RelayWebClientId } from "@t3tools/contracts/relay";
3
-import * as Crypto from "effect/Crypto";
3
+import * as SecureRandom from "effect/crypto/SecureRandom";
4
import * as Effect from "effect/Effect";
5
import * as Layer from "effect/Layer";
6
import * as Semaphore from "effect/Semaphore";
@@ -16,7 +16,7 @@ import {
16
const layerRelayDpopSigner = Layer.effect(
17
ManagedRelay.ManagedRelayDpopSigner,
18
Effect.gen(function* () {
19
- const crypto = yield* Crypto.Crypto;
19
+ const random = yield* SecureRandom.SecureRandom;
20
const keyLoadSemaphore = yield* Semaphore.make(1);
21
let loadedKey: BrowserDpopKey | null = null;
22
const loadOrCreateBrowserDpopKey = keyLoadSemaphore.withPermit(
@@ -60,7 +60,7 @@ const layerRelayDpopSigner = Layer.effect(
60
),
61
);
62
return yield* createBrowserDpopProof({ ...input, proofKey }).pipe(
63
- Effect.provideService(Crypto.Crypto, crypto),
63
+ Effect.provideService(SecureRandom.SecureRandom, random),
64
Effect.map((proof) => proof.proof),
65
Effect.mapError(
66
(error) =>
evals/mcp-tool-use/devices.test.ts
+15
-13
@@ -1,7 +1,9 @@
1
// @effect-diagnostics nodeBuiltinImport:off
2
import * as NodeFS from "node:fs";
3
import * as NodeZlib from "node:zlib";
4
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
5
import * as NodeServices from "@effect/platform-node/NodeServices";
6
+import * as Layer from "effect/Layer";
7
import { assert, it } from "@effect/vitest";
8
import * as Effect from "effect/Effect";
9
import * as Schema from "effect/Schema";
@@ -100,7 +102,7 @@ it.effect("answers device calls with T3's handlers over the case's world", () =>
102
const elsewhere = yield* tools.call("device_open", { hostId: "local", deviceId: IPHONE });
103
assert.isTrue(elsewhere.isError);
104
assert.include(elsewhere.text, IPHONE);
103
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
105
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
106
);
107
108
it.effect("lists the boot state T3 left a device in", () =>
@@ -113,7 +115,7 @@ it.effect("lists the boot state T3 left a device in", () =>
115
yield* tools.call("device_open", { hostId: MAC, deviceId: IPHONE });
116
const after = json((yield* tools.call("device_list", {})).text);
117
assert.isTrue(after.devices.find((d: { id: string }) => d.id === IPHONE).booted);
116
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
118
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
119
);
120
121
it("decodes only T3 device errors as injected failures", () => {
@@ -148,7 +150,7 @@ it.effect("rebuilds prior device results with T3, whose sessions reach the measu
150
assert.isFalse((yield* tools.call("device_screenshot", {})).isError);
151
const mock = deviceFailure(testCase.setup.mocks?.device_screenshot);
152
assert.isTrue((yield* tools.call("device_screenshot", {}, mock)).isError);
151
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
153
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
154
);
155
156
it.effect("gives a native subagent T3's SubagentStart context instead of T3's append", () =>
@@ -204,7 +206,7 @@ it.effect("tells the shell simulator the launchers T3 returned and agent-device'
206
// A case without devices keeps the shell prompt every other case has.
207
const plain = makeSample(deviceCase({ world: {} }), base);
208
assert.notInclude(shellRequest(plain, call, "claude-haiku-5-5").system, "agent-device");
207
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
209
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
210
);
211
212
it("prints agent-device's own help for a lone help command on a returned launcher", () => {
@@ -315,7 +317,7 @@ it.effect("answers the returned launcher as agent-device does before and after o
317
tools.sessionError(history, `${line("screenshot /tmp/a.png")} 2>&1`),
318
NO_SESSION,
319
);
318
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
320
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
321
);
322
323
const shared = (session: string): LauncherTarget => ({
@@ -484,7 +486,7 @@ it.effect("starts sessions the world says prior turns opened, and rejects unknow
486
const unknown = { devices, deviceHosts, agentDeviceSessions: { "not-a-device": {} } };
487
const exit = yield* Effect.exit(makeDeviceTools(unknown, base.environment));
488
assert.isTrue(exit._tag === "Failure");
487
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
489
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
490
);
491
492
it.effect(
@@ -522,7 +524,7 @@ it.effect(
524
});
525
assert.isUndefined(cannedOutput(sample, `${command} screenshot /tmp/a.png${flags}`));
526
assert.include(told(), "is open with an app");
525
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
527
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
528
);
529
530
it("keeps a redirection's descriptor out of the app an open names, on either launcher", () => {
@@ -631,7 +633,7 @@ it.effect("lists a host whose discovery fails as T3 does: failed, with none of i
633
deviceTools({ deviceDiscoveryFailures: { "eeeeeeee-eeee-4eee-8eee-eeeeeeeeeeee": failure } }),
634
);
635
assert.isTrue(unlabeled._tag === "Failure");
634
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
636
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
637
);
638
639
it.effect("denies every device tool with T3's own error when agent device access is off", () =>
@@ -657,7 +659,7 @@ it.effect("denies every device tool with T3's own error when agent device access
659
}
660
// T3 drops its device text for a thread without the capability, on refs that have it.
661
assert.notInclude(t3SystemAppend(model, false), "## T3 Code devices");
660
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
662
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
663
);
664
665
it.effect("reports an unreadable capture as T3 does: a successful 0×0 screenshot", () =>
@@ -674,7 +676,7 @@ it.effect("reports an unreadable capture as T3 does: a successful 0×0 screensho
676
yield* withDevices(sample);
677
const told = JSON.stringify(shellRequest(sample, { tool: "Bash", input: {} }, model).messages);
678
assert.include(told, "agent-device's own screenshot finds the PNG and is unaffected");
677
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
679
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
680
);
681
682
it.effect("refuses an open on a device another thread's agent-device session holds", () =>
@@ -742,7 +744,7 @@ it.effect("refuses an open on a device another thread's agent-device session hol
744
history.push({ tool: "Bash", input: { command: line("close", owner) }, output: "Closed" });
745
assert.equal(answer("open com.acme.app"), "");
746
assert.include(describeSessions(tools.sessions(history), tools.owners), "was closed");
745
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
747
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
748
);
749
750
it.effect("leaves a free device free when another thread holds a different one", () =>
@@ -762,7 +764,7 @@ it.effect("leaves a free device free when another thread holds a different one",
764
assert.isFalse(
765
(yield* tools.call("device_list", {})).text.includes(`"hostId":"${LOCAL_DEVICE_HOST_ID}"`),
766
);
765
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
767
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
768
);
769
770
type Opened = { command: string; targetArgs: Array<string>; session?: string };
@@ -883,7 +885,7 @@ it.effect(
885
JSON.stringify(request.messages),
886
`${session(own)} (Acme iPhone, ${IPHONE}, on build-mac) has not started`,
887
);
886
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
888
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
889
);
890
891
it("tells the simulator 0.21.31's --foreground and session list behaviour", () => {
evals/mcp-tool-use/devices.ts
+4
-4
@@ -21,7 +21,7 @@ import {
21
} from "@t3tools/contracts";
22
import * as HostProcess from "@t3tools/shared/HostProcess";
23
import * as Context from "effect/Context";
24
-import * as Crypto from "effect/Crypto";
24
+import * as Digest from "effect/crypto/Digest";
25
import * as Effect from "effect/Effect";
26
import * as FileSystem from "effect/FileSystem";
27
import * as Layer from "effect/Layer";
@@ -695,7 +695,7 @@ export const makeDeviceTools = Effect.fn("evaluateMcpToolUse.makeDeviceTools")(f
695
Effect.gen(function* () {
696
const fs = yield* FileSystem.FileSystem;
697
const path = yield* Path.Path;
698
- const crypto = yield* Crypto.Crypto;
698
+ const digest = yield* Digest.Digest;
699
const { stateDir } = yield* ServerConfig.ServerConfig;
700
const agentEntry = path.join(home, ".t3", "tools", "agent-device", "bin", "agent-device.mjs");
701
const hosts = new Map<DeviceHostId, DeviceHost.DeviceHost["Service"]>([
@@ -720,7 +720,7 @@ export const makeDeviceTools = Effect.fn("evaluateMcpToolUse.makeDeviceTools")(f
720
// As DeviceService.make, minus writing the config file the path names.
721
const configureAgent = (hostId: DeviceHostId, _endpoint: unknown, deviceId?: string) =>
722
agentDeviceConfigPath(stateDir, hostId, path, deviceId).pipe(
723
- Effect.provideService(Crypto.Crypto, crypto),
723
+ Effect.provideService(Digest.Digest, digest),
724
Effect.mapError(
725
(cause) =>
726
new DeviceOperationError({
@@ -775,7 +775,7 @@ export const makeDeviceTools = Effect.fn("evaluateMcpToolUse.makeDeviceTools")(f
775
);
776
const context = yield* Layer.build(
777
McpHttpServer.layerDeviceToolkit.pipe(
778
- Layer.provideMerge(McpServer.McpServer.layer),
778
+ Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
779
Layer.provideMerge(devices),
780
Layer.provideMerge(
781
Layer.mergeAll(
evals/mcp-tool-use/run.test.ts
+7
-5
@@ -1,6 +1,8 @@
1
// @effect-diagnostics nodeBuiltinImport:off
2
import * as NodeFS from "node:fs";
3
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
4
import * as NodeServices from "@effect/platform-node/NodeServices";
5
+import * as Layer from "effect/Layer";
6
import * as Effect from "effect/Effect";
7
import * as Schema from "effect/Schema";
8
import { assert, expect, it } from "@effect/vitest";
@@ -564,7 +566,7 @@ it.effect("builds device cases from product-backed worlds and synthetic prior tu
566
assert.equal(native.kind, "bad");
567
assert.equal(native.setup.harness, "claude");
568
assert.isNotEmpty(cases.find((c) => c.id === "SEED-01")!.setup.priorTurns!);
567
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
569
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
570
);
571
572
it.each([
@@ -1278,7 +1280,7 @@ it.effect("accepts a successful exact-host recovery after a real device_open err
1280
stopReason: "end_turn",
1281
}).every((c) => c.pass),
1282
);
1281
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
1283
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
1284
);
1285
1286
it("keeps subshell-only launcher aliases out of the parent shell", () => {
@@ -2936,7 +2938,7 @@ it.effect("fleet case worlds survive decoding and reach the product-backed runne
2938
assert.include(error, id === "OWN-01" ? "DEVICE_IN_USE" : "SESSION_NOT_FOUND");
2939
if (id === "OWN-01") assert.equal(tools.owners[0]!.session, "t3-a062c547ef0b6bf8ee839b67");
2940
}
2939
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
2941
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
2942
);
2943
2944
it.each([
@@ -3110,7 +3112,7 @@ it.effect("R12 OWN-01 protects occupied panel sessions from selected and wildcar
3112
}),
3113
[],
3114
);
3113
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
3115
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
3116
);
3117
3118
it.effect(
@@ -3145,7 +3147,7 @@ it.effect(
3147
calls: [...calls, calls.at(-1)!, ...good.calls.slice(1)],
3148
}),
3149
);
3148
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
3150
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
3151
);
3152
3153
const capRun6 = [
evals/mcp-tool-use/run.ts
+2
-1
@@ -10,6 +10,7 @@ import * as NodeUtil from "node:util";
10
import * as NodeVM from "node:vm";
11
import * as NodeZlib from "node:zlib";
12
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
13
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
14
import * as NodeServices from "@effect/platform-node/NodeServices";
15
import {
16
ComposerContextRecord,
@@ -2326,7 +2327,7 @@ const main = Effect.gen(function* () {
2327
2328
if (import.meta.main) {
2329
main.pipe(
2329
- Effect.provide(Layer.mergeAll(NodeServices.layer, FetchHttpClient.layer)),
2330
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, FetchHttpClient.layer)),
2331
NodeRuntime.runMain,
2332
);
2333
}
evals/thread-titles/run.ts
+2
-1
@@ -3,6 +3,7 @@
3
import * as NodeUtil from "node:util";
4
import * as NodeCrypto from "node:crypto";
5
import * as FetchHttpClient from "effect/http/FetchHttpClient";
6
+import * as NodePlatformCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import { CodexSettings, ProviderInstanceId } from "@t3tools/contracts";
9
import * as Effect from "effect/Effect";
@@ -153,7 +154,7 @@ await Effect.runPromise(
154
Layer.provideMerge(
155
ServerConfig.layerTest(process.cwd(), { prefix: "t3-title-evaluation-state-" }),
156
),
156
- Layer.provideMerge(NodeServices.layer),
157
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodePlatformCrypto.layer)),
158
),
159
),
160
Effect.scoped,
infra/relay/package.json
+1
@@ -30,6 +30,7 @@
30
"effect": "catalog:"
31
},
32
"devDependencies": {
33
+ "@alchemy.run/test": "catalog:",
34
"@cloudflare/workers-types": "^4.20260601.1",
35
"@effect/platform-node": "catalog:",
36
"@effect/vitest": "catalog:",
infra/relay/scripts/android-push-watch.ts
+2
-2
@@ -1,7 +1,7 @@
1
// @effect-diagnostics nodeBuiltinImport:off - Local developer verification reads private credential files.
2
import * as NodeFSP from "node:fs/promises";
3
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
4
-import * as NodeSocket from "@effect/platform-node/NodeSocket";
4
+import * as NodeWS from "@effect/platform-node/NodeWS";
5
import {
6
ORCHESTRATION_V2_WS_METHODS,
7
WS_METHODS,
@@ -89,7 +89,7 @@ const main = Effect.gen(function* () {
89
const layerSocketConstructor = Layer.succeed(
90
Socket.WebSocketConstructor,
91
(url, protocols) =>
92
- new NodeSocket.NodeWS.WebSocket(url, protocols as string | string[] | undefined, {
92
+ new NodeWS.WebSocket(url, protocols as string | string[] | undefined, {
93
headers: { authorization: `Bearer ${connection.bearerToken}` },
94
}) as unknown as globalThis.WebSocket,
95
);
infra/relay/src/agentActivity/ApnsDeliveryQueue.ts
+4
-4
@@ -1,6 +1,6 @@
1
import * as Alchemy from "alchemy";
2
import * as Cloudflare from "@alchemy.run/cloudflare";
3
-import * as Crypto from "effect/Crypto";
3
+import * as SecureRandom from "effect/crypto/SecureRandom";
4
import * as Context from "effect/Context";
5
import * as DateTime from "effect/DateTime";
6
import * as Effect from "effect/Effect";
@@ -78,7 +78,7 @@ export class ApnsDeliveryQueue extends Context.Service<
78
79
const make = Effect.gen(function* () {
80
const sender = yield* ApnsDeliveryQueueSender;
81
- const crypto = yield* Crypto.Crypto;
81
+ const random = yield* SecureRandom.SecureRandom;
82
const config = yield* RelayConfiguration.RelayConfiguration;
83
84
return ApnsDeliveryQueue.of({
@@ -89,7 +89,7 @@ const make = Effect.gen(function* () {
89
"relay.delivery.kind": input.kind,
90
});
91
const now = yield* DateTime.now;
92
- const jobId = yield* crypto.randomUUIDv4().pipe(
92
+ const jobId = yield* random.uuidV4().pipe(
93
Effect.mapError(
94
(cause) =>
95
new ApnsDeliveryQueueSendError({
@@ -148,7 +148,7 @@ const make = Effect.gen(function* () {
148
"relay.thread_id": input.notification.threadId,
149
});
150
const now = yield* DateTime.now;
151
- const jobId = yield* crypto.randomUUIDv4().pipe(
151
+ const jobId = yield* random.uuidV4().pipe(
152
Effect.mapError(
153
(cause) =>
154
new ApnsDeliveryQueueSendError({
infra/relay/src/agentActivity/DeliveryAttempts.ts
+3
-3
@@ -5,7 +5,7 @@ import * as Layer from "effect/Layer";
5
import * as Option from "effect/Option";
6
import { and, eq, inArray, isNull, lt } from "drizzle-orm";
7
import { QueryBuilder } from "drizzle-orm/pg-core";
8
-import * as Crypto from "effect/Crypto";
8
+import * as SecureRandom from "effect/crypto/SecureRandom";
9
import * as Schema from "effect/Schema";
10
11
import * as RelayDb from "../db.ts";
@@ -97,7 +97,7 @@ function insertValues(
97
98
const make = Effect.gen(function* () {
99
const db = yield* RelayDb.RelayDb;
100
- const crypto = yield* Crypto.Crypto;
100
+ const random = yield* SecureRandom.SecureRandom;
101
102
const isExpiredClaim = (claimedAt: string | null, now: DateTime.DateTime) => {
103
if (claimedAt === null) {
@@ -121,7 +121,7 @@ const make = Effect.gen(function* () {
121
...(input.threadId ? { "relay.thread_id": input.threadId } : {}),
122
});
123
return yield* Effect.gen(function* () {
124
- const id = yield* crypto.randomUUIDv4();
124
+ const id = yield* random.uuidV4();
125
const now = yield* DateTime.now;
126
const createdAt = DateTime.formatIso(now);
127
const inserted = yield* db
infra/relay/src/agentActivity/FcmDeliveries.ts
+6
-3
@@ -5,7 +5,7 @@ import {
5
RelayAgentAwarenessPreferences,
6
type RelayDeliveryResult,
7
} from "@t3tools/contracts/relay";
8
-import * as Crypto from "effect/Crypto";
8
+import * as Digest from "effect/crypto/Digest";
9
import type * as PlatformError from "effect/PlatformError";
10
import * as Context from "effect/Context";
11
import * as DateTime from "effect/DateTime";
@@ -139,7 +139,7 @@ export class FcmDeliveries extends Context.Service<
139
140
const make = Effect.gen(function* () {
141
const config = yield* RelayConfiguration.RelayConfiguration;
142
- const crypto = yield* Crypto.Crypto;
142
+ const crypto = yield* Digest.Digest;
143
const sender = yield* FcmDeliveryQueueSender.FcmDeliveryQueueSender;
144
const client = yield* FcmClient.FcmClient;
145
const devices = yield* LiveActivities.LiveActivities;
@@ -297,7 +297,10 @@ const make = Effect.gen(function* () {
297
};
298
if (alert) {
299
// Hash the full stable group identity to stay within the payload budget.
300
- const digest = yield* crypto.digest("SHA-256", new TextEncoder().encode(alert.alert_id));
300
+ const digest = yield* crypto.digest(
301
+ Digest.sha256,
302
+ new TextEncoder().encode(alert.alert_id),
303
+ );
304
data.alert_id = Array.from(digest, (byte) => byte.toString(16).padStart(2, "0")).join("");
305
}
306
const result = yield* client.send({
infra/relay/src/clientConfig.test.ts
+1
-1
@@ -1,6 +1,6 @@
1
// @effect-diagnostics anyUnknownInErrorContext:off - ScratchStack.deploy is typed with `any` in its error channel by Alchemy.
2
import { inMemoryState } from "alchemy/State";
3
-import * as Test from "alchemy/Test/Vitest";
3
+import * as Test from "@alchemy.run/test/Vitest";
4
import * as ConfigProvider from "effect/ConfigProvider";
5
import * as Effect from "effect/Effect";
6
import * as FileSystem from "effect/FileSystem";
infra/relay/src/environments/EnvironmentConnector.ts
+6
-6
@@ -30,7 +30,7 @@ import {
30
} from "@t3tools/shared/relayJwt";
31
import { stableStringify } from "@t3tools/shared/relaySigning";
32
import * as Context from "effect/Context";
33
-import * as Crypto from "effect/Crypto";
33
+import * as SecureRandom from "effect/crypto/SecureRandom";
34
import * as DateTime from "effect/DateTime";
35
import * as Duration from "effect/Duration";
36
import * as Effect from "effect/Effect";
@@ -386,7 +386,7 @@ const make = Effect.gen(function* () {
386
const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
387
const settings = yield* RelayConfiguration.RelayConfiguration;
388
const httpClient = yield* HttpClient.HttpClient;
389
- const crypto = yield* Crypto.Crypto;
389
+ const random = yield* SecureRandom.SecureRandom;
390
const relayIssuer = normalizeRelayIssuer(settings.relayIssuer);
391
const makeEnvironmentClient = (httpBaseUrl: string) =>
392
makeEnvironmentHttpApiClient(httpBaseUrl).pipe(
@@ -444,7 +444,7 @@ const make = Effect.gen(function* () {
444
});
445
const now = yield* DateTime.now;
446
const expiresAt = DateTime.add(now, { minutes: 2 });
447
- const nonce = yield* crypto.randomUUIDv4().pipe(
447
+ const nonce = yield* random.uuidV4().pipe(
448
Effect.mapError(
449
(cause) =>
450
new EnvironmentMintRequestFailed({
@@ -458,7 +458,7 @@ const make = Effect.gen(function* () {
458
iss: relayIssuer,
459
aud: `t3-env:${link.environmentId}`,
460
sub: input.userId,
461
- jti: yield* crypto.randomUUIDv4().pipe(
461
+ jti: yield* random.uuidV4().pipe(
462
Effect.mapError(
463
(cause) =>
464
new EnvironmentMintRequestFailed({
@@ -606,7 +606,7 @@ const make = Effect.gen(function* () {
606
});
607
const now = yield* DateTime.now;
608
const expiresAt = DateTime.add(now, { minutes: 2 });
609
- const nonce = yield* crypto.randomUUIDv4().pipe(
609
+ const nonce = yield* random.uuidV4().pipe(
610
Effect.mapError(
611
(cause) =>
612
new EnvironmentMintRequestFailed({
@@ -620,7 +620,7 @@ const make = Effect.gen(function* () {
620
iss: relayIssuer,
621
aud: `t3-env:${link.environmentId}`,
622
sub: input.userId,
623
- jti: yield* crypto.randomUUIDv4().pipe(
623
+ jti: yield* random.uuidV4().pipe(
624
Effect.mapError(
625
(cause) =>
626
new EnvironmentMintRequestFailed({
infra/relay/src/environments/EnvironmentCredentials.ts
+9
-6
@@ -1,5 +1,6 @@
1
import * as Context from "effect/Context";
2
-import * as Crypto from "effect/Crypto";
2
+import * as Digest from "effect/crypto/Digest";
3
+import * as SecureRandom from "effect/crypto/SecureRandom";
4
import * as DateTime from "effect/DateTime";
5
import * as Effect from "effect/Effect";
6
import * as Base64Url from "effect/encoding/Base64Url";
@@ -83,13 +84,15 @@ export class EnvironmentCredentials extends Context.Service<
84
85
const make = Effect.gen(function* () {
86
const db = yield* RelayDb.RelayDb;
86
- const crypto = yield* Crypto.Crypto;
87
+ const random = yield* SecureRandom.SecureRandom;
88
+ const digest = yield* Digest.Digest;
89
const hashToken = (token: string) =>
88
- crypto.digest("SHA-256", new TextEncoder().encode(token)).pipe(Effect.map(Base64Url.encode));
90
+ digest
91
+ .digest(Digest.sha256, new TextEncoder().encode(token))
92
+ .pipe(Effect.map(Base64Url.encode));
93
const randomTokenPart = (segments: number) =>
90
- Effect.map(
91
- Effect.all(Array.from({ length: segments }, () => crypto.randomUUIDv4())),
92
- (values) => values.join("").replaceAll("-", ""),
94
+ Effect.map(Effect.all(Array.from({ length: segments }, () => random.uuidV4())), (values) =>
95
+ values.join("").replaceAll("-", ""),
96
);
97
const makeCredential = Effect.fnUntraced(function* () {
98
const credentialId = yield* randomTokenPart(2);
infra/relay/src/environments/EnvironmentPublishSignatures.test.ts
+2
-1
@@ -1,5 +1,6 @@
1
// @effect-diagnostics-next-line nodeBuiltinImport:off -- Effect's Crypto has no generateKeyPairSync or sign.
2
import * as NodeCrypto from "node:crypto";
3
+import * as NodeCryptoLayer from "@effect/platform-node/NodeCrypto";
4
import * as NodeServices from "@effect/platform-node/NodeServices";
5
import type {
6
RelayAgentActivityPublishProofPayload,
@@ -98,7 +99,7 @@ function layer(replay?: Partial<DpopProofs.DpopProofReplay["Service"]>) {
99
}),
100
),
101
),
101
- Layer.provideMerge(NodeServices.layer),
102
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCryptoLayer.layer)),
103
);
104
}
105
infra/relay/src/environments/EnvironmentPublishSignatures.ts
+3
-3
@@ -11,7 +11,7 @@ import {
11
} from "@t3tools/shared/relayJwt";
12
import { stableStringify } from "@t3tools/shared/relaySigning";
13
import * as Context from "effect/Context";
14
-import * as Crypto from "effect/Crypto";
14
+import * as Digest from "effect/crypto/Digest";
15
import * as DateTime from "effect/DateTime";
16
import * as Effect from "effect/Effect";
17
import * as Base64Url from "effect/encoding/Base64Url";
@@ -93,7 +93,7 @@ const formatEnvironmentPublishReplayThumbprint = (digest: Uint8Array) =>
93
const make = Effect.gen(function* () {
94
const proofReplay = yield* DpopProofs.DpopProofReplay;
95
const config = yield* RelayConfiguration.RelayConfiguration;
96
- const crypto = yield* Crypto.Crypto;
96
+ const crypto = yield* Digest.Digest;
97
98
return EnvironmentPublishSignatures.of({
99
verify: Effect.fn("relay.environment_publish_signatures.verify")(function* (input) {
@@ -170,7 +170,7 @@ const make = Effect.gen(function* () {
170
}
171
const thumbprint = yield* crypto
172
.digest(
173
- "SHA-256",
173
+ Digest.sha256,
174
environmentPublishReplayThumbprintData({
175
environmentId: input.environmentId,
176
environmentPublicKey: input.environmentPublicKey,
infra/relay/src/environments/ManagedEndpointProvider.test.ts
+3
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
4
import { describe, expect, it } from "@effect/vitest";
@@ -365,7 +366,7 @@ function layerProvider(
366
tunnelLimits = makeTunnelLimits(),
367
) {
368
return ManagedEndpointProvider.layer.pipe(
368
- Layer.provideMerge(NodeServices.layer),
369
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
370
Layer.provide(RelayConfiguration.layer(config)),
371
Layer.provide(ManagedEndpointProvider.layerTunnelClient(tunnelClient)),
372
Layer.provide(ManagedEndpointProvider.layerDnsClient(dnsClient)),
@@ -751,7 +752,7 @@ describe("ManagedEndpointProvider", () => {
752
{} as Cloudflare.DNS.ReadWriteDnsClient,
753
{} as Alchemy.BaseRuntimeContext,
754
).pipe(
754
- Layer.provideMerge(NodeServices.layer),
755
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
756
Layer.provide(RelayConfiguration.layer(config)),
757
Layer.provide(
758
Layer.succeed(ManagedEndpointAllocations.ManagedEndpointAllocations, makeAllocations()),
infra/relay/src/environments/ManagedEndpointProvider.ts
+4
-4
@@ -5,7 +5,7 @@ import * as Arr from "effect/Array";
5
import * as Cause from "effect/Cause";
6
import * as Clock from "effect/Clock";
7
import * as Context from "effect/Context";
8
-import * as Crypto from "effect/Crypto";
8
+import * as Digest from "effect/crypto/Digest";
9
import * as DateTime from "effect/DateTime";
10
import * as Duration from "effect/Duration";
11
import * as Effect from "effect/Effect";
@@ -552,7 +552,7 @@ const ignoreNotFound = <A>(
552
553
const make = Effect.gen(function* () {
554
const config = yield* RelayConfiguration.RelayConfiguration;
555
- const crypto = yield* Crypto.Crypto;
555
+ const digest = yield* Digest.Digest;
556
const tunnels = yield* ManagedEndpointTunnelClient;
557
const dns = yield* ManagedEndpointDnsClient;
558
const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
@@ -1173,9 +1173,9 @@ const make = Effect.gen(function* () {
1173
});
1174
}
1175
const cf = yield* requireCloudflareSettings(config, input);
1176
- const environmentHash = yield* crypto
1176
+ const environmentHash = yield* digest
1177
.digest(
1178
- "SHA-256",
1178
+ Digest.sha256,
1179
new TextEncoder().encode(
1180
managedEndpointDigestInput(cf.namespace, input.userId, input.environmentId),
1181
),
infra/relay/src/hooks/HookForwarder.ts
+4
-4
@@ -1,6 +1,6 @@
1
import * as Clock from "effect/Clock";
2
import * as Context from "effect/Context";
3
-import * as Crypto from "effect/Crypto";
3
+import * as SecureRandom from "effect/crypto/SecureRandom";
4
import * as DateTime from "effect/DateTime";
5
import * as Effect from "effect/Effect";
6
import * as Layer from "effect/Layer";
@@ -219,7 +219,7 @@ const make = Effect.gen(function* () {
219
const httpClient = yield* HttpClient.HttpClient;
220
const rateLimiter = yield* HookRateLimiter;
221
const inbox = yield* HookInbox.HookInbox;
222
- const crypto = yield* Crypto.Crypto;
222
+ const random = yield* SecureRandom.SecureRandom;
223
224
const signDeliveryProof = Effect.fn("HookForwarder.signDeliveryProof")(
225
function* (input: {
@@ -318,14 +318,14 @@ const make = Effect.gen(function* () {
318
319
// Reuse one delivery ID so inbox retries cannot rerun requests that reached the environment before timeout.
320
yield* Effect.annotateCurrentSpan({ "relay.hook.body_bytes": body.success.byteLength });
321
- const deliveryId = yield* crypto.randomUUIDv4().pipe(Effect.orDie);
321
+ const deliveryId = yield* random.uuidV4();
322
// Sign once before storing held requests so the inbox needs no signing key.
323
const proof = yield* signDeliveryProof({
324
environmentId: endpoint.environmentId,
325
deliveryId,
326
receivedAt,
327
hookId: parsed.hookId,
328
- jti: yield* crypto.randomUUIDv4().pipe(Effect.orDie),
328
+ jti: yield* random.uuidV4(),
329
});
330
const hook = {
331
id: deliveryId,
infra/relay/src/http/Api.ts
+5
-9
@@ -1,6 +1,6 @@
1
import { createClerkClient, verifyToken } from "@clerk/backend";
2
import { sql as drizzleSql } from "drizzle-orm";
3
-import * as Crypto from "effect/Crypto";
3
+import * as SecureRandom from "effect/crypto/SecureRandom";
4
import * as Context from "effect/Context";
5
import * as DateTime from "effect/DateTime";
6
import * as Duration from "effect/Duration";
@@ -819,7 +819,7 @@ export const layerClientApi = HttpApiBuilder.group(
819
"client",
820
Effect.fnUntraced(function* (handlers) {
821
const config = yield* RelayConfiguration.RelayConfiguration;
822
- const crypto = yield* Crypto.Crypto;
822
+ const random = yield* SecureRandom.SecureRandom;
823
const relayTokens = yield* RelayTokens.RelayTokens;
824
const linker = yield* EnvironmentLinker.EnvironmentLinker;
825
const links = yield* EnvironmentLinks.EnvironmentLinks;
@@ -945,9 +945,7 @@ export const layerClientApi = HttpApiBuilder.group(
945
const { userId } = yield* RelayClientPrincipal;
946
const now = yield* DateTime.now;
947
const expiresAt = DateTime.add(now, { minutes: 5 });
948
- const jti = yield* crypto
949
- .randomUUIDv4()
950
- .pipe(Effect.catch(() => relayInternalErrorResponse("internal_error")));
948
+ const jti = yield* random.uuidV4();
949
const challenge = yield* relayTokens
950
.issueLinkChallenge({
951
userId,
@@ -1045,7 +1043,7 @@ export const layerTokenApi = HttpApiBuilder.group(
1043
"token",
1044
Effect.fnUntraced(function* (handlers) {
1045
const config = yield* RelayConfiguration.RelayConfiguration;
1048
- const crypto = yield* Crypto.Crypto;
1046
+ const random = yield* SecureRandom.SecureRandom;
1047
const dpopProofs = yield* DpopProofs.DpopProofReplay;
1048
const relayTokens = yield* RelayTokens.RelayTokens;
1049
return handlers.handle(
@@ -1077,9 +1075,7 @@ export const layerTokenApi = HttpApiBuilder.group(
1075
);
1076
const now = yield* DateTime.now;
1077
const expiresAt = DateTime.addDuration(now, RelayTokens.RELAY_DPOP_ACCESS_TOKEN_TTL);
1080
- const jti = yield* crypto
1081
- .randomUUIDv4()
1082
- .pipe(Effect.catch(() => relayInternalErrorResponse("internal_error")));
1078
+ const jti = yield* random.uuidV4();
1079
return {
1080
access_token: yield* relayTokens
1081
.issueDpopAccessToken({
infra/relay/src/worker.ts
+3
-13
@@ -5,7 +5,8 @@ import * as Drizzle from "@alchemy.run/drizzle/Postgres";
5
import * as Config from "effect/Config";
6
import * as Cause from "effect/Cause";
7
import * as DateTime from "effect/DateTime";
8
-import * as Crypto from "effect/Crypto";
8
+import * as Digest from "effect/crypto/Digest";
9
+import * as SecureRandom from "effect/crypto/SecureRandom";
10
import * as Effect from "effect/Effect";
11
import * as Layer from "effect/Layer";
12
import * as Option from "effect/Option";
@@ -72,18 +73,7 @@ import * as HookInbox from "./hooks/HookInbox.ts";
73
import * as HookInboxObject from "./hooks/HookInboxObject.ts";
74
import * as MobileTelemetry from "./mobileTelemetry/MobileTelemetry.ts";
75
75
-const layerWebcrypto = Layer.succeed(
76
- Crypto.Crypto,
77
- Crypto.make({
78
- randomBytes: (size) => globalThis.crypto.getRandomValues(new Uint8Array(size)),
79
- digest: (algorithm, data) =>
80
- Effect.promise(async () => {
81
- const input = new Uint8Array(data.length);
82
- input.set(data);
83
- return new Uint8Array(await globalThis.crypto.subtle.digest(algorithm, input.buffer));
84
- }),
85
- }),
86
-);
76
+const layerWebcrypto = Layer.mergeAll(SecureRandom.layerWebCrypto, Digest.layerWebCrypto);
77
78
const layerHttpPlatformNotSupported = Layer.succeed(HttpPlatform.HttpPlatform, {
79
platform: "web",
infra/task-cache/scripts/manage.ts
+6
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as ChildProcess from "effect/process/ChildProcess";
@@ -67,6 +68,10 @@ const command = Command.make("task-cache").pipe(
68
);
69
70
Command.run(command, { version: "1.0.0" }).pipe(
70
- Effect.provide(WriterRegistry.layer.pipe(Layer.provideMerge(NodeServices.layer))),
71
+ Effect.provide(
72
+ WriterRegistry.layer.pipe(
73
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
74
+ ),
75
+ ),
76
NodeRuntime.runMain,
77
);
infra/task-cache/src/WriterRegistry.test.ts
+11
-10
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { expect, it } from "@effect/vitest";
4
import * as Config from "effect/Config";
@@ -29,7 +30,7 @@ it.effect("loads the private writer registry as deployment configuration", () =>
30
Effect.provide(ConfigProvider.layer(ConfigProvider.fromUnknown({ HOME: home }))),
31
);
32
expect(JSON.parse(Redacted.value(keys))).toEqual({ maria: "digest" });
32
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
33
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
34
);
35
36
it.effect("uses explicit deployment credentials without requiring a local registry", () =>
@@ -42,7 +43,7 @@ it.effect("uses explicit deployment credentials without requiring a local regist
43
),
44
);
45
expect(JSON.parse(Redacted.value(keys))).toEqual({ theo: "digest" });
45
- }).pipe(Effect.provide(NodeServices.layer)),
46
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
47
);
48
49
it.effect("fails instead of deploying an empty registry when credentials are missing", () =>
@@ -54,7 +55,7 @@ it.effect("fails instead of deploying an empty registry when credentials are mis
55
Effect.exit,
56
);
57
expect(Exit.isFailure(result)).toBe(true);
57
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
58
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
59
);
60
61
it.live("rejects reserved writer names without modifying credential stores", () =>
@@ -85,7 +86,7 @@ it.live("rejects reserved writer names without modifying credential stores", ()
86
expect(yield* fs.readFileString(`${state}/writers.json`)).toBe(writers);
87
expect(yield* fs.readFileString(`${state}/credentials.json`)).toBe(credentials);
88
}
88
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
89
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
90
);
91
92
it.effect("writes credentials for the supplied deployed worker endpoint", () =>
@@ -106,7 +107,7 @@ it.effect("writes credentials for the supplied deployed worker endpoint", () =>
107
const credential = JSON.parse(yield* fs.readFileString(file));
108
expect(credential.endpoint).toBe(endpoint);
109
expect(credential.name).toBe("maria");
109
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
110
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
111
);
112
113
it.effect("refuses a concurrent registry update without changing committed credentials", () =>
@@ -128,7 +129,7 @@ it.effect("refuses a concurrent registry update without changing committed crede
129
expect(Exit.isFailure(result)).toBe(true);
130
expect(yield* fs.readFileString(`${state}/writers.json`)).toBe('{"maria":"digest"}');
131
expect(yield* fs.exists(`${state}/theo.json`)).toBe(false);
131
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
132
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
133
);
134
135
it.effect("keeps the committed registry intact if a replacement write fails", () =>
@@ -160,7 +161,7 @@ it.effect("keeps the committed registry intact if a replacement write fails", ()
161
expect(Exit.isFailure(result)).toBe(true);
162
expect(yield* fs.readFileString(`${state}/writers.json`)).toBe(original);
163
expect(yield* fs.exists(`${state}/writers.lock`)).toBe(false);
163
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
164
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
165
);
166
167
it.effect("preserves filesystem errors when acquiring the registry lock", () =>
@@ -191,7 +192,7 @@ it.effect("preserves filesystem errors when acquiring the registry lock", () =>
192
Effect.flip,
193
);
194
expect(error).toBe(denied);
194
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
195
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
196
);
197
198
it.effect("refuses to initialize a missing writer registry implicitly", () =>
@@ -209,7 +210,7 @@ it.effect("refuses to initialize a missing writer registry implicitly", () =>
210
);
211
expect(Exit.isFailure(result)).toBe(true);
212
expect(yield* fs.exists(`${home}/.config/t3-task-cache/writers.json`)).toBe(false);
212
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
213
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
214
);
215
216
it.effect("keeps existing authorization if credential publication fails", () =>
@@ -243,5 +244,5 @@ it.effect("keeps existing authorization if credential publication fails", () =>
244
);
245
expect(Exit.isFailure(result)).toBe(true);
246
expect(yield* fs.readFileString(`${state}/writers.json`)).toBe(original);
246
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
247
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
248
);
infra/task-cache/src/WriterRegistry.ts
+6
-4
@@ -1,6 +1,7 @@
1
import * as Config from "effect/Config";
2
import * as Context from "effect/Context";
3
-import * as Crypto from "effect/Crypto";
3
+import * as Digest from "effect/crypto/Digest";
4
+import * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as Effect from "effect/Effect";
6
import * as FileSystem from "effect/FileSystem";
7
import type * as PlatformError from "effect/PlatformError";
@@ -47,7 +48,8 @@ export class WriterRegistry extends Context.Service<
48
49
const make = Effect.gen(function* () {
50
const fs = yield* FileSystem.FileSystem;
50
- const crypto = yield* Crypto.Crypto;
51
+ const random = yield* SecureRandom.SecureRandom;
52
+ const digest = yield* Digest.Digest;
53
const state = yield* stateDirectory;
54
const readWriters = Effect.fn("TaskCache.readWriters")(function* () {
55
return yield* decodeWriters(yield* fs.readFileString(`${state}/writers.json`));
@@ -105,10 +107,10 @@ const make = Effect.gen(function* () {
107
"Writer registry is missing. Copy the existing private registry from its administrator; use --new-registry only when creating a new cache.",
108
});
109
const writers = { ...(exists || revoke ? yield* readWriters() : {}) };
108
- const token = hex(yield* crypto.randomBytes(32));
110
+ const token = hex(yield* random.randomBytes(32));
111
if (revoke) delete writers[name];
112
else {
111
- writers[name] = hex(yield* crypto.digest("SHA-256", new TextEncoder().encode(token)));
113
+ writers[name] = hex(yield* digest.digest(Digest.sha256, new TextEncoder().encode(token)));
114
}
115
const entries: Array<readonly [string, string]> = [];
116
if (!revoke && endpoint)
packages/client-runtime/src/operations/commands.performance.test.ts
+5
-8
@@ -11,7 +11,7 @@ import {
11
type OrchestrationV2TurnItem,
12
} from "@t3tools/contracts";
13
import { describe, expect, it } from "@effect/vitest";
14
-import * as Crypto from "effect/Crypto";
14
+import * as SecureRandom from "effect/crypto/SecureRandom";
15
import * as Effect from "effect/Effect";
16
import * as Layer from "effect/Layer";
17
import * as Option from "effect/Option";
@@ -137,12 +137,9 @@ const TARGET = new PrimaryConnectionTarget({
137
wsBaseUrl: "wss://environment.example.test",
138
});
139
140
-const layerTestCrypto = Layer.succeed(
141
- Crypto.Crypto,
142
- Crypto.make({
143
- randomBytes: (size) => new Uint8Array(size),
144
- digest: (_algorithm, data) => Effect.succeed(data),
145
- }),
140
+const layerTestRandom = Layer.succeed(
141
+ SecureRandom.SecureRandom,
142
+ SecureRandom.make((size) => new Uint8Array(size)),
143
);
144
145
const makeSupervisor = Effect.fn("CommandPerformance.makeSupervisor")(function* (input: {
@@ -272,6 +269,6 @@ describe("routine command transport budget", () => {
269
});
270
expect(currentRpcJsonBytes).toBeLessThanOrEqual(MAX_CURRENT_SEND_RPC_JSON_BYTES);
271
expect(currentRpcJsonBytes / formerRpcJsonBytes).toBeLessThanOrEqual(0.000_06);
275
- }).pipe(Effect.provide(layerTestCrypto)),
272
+ }).pipe(Effect.provide(layerTestRandom)),
273
);
274
});
packages/client-runtime/src/operations/commands.test.ts
+14
-17
@@ -20,7 +20,7 @@ import {
20
type ProjectMutation,
21
} from "@t3tools/contracts";
22
import { describe, expect, it } from "@effect/vitest";
23
-import * as Crypto from "effect/Crypto";
23
+import * as SecureRandom from "effect/crypto/SecureRandom";
24
import * as Effect from "effect/Effect";
25
import * as Layer from "effect/Layer";
26
import * as Option from "effect/Option";
@@ -43,12 +43,9 @@ import {
43
startThreadTurn,
44
} from "./commands.ts";
45
46
-const layerTestCrypto = Layer.succeed(
47
- Crypto.Crypto,
48
- Crypto.make({
49
- randomBytes: (size) => new Uint8Array(size),
50
- digest: (_algorithm, data) => Effect.succeed(data),
51
- }),
46
+const layerTestRandom = Layer.succeed(
47
+ SecureRandom.SecureRandom,
48
+ SecureRandom.make((size) => new Uint8Array(size)),
49
);
50
51
const TARGET = new PrimaryConnectionTarget({
@@ -153,7 +150,7 @@ describe("V2 environment commands", () => {
150
{ type: "queued-run.start", commandId: "send-selected", threadId, runId: "selected" },
151
{ type: "queue.resume", commandId: "resume-queue", threadId },
152
]);
156
- }).pipe(Effect.provide(layerTestCrypto)),
153
+ }).pipe(Effect.provide(layerTestRandom)),
154
);
155
156
it.effect("preserves caller command ids for idempotent V2 commands", () =>
@@ -169,7 +166,7 @@ describe("V2 environment commands", () => {
166
expect(commands).toEqual([
167
{ type: "thread.archive", commandId: "queued-command", threadId: "thread-1" },
168
]);
172
- }).pipe(Effect.provide(layerTestCrypto)),
169
+ }).pipe(Effect.provide(layerTestRandom)),
170
);
171
172
it.effect("resolves run ordinal zero to the persisted thread-start checkpoint", () =>
@@ -213,7 +210,7 @@ describe("V2 environment commands", () => {
210
checkpointId,
211
},
212
]);
216
- }).pipe(Effect.provide(layerTestCrypto)),
213
+ }).pipe(Effect.provide(layerTestRandom)),
214
);
215
216
it.effect("preserves an existing worktree and branch during first-message launch", () =>
@@ -257,7 +254,7 @@ describe("V2 environment commands", () => {
254
branch: "feature",
255
},
256
});
260
- }).pipe(Effect.provide(layerTestCrypto)),
257
+ }).pipe(Effect.provide(layerTestRandom)),
258
);
259
260
it.effect("uses server-resolved delivery intent without fetching the full projection", () =>
@@ -293,7 +290,7 @@ describe("V2 environment commands", () => {
290
});
291
}
292
expect(projectionRequests).toEqual([]);
296
- }).pipe(Effect.provide(layerTestCrypto)),
293
+ }).pipe(Effect.provide(layerTestRandom)),
294
);
295
296
it.effect("Stop with no run left ends the thread's pull request watches", () =>
@@ -347,7 +344,7 @@ describe("V2 environment commands", () => {
344
watching: false,
345
},
346
]);
350
- }).pipe(Effect.provide(layerTestCrypto)),
347
+ }).pipe(Effect.provide(layerTestRandom)),
348
);
349
350
it.effect.each(["waiting", "completed", "rolled_back"] as const)(
@@ -418,7 +415,7 @@ describe("V2 environment commands", () => {
415
},
416
],
417
);
421
- }).pipe(Effect.provide(layerTestCrypto)),
418
+ }).pipe(Effect.provide(layerTestRandom)),
419
);
420
421
it.effect(
@@ -472,7 +469,7 @@ describe("V2 environment commands", () => {
469
subagentId,
470
},
471
]);
475
- }).pipe(Effect.provide(layerTestCrypto)),
472
+ }).pipe(Effect.provide(layerTestRandom)),
473
);
474
475
it.effect(
@@ -531,7 +528,7 @@ describe("V2 environment commands", () => {
528
},
529
{ type: "thread.stop", commandId: "lineage-stop", threadId: childThreadId },
530
]);
534
- }).pipe(Effect.provide(layerTestCrypto)),
531
+ }).pipe(Effect.provide(layerTestRandom)),
532
);
533
534
it.effect("stops a thread without relying on background work in the history window", () =>
@@ -559,6 +556,6 @@ describe("V2 environment commands", () => {
556
threadId: v2ThreadId,
557
},
558
]);
562
- }).pipe(Effect.provide(layerTestCrypto)),
559
+ }).pipe(Effect.provide(layerTestRandom)),
560
);
561
});
packages/client-runtime/src/operations/commands.ts
+3
-3
@@ -30,7 +30,7 @@ import {
30
} from "@t3tools/contracts";
31
import { derivePendingBackgroundWork } from "@t3tools/shared/orchestrationV2PendingBackgroundWork";
32
import { visibleThreadPullRequests } from "@t3tools/shared/threadPullRequests";
33
-import * as Crypto from "effect/Crypto";
33
+import * as SecureRandom from "effect/crypto/SecureRandom";
34
import * as Effect from "effect/Effect";
35
36
import { getInitialServerConfig, request } from "../rpc/client.ts";
@@ -270,8 +270,8 @@ const allocateCommandId = Effect.fn("EnvironmentCommands.allocateCommandId")(fun
270
input: CommandMetadata,
271
) {
272
if (input.commandId !== undefined) return input.commandId;
273
- const crypto = yield* Crypto.Crypto;
274
- return CommandId.make(yield* crypto.randomUUIDv4().pipe(Effect.orDie));
273
+ const random = yield* SecureRandom.SecureRandom;
274
+ return CommandId.make(yield* random.uuidV4());
275
});
276
277
const dispatch = (command: OrchestrationV2Command) =>
packages/client-runtime/src/state/projectCommands.test.ts
+3
-6
@@ -11,7 +11,7 @@ import {
11
WS_METHODS,
12
} from "@t3tools/contracts";
13
import { vi } from "vite-plus/test";
14
-import * as Crypto from "effect/Crypto";
14
+import * as SecureRandom from "effect/crypto/SecureRandom";
15
import * as Effect from "effect/Effect";
16
import * as Deferred from "effect/Deferred";
17
import * as Fiber from "effect/Fiber";
@@ -107,11 +107,8 @@ const makeHarness = Effect.fn("TestProjectCommands.makeHarness")(function* () {
107
Stream.provideService(stream, EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
108
} as EnvironmentRegistry.EnvironmentRegistry["Service"]),
109
Layer.succeed(
110
- Crypto.Crypto,
111
- Crypto.make({
112
- randomBytes: (size) => new Uint8Array(size),
113
- digest: (_algorithm, data) => Effect.succeed(data),
114
- }),
110
+ SecureRandom.SecureRandom,
111
+ SecureRandom.make((size) => new Uint8Array(size)),
112
),
113
),
114
);
packages/client-runtime/src/state/projectCommands.ts
+2
-2
@@ -5,7 +5,7 @@ import {
5
type ScopedProjectRef,
6
WS_METHODS,
7
} from "@t3tools/contracts";
8
-import * as Crypto from "effect/Crypto";
8
+import * as SecureRandom from "effect/crypto/SecureRandom";
9
import * as Effect from "effect/Effect";
10
import * as Option from "effect/Option";
11
import * as Predicate from "effect/Predicate";
@@ -73,7 +73,7 @@ export class ScratchProjectNotLoadedError extends Schema.TaggedError<ScratchProj
73
}
74
75
export function createProjectEnvironmentAtoms<R, E>(
76
- runtime: Atom.AtomRuntime<EnvironmentRegistry | Crypto.Crypto | R, E>,
76
+ runtime: Atom.AtomRuntime<EnvironmentRegistry | SecureRandom.SecureRandom | R, E>,
77
options: {
78
readonly projectAtom: (ref: ScopedProjectRef) => Atom.Atom<EnvironmentProject | null>;
79
},
packages/client-runtime/src/state/threadCommands.test.ts
+3
-6
@@ -13,7 +13,7 @@ import {
13
type OrchestrationV2ShellSnapshot,
14
} from "@t3tools/contracts";
15
import * as DateTime from "effect/DateTime";
16
-import * as Crypto from "effect/Crypto";
16
+import * as SecureRandom from "effect/crypto/SecureRandom";
17
import * as Deferred from "effect/Deferred";
18
import * as Effect from "effect/Effect";
19
import * as Exit from "effect/Exit";
@@ -117,11 +117,8 @@ const makeHarness = Effect.fn("TestThreadCommands.makeHarness")(function* (optio
117
Effect.provideService(effect, EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
118
} as EnvironmentRegistry.EnvironmentRegistry["Service"]),
119
Layer.succeed(
120
- Crypto.Crypto,
121
- Crypto.make({
122
- randomBytes: (size) => new Uint8Array(size),
123
- digest: (_algorithm, data) => Effect.succeed(data),
124
- }),
120
+ SecureRandom.SecureRandom,
121
+ SecureRandom.make((size) => new Uint8Array(size)),
122
),
123
Layer.succeed(
124
ThreadHistoryController.ThreadHistoryController,
packages/client-runtime/src/state/threadCommands.ts
+2
-2
@@ -1,5 +1,5 @@
1
import type { ThreadId } from "@t3tools/contracts";
2
-import * as Crypto from "effect/Crypto";
2
+import * as SecureRandom from "effect/crypto/SecureRandom";
3
import * as Effect from "effect/Effect";
4
import * as Option from "effect/Option";
5
import { Atom } from "effect/reactivity";
@@ -69,7 +69,7 @@ export type LoadEarlierThreadHistoryInput = {
69
};
70
71
export function createThreadEnvironmentAtoms<R, E>(
72
- runtime: Atom.AtomRuntime<EnvironmentRegistry | Crypto.Crypto | R, E>,
72
+ runtime: Atom.AtomRuntime<EnvironmentRegistry | SecureRandom.SecureRandom | R, E>,
73
snapshotAtom: (environmentId: EnvironmentId) => Atom.Atom<OrchestrationV2ShellSnapshot | null>,
74
) {
75
const scheduler = createAtomCommandScheduler();
packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
+10
-3
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { describe, expect, it } from "@effect/vitest";
4
import {
@@ -58,7 +59,10 @@ function layerResolver(
59
) {
60
return Layer.mergeAll(
61
NodeServices.layer,
61
- TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
62
+ NodeCrypto.layer,
63
+ TestProviderHost.layer().pipe(
64
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
65
+ ),
66
Layer.succeed(HostProcess.Platform, "linux"),
67
Layer.succeed(HostProcess.Architecture, "x64"),
68
Layer.succeed(HostProcess.Environment, environment),
@@ -756,7 +760,10 @@ describe("AcpRegistrySupport", () => {
760
Effect.provide(
761
Layer.mergeAll(
762
NodeServices.layer,
759
- TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
763
+ NodeCrypto.layer,
764
+ TestProviderHost.layer().pipe(
765
+ Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
766
+ ),
767
),
768
),
769
Effect.provideService(HostProcess.Platform, "linux"),
@@ -1762,6 +1769,6 @@ describe("acpRegistryManagedBinaryDirectories", () => {
1769
architecture: "x64",
1770
});
1771
expect(missing).toEqual([]);
1765
- }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
1772
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)), Effect.scoped),
1773
);
1774
});
packages/provider-acp-registry/src/server/AcpRegistrySupport.ts
+8
-5
@@ -23,7 +23,8 @@ import {
23
import * as Clock from "effect/Clock";
24
import * as Context from "effect/Context";
25
import * as Duration from "effect/Duration";
26
-import * as Crypto from "effect/Crypto";
26
+import * as Digest from "effect/crypto/Digest";
27
+import * as SecureRandom from "effect/crypto/SecureRandom";
28
import * as Effect from "effect/Effect";
29
import * as Hex from "effect/encoding/Hex";
30
import * as FileSystem from "effect/FileSystem";
@@ -631,15 +632,17 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
632
AcpRegistryCatalog["Service"],
633
never,
634
| ChildProcessSpawner.ChildProcessSpawner
634
- | Crypto.Crypto
635
+ | SecureRandom.SecureRandom
636
+ | Digest.Digest
637
| FileSystem.FileSystem
638
| HttpClient.HttpClient
639
| Path.Path
640
| ProviderHost.ProviderHost
641
> {
640
- const crypto = yield* Crypto.Crypto;
642
+ const random = yield* SecureRandom.SecureRandom;
643
+ const digester = yield* Digest.Digest;
644
const sha256Hex = (data: Uint8Array) =>
642
- crypto.digest("SHA-256", data).pipe(Effect.map(Hex.encode), Effect.orDie);
645
+ digester.digest(Digest.sha256, data).pipe(Effect.map(Hex.encode), Effect.orDie);
646
const fileSystem = yield* FileSystem.FileSystem;
647
const path = yield* Path.Path;
648
const httpClient = yield* HttpClient.HttpClient;
@@ -776,7 +779,7 @@ export const makeAcpRegistryCatalog = Effect.fn("AcpRegistryCatalog.make")(funct
779
.pipe(Effect.flatMap(decodeRegistryText), Effect.option);
780
781
const writeRegistryCache = (text: string) =>
779
- crypto.randomUUIDv4().pipe(
782
+ random.uuidV4().pipe(
783
Effect.flatMap((id) => {
784
const temporaryPath = `${registryCachePath}.${process.pid}-${id}.tmp`;
785
return fileSystem
packages/provider-acp-registry/src/server/adapter.ts
+4
-4
@@ -20,7 +20,7 @@ import { readCustomModelEntries } from "@t3tools/shared/model";
20
import { AcpRegistrySettings } from "../settings.ts";
21
import * as HostProcess from "@t3tools/shared/HostProcess";
22
import { resolveSelfInvocation, type SelfInvocation } from "@t3tools/shared/nodeRuntime";
23
-import * as Crypto from "effect/Crypto";
23
+import * as SecureRandom from "effect/crypto/SecureRandom";
24
import * as Effect from "effect/Effect";
25
import * as FileSystem from "effect/FileSystem";
26
import * as Path from "effect/Path";
@@ -77,7 +77,7 @@ export interface AcpRegistryAdapterV2Options {
77
) => Effect.Effect<
78
AcpSessionRuntime.AcpSessionRuntime["Service"],
79
EffectAcpErrors.AcpError,
80
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
80
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom | Scope.Scope
81
>;
82
readonly continuationRequests?: Parameters<typeof makeAcpAdapterV2>[0]["continuationRequests"];
83
readonly assertComplete?: Effect.Effect<void, EffectAcpErrors.AcpError>;
@@ -139,7 +139,7 @@ function makeAcpRegistryRuntime(
139
): Effect.Effect<
140
AcpSessionRuntime.AcpSessionRuntime["Service"],
141
EffectAcpErrors.AcpError,
142
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
142
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom | Scope.Scope
143
> =>
144
Effect.gen(function* () {
145
const { processEnvironment, ...runtimeInput } = input;
@@ -310,7 +310,7 @@ export const makeAcpRegistryAdapterV2 = Effect.fn("makeAcpRegistryAdapterV2")(fu
310
311
export type AcpRegistryAdapterV2DriverEnv =
312
| ChildProcessSpawner.ChildProcessSpawner
313
- | Crypto.Crypto
313
+ | SecureRandom.SecureRandom
314
| FileSystem.FileSystem
315
| AcpRegistrySupport.AcpRegistryCatalog
316
| IdAllocator.IdAllocatorV2
packages/provider-acp-registry/src/server/auth.test.ts
+7
-5
@@ -1,4 +1,6 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { assert, it } from "@effect/vitest";
5
import { ProviderInstanceId, type ProviderAuthState } from "@t3tools/contracts";
6
import { AcpRegistrySettings } from "../settings.ts";
@@ -230,7 +232,7 @@ it.effect("keeps local credentials separate from a matching registry agent ID",
232
owner: "provider",
233
key: "acp:local:test-agent",
234
});
233
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
235
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
236
);
237
238
it.effect(
@@ -264,7 +266,7 @@ it.effect(
266
assert.deepEqual(h.closed, [1, 2]);
267
yield* h.controller.logout(Effect.void);
268
assert.deepEqual(h.changed, [true, false]);
267
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
269
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
270
);
271
272
it.effect(
@@ -308,7 +310,7 @@ it.effect(
310
yield* h.phase("succeeded");
311
assert.deepEqual(h.started, [3]);
312
assert.deepEqual(h.changed, [true]);
311
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
313
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
314
);
315
316
it.effect("cancels the login PTY and rejects further terminal input", () =>
@@ -329,7 +331,7 @@ it.effect("cancels the login PTY and rejects further terminal input", () =>
331
}).pipe(Effect.result))._tag,
332
"Failure",
333
);
332
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
334
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
335
);
336
337
it.effect("does not report authentication when post-login verification fails", () =>
@@ -343,5 +345,5 @@ it.effect("does not report authentication when post-login verification fails", (
345
yield* h.phase("failed");
346
assert.deepEqual(h.changed, []);
347
assert.isTrue(h.killed());
346
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
348
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
349
);
packages/provider-acp-registry/src/server/auth.ts
+3
-3
@@ -4,7 +4,7 @@ import {
4
type ProviderInstanceId,
5
} from "@t3tools/contracts";
6
import type { AcpRegistrySettings } from "../settings.ts";
7
-import * as Crypto from "effect/Crypto";
7
+import * as SecureRandom from "effect/crypto/SecureRandom";
8
import * as Deferred from "effect/Deferred";
9
import * as Effect from "effect/Effect";
10
import * as Exit from "effect/Exit";
@@ -39,7 +39,7 @@ export const makeAcpRegistryAuth = Effect.fn("makeAcpRegistryAuth")(function* (o
39
}) {
40
const catalog = yield* AcpRegistrySupport.AcpRegistryCatalog;
41
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
42
- const crypto = yield* Crypto.Crypto;
42
+ const random = yield* SecureRandom.SecureRandom;
43
const pty = yield* Effect.serviceOption(PtyAdapter.PtyAdapter);
44
const coordinator = yield* Effect.serviceOption(
45
AcpRegistryRuntimeCoordinator.AcpRegistryRuntimeCoordinator,
@@ -75,7 +75,7 @@ export const makeAcpRegistryAuth = Effect.fn("makeAcpRegistryAuth")(function* (o
75
Layer.provide(
76
Layer.mergeAll(
77
Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
78
- Layer.succeed(Crypto.Crypto, crypto),
78
+ Layer.succeed(SecureRandom.SecureRandom, random),
79
),
80
),
81
),
packages/provider-acp-registry/src/server/authenticationState.test.ts
+3
-1
@@ -1,4 +1,6 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { assert, it } from "@effect/vitest";
5
import { ProviderInstanceId } from "@t3tools/contracts";
6
import { AcpRegistrySettings } from "../settings.ts";
@@ -10,7 +12,7 @@ import { makeAcpRegistryAuthenticationState } from "./authenticationState.ts";
12
13
const settings = Schema.decodeSync(AcpRegistrySettings)({ agentId: "devin" });
14
13
-it.layer(NodeServices.layer)("ACP sign-in confirmation", (it) => {
15
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("ACP sign-in confirmation", (it) => {
16
it.effect("restores explicit sign-in across driver recreation and server restart", () =>
17
Effect.gen(function* () {
18
const fs = yield* FileSystem.FileSystem;
packages/provider-acp-registry/src/server/authenticationState.ts
+5
-3
@@ -1,6 +1,6 @@
1
import type { ProviderInstanceEnvironment, ProviderInstanceId } from "@t3tools/contracts";
2
import type { AcpRegistrySettings } from "../settings.ts";
3
-import * as Crypto from "effect/Crypto";
3
+import * as Digest from "effect/crypto/Digest";
4
import * as Effect from "effect/Effect";
5
import * as Hex from "effect/encoding/Hex";
6
import * as FileSystem from "effect/FileSystem";
@@ -16,9 +16,11 @@ const decodeState = Schema.decodeUnknownEffect(
16
);
17
const encodeJson = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown));
18
const hash = Effect.fn("AcpRegistryAuthenticationState.hash")(function* (value: unknown) {
19
- const crypto = yield* Crypto.Crypto;
19
+ const crypto = yield* Digest.Digest;
20
const json = yield* encodeJson(value).pipe(Effect.orDie);
21
- const digest = yield* crypto.digest("SHA-256", new TextEncoder().encode(json)).pipe(Effect.orDie);
21
+ const digest = yield* crypto
22
+ .digest(Digest.sha256, new TextEncoder().encode(json))
23
+ .pipe(Effect.orDie);
24
return Hex.encode(digest);
25
});
26
packages/provider-acp-registry/src/server/driver.ts
+12
-8
@@ -11,7 +11,8 @@ import { AcpRegistrySettings } from "../settings.ts";
11
import * as HostProcess from "@t3tools/shared/HostProcess";
12
import { createModelCapabilities } from "@t3tools/shared/model";
13
import * as Clock from "effect/Clock";
14
-import * as Crypto from "effect/Crypto";
14
+import * as Digest from "effect/crypto/Digest";
15
+import * as SecureRandom from "effect/crypto/SecureRandom";
16
import * as DateTime from "effect/DateTime";
17
import * as Effect from "effect/Effect";
18
import * as Option from "effect/Option";
@@ -463,7 +464,10 @@ export const checkAcpRegistryProviderReadiness = Effect.fn(
464
: snapshot;
465
});
466
466
-export type AcpRegistryDriverEnv = AcpRegistryAdapterV2DriverEnv | ProviderHost.ProviderHost;
467
+export type AcpRegistryDriverEnv =
468
+ | AcpRegistryAdapterV2DriverEnv
469
+ | Digest.Digest
470
+ | ProviderHost.ProviderHost;
471
472
export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryDriverEnv> = {
473
driverKind: DRIVER_KIND,
@@ -495,7 +499,7 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD
499
.pipe(Effect.andThen(runtimeCoordinator.value.clearLiveConfiguration(instanceId))),
500
);
501
}
498
- const crypto = yield* Crypto.Crypto;
502
+ const random = yield* SecureRandom.SecureRandom;
503
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
504
const hostEnvironment = yield* HostProcess.Environment;
505
const host = yield* ProviderHost.ProviderHost;
@@ -591,7 +595,7 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD
595
).pipe(
596
Effect.provideService(AcpRegistrySupport.AcpRegistryCatalog, catalog),
597
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
594
- Effect.provideService(Crypto.Crypto, crypto),
598
+ Effect.provideService(SecureRandom.SecureRandom, random),
599
);
600
const enrichmentCache = yield* Ref.make<{
601
readonly generation: number;
@@ -752,13 +756,13 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD
756
E,
757
| AcpRegistrySupport.AcpRegistryCatalog
758
| ChildProcessSpawner.ChildProcessSpawner
755
- | Crypto.Crypto
759
+ | SecureRandom.SecureRandom
760
>,
761
): Effect.Effect<A, E> => {
762
const provided = effect.pipe(
763
Effect.provideService(AcpRegistrySupport.AcpRegistryCatalog, catalog),
764
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
761
- Effect.provideService(Crypto.Crypto, crypto),
765
+ Effect.provideService(SecureRandom.SecureRandom, random),
766
);
767
return Option.isSome(runtimeCoordinator)
768
? provided.pipe(
@@ -792,7 +796,7 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD
796
}).pipe(
797
Effect.provideService(AcpRegistrySupport.AcpRegistryCatalog, catalog),
798
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
795
- Effect.provideService(Crypto.Crypto, crypto),
799
+ Effect.provideService(SecureRandom.SecureRandom, random),
800
);
801
const auth = {
802
...controller,
@@ -881,7 +885,7 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD
885
}).pipe(
886
Effect.provideService(AcpRegistrySupport.AcpRegistryCatalog, catalog),
887
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
884
- Effect.provideService(Crypto.Crypto, crypto),
888
+ Effect.provideService(SecureRandom.SecureRandom, random),
889
Effect.tap(() => confirmedAuthentication.set(false)),
890
Effect.tap(() =>
891
liveSnapshotSemaphore.withPermit(
packages/provider-acp-registry/src/server/probe.ts
+8
-6
@@ -11,7 +11,7 @@ import {
11
type ServerProviderSlashCommand,
12
} from "@t3tools/contracts";
13
import { AcpRegistrySettings } from "../settings.ts";
14
-import * as Crypto from "effect/Crypto";
14
+import * as SecureRandom from "effect/crypto/SecureRandom";
15
import * as Deferred from "effect/Deferred";
16
import * as Duration from "effect/Duration";
17
import * as Effect from "effect/Effect";
@@ -320,11 +320,13 @@ export const probeAcpRegistryConfiguration = Effect.fn("AcpRegistryProbe.probeCo
320
): Effect.fn.Return<
321
AcpRegistryConfigurationProbeResult,
322
AcpRegistryOperationError,
323
- AcpRegistrySupport.AcpRegistryCatalog | ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto
323
+ | AcpRegistrySupport.AcpRegistryCatalog
324
+ | ChildProcessSpawner.ChildProcessSpawner
325
+ | SecureRandom.SecureRandom
326
> {
327
const catalog = yield* AcpRegistrySupport.AcpRegistryCatalog;
328
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
327
- const crypto = yield* Crypto.Crypto;
329
+ const random = yield* SecureRandom.SecureRandom;
330
const pty = yield* Effect.serviceOption(PtyAdapter.PtyAdapter);
331
332
const result = yield* Effect.gen(function* () {
@@ -362,7 +364,7 @@ export const probeAcpRegistryConfiguration = Effect.fn("AcpRegistryProbe.probeCo
364
Layer.provide(
365
Layer.mergeAll(
366
Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, childProcessSpawner),
365
- Layer.succeed(Crypto.Crypto, crypto),
367
+ Layer.succeed(SecureRandom.SecureRandom, random),
368
),
369
),
370
),
@@ -463,7 +465,7 @@ const makeAcpRegistryManagementRuntime = Effect.fn("AcpRegistryProbe.makeManagem
465
function* (input: AcpRegistryManagementInput) {
466
const catalog = yield* AcpRegistrySupport.AcpRegistryCatalog;
467
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
466
- const crypto = yield* Crypto.Crypto;
468
+ const random = yield* SecureRandom.SecureRandom;
469
const runtimeCoordinator = yield* Effect.serviceOption(
470
AcpRegistryRuntimeCoordinator.AcpRegistryRuntimeCoordinator,
471
);
@@ -487,7 +489,7 @@ const makeAcpRegistryManagementRuntime = Effect.fn("AcpRegistryProbe.makeManagem
489
Layer.provide(
490
Layer.mergeAll(
491
Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, childProcessSpawner),
490
- Layer.succeed(Crypto.Crypto, crypto),
492
+ Layer.succeed(SecureRandom.SecureRandom, random),
493
),
494
),
495
),
packages/provider-acp/src/server/AcpSessionRuntime.ts
+5
-5
@@ -6,7 +6,7 @@ import * as NodePath from "node:path";
6
import * as Cause from "effect/Cause";
7
import * as Clock from "effect/Clock";
8
import * as Context from "effect/Context";
9
-import * as Crypto from "effect/Crypto";
9
+import * as SecureRandom from "effect/crypto/SecureRandom";
10
import * as Deferred from "effect/Deferred";
11
import * as Duration from "effect/Duration";
12
import * as Effect from "effect/Effect";
@@ -1240,16 +1240,16 @@ export const make = Effect.fn("AcpSessionRuntime.make")(function* (
1240
): Effect.fn.Return<
1241
AcpSessionRuntime["Service"],
1242
EffectAcpErrors.AcpError,
1243
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
1243
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom | Scope.Scope
1244
> {
1245
- const crypto = yield* Crypto.Crypto;
1245
+ const random = yield* SecureRandom.SecureRandom;
1246
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
1247
const runtimeScope = yield* Scope.fork(yield* Scope.Scope);
1248
const eventQueue = yield* Queue.unbounded<AcpSessionRuntimeEvent>();
1249
const modeStateRef = yield* Ref.make<AcpSessionModeState | undefined>(undefined);
1250
const toolCallsRef = yield* Ref.make(new Map<string, AcpToolCallTrackedState>());
1251
const shownToolCallIds = new Set<string>();
1252
- const assistantItemRuntimeId = yield* crypto.randomUUIDv4().pipe(
1252
+ const assistantItemRuntimeId = yield* random.uuidV4().pipe(
1253
Effect.mapError(
1254
(cause) =>
1255
new EffectAcpErrors.AcpTransportError({
@@ -2727,7 +2727,7 @@ export const layer = (
2727
): Layer.Layer<
2728
AcpSessionRuntime,
2729
EffectAcpErrors.AcpError,
2730
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto
2730
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom
2731
> => Layer.effect(AcpSessionRuntime, make(options));
2732
2733
function sessionConfigOptionsFromSetup(
packages/provider-acp/src/server/adapter.ts
+6
-6
@@ -43,7 +43,7 @@ import { compactDynamicToolOutput, htmlRenderFromToolItem } from "@t3tools/share
43
import { FILE_HEADERS_ONLY, formatPatch, structuredPatch } from "diff";
44
import * as Cause from "effect/Cause";
45
import * as Clock from "effect/Clock";
46
-import * as Crypto from "effect/Crypto";
46
+import * as SecureRandom from "effect/crypto/SecureRandom";
47
import * as DateTime from "effect/DateTime";
48
import * as Deferred from "effect/Deferred";
49
import * as Duration from "effect/Duration";
@@ -345,7 +345,7 @@ export interface AcpAdapterV2Flavor {
345
) => Effect.Effect<
346
AcpSessionRuntime.AcpSessionRuntime["Service"],
347
EffectAcpErrors.AcpError,
348
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
348
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom | Scope.Scope
349
>;
350
readonly customModels?: ReadonlyArray<string>;
351
readonly resolveModelId?: (selection: ModelSelection) => string | undefined;
@@ -1641,7 +1641,7 @@ function shouldPersistToolUpdate(
1641
export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
1642
options: AcpAdapterV2Options,
1643
) {
1644
- const crypto = yield* Crypto.Crypto;
1644
+ const random = yield* SecureRandom.SecureRandom;
1645
const fileSystem = yield* FileSystem.FileSystem;
1646
const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
1647
const agentScope = yield* AgentScope;
@@ -6745,7 +6745,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
6745
const mcpBridge = yield* makeAcpMcpOverAcpBridge({
6746
endpoint: mcpContext.endpoint,
6747
authorization: mcpContext.authorization,
6748
- allocateConnectionId: crypto.randomUUIDv4().pipe(Effect.orDie),
6748
+ allocateConnectionId: random.uuidV4(),
6749
});
6750
yield* Scope.addFinalizer(scope, mcpBridge.dispose);
6751
return mcpBridge;
@@ -6766,7 +6766,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
6766
.makeRuntime(makeRuntimeInput(runtimeGeneration, mcpContext, resumeSessionId))
6767
.pipe(
6768
Effect.provideService(Scope.Scope, runtimeScope),
6769
- Effect.provideService(Crypto.Crypto, crypto),
6769
+ Effect.provideService(SecureRandom.SecureRandom, random),
6770
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, childProcessSpawner),
6771
Effect.provideService(AgentScope, agentScope),
6772
Effect.provideService(AgentScopeThreadId, threadId ?? undefined),
@@ -6845,7 +6845,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
6845
)
6846
.pipe(
6847
Effect.provideService(Scope.Scope, replacementScope),
6848
- Effect.provideService(Crypto.Crypto, crypto),
6848
+ Effect.provideService(SecureRandom.SecureRandom, random),
6849
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, childProcessSpawner),
6850
Effect.provideService(AgentScope, agentScope),
6851
Effect.provideService(AgentScopeThreadId, threadId ?? undefined),
packages/provider-acp/src/server/nativeLogging.test.ts
+3
-1
@@ -1,4 +1,6 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { ProviderDriverKind, ThreadId } from "@t3tools/contracts";
5
import { assert, it } from "@effect/vitest";
6
import * as Cause from "effect/Cause";
@@ -10,7 +12,7 @@ import * as AcpErrors from "effect-acp/errors";
12
import type * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
13
import { makeAcpNativeLoggerFactory } from "./nativeLogging.ts";
14
13
-const nodeServicesIt = it.layer(NodeServices.layer);
15
+const nodeServicesIt = it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer));
16
const encodeUnknownJson = Schema.encodeUnknownSync(Schema.fromJsonString(Schema.Unknown));
17
18
nodeServicesIt("ACP native logging", (it) => {
packages/provider-acp/src/server/nativeLogging.ts
+3
-3
@@ -1,7 +1,7 @@
1
import type { ProviderDriverKind, ThreadId } from "@t3tools/contracts";
2
import { causeErrorTag } from "@t3tools/shared/observability";
3
import * as Cause from "effect/Cause";
4
-import * as Crypto from "effect/Crypto";
4
+import * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as DateTime from "effect/DateTime";
6
import * as Effect from "effect/Effect";
7
@@ -28,7 +28,7 @@ function formatRequestLogPayload(event: AcpSessionRuntime.AcpSessionRequestLogEv
28
}
29
30
export const makeAcpNativeLoggerFactory = Effect.fn("makeAcpNativeLoggerFactory")(function* () {
31
- const crypto = yield* Crypto.Crypto;
31
+ const random = yield* SecureRandom.SecureRandom;
32
return (input: {
33
readonly nativeEventLogger: ProviderEventLoggers.EventNdjsonLogger | undefined;
34
readonly provider: ProviderDriverKind;
@@ -42,7 +42,7 @@ export const makeAcpNativeLoggerFactory = Effect.fn("makeAcpNativeLoggerFactory"
42
{
43
observedAt,
44
event: {
45
- id: yield* crypto.randomUUIDv4(),
45
+ id: yield* random.uuidV4(),
46
kind: logInput.kind,
47
provider: input.provider,
48
createdAt: observedAt,
packages/provider-core/src/server/maintenanceResolver.test.ts
+11
-6
@@ -1,12 +1,13 @@
1
// @effect-diagnostics nodeBuiltinImport:off
2
import { expect, it } from "@effect/vitest";
3
import * as NodeFS from "node:fs";
4
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
5
import * as NodeServices from "@effect/platform-node/NodeServices";
6
import * as NodeOS from "node:os";
7
import * as NodePath from "node:path";
8
import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";
9
import * as HostProcess from "@t3tools/shared/HostProcess";
9
-import * as Crypto from "effect/Crypto";
10
+import * as SecureRandom from "effect/crypto/SecureRandom";
11
import * as Deferred from "effect/Deferred";
12
import * as Effect from "effect/Effect";
13
import * as Fiber from "effect/Fiber";
@@ -44,8 +45,8 @@ const driver = (value: string) => ProviderDriverKind.make(value);
45
// Shell stubs use POSIX paths; Windows temp paths cannot split on colon.
46
const windowsHost = HostProcess.Platform.defaultValue() === "win32";
47
const makeTempDir = (name: string) =>
47
- Crypto.Crypto.pipe(
48
- Effect.flatMap((crypto) => crypto.randomUUIDv4()),
48
+ SecureRandom.SecureRandom.pipe(
49
+ Effect.flatMap((random) => random.uuidV4()),
50
Effect.map((id) => NodePath.join(NodeFS.realpathSync(NodeOS.tmpdir()), `${name}-${id}`)),
51
);
52
const isNativeTestCommandPath =
@@ -131,7 +132,11 @@ function stdoutSpawner(
132
}
133
134
it.layer(
134
- NodeServices.layer.pipe(Layer.merge(Layer.succeed(HostProcess.Environment, { PATH: "" }))),
135
+ Layer.mergeAll(
136
+ NodeServices.layer,
137
+ NodeCrypto.layer,
138
+ Layer.succeed(HostProcess.Environment, { PATH: "" }),
139
+ ),
140
)("providerMaintenance", (it) => {
141
it.effect("prefers the installer's own latest version over the npm registry", () =>
142
resolveLatestProviderVersion({ ...manualPackageTool, latestVersion: "1.2.0" }).pipe(
@@ -706,7 +711,7 @@ it.layer(
711
maintenanceCapabilities: capabilities,
712
}),
713
).toMatchObject({ status: "current", canUpdate: false, canInstallVersion: false });
709
- }).pipe(Effect.provide(NodeServices.layer)),
714
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
715
);
716
717
it.effect("stays unknown when choco search fails instead of asking npm", () =>
@@ -737,7 +742,7 @@ it.layer(
742
);
743
744
expect(latest).toBeNull();
740
- }).pipe(Effect.provide(NodeServices.layer)),
745
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
746
);
747
748
it.effect.each([
packages/provider-core/src/server/providerAuthFlow.test.ts
+16
-14
@@ -1,4 +1,6 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { assert, it } from "@effect/vitest";
5
import {
6
ProviderInstanceId,
@@ -41,7 +43,7 @@ it.effect("distinguishes pending method discovery from an agent with no sign-in
43
Effect.map(Option.getOrThrow),
44
);
45
assert.deepEqual(ready.methods, []);
44
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
46
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
47
);
48
49
const makeHarness = Effect.gen(function* () {
@@ -112,7 +114,7 @@ it.effect("requires owner consent and provider verification before success", ()
114
yield* phase("verifying");
115
yield* Deferred.succeed(verified, undefined);
116
assert.strictEqual((yield* phase("succeeded")).phase, "succeeded");
115
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
117
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
118
);
119
120
it.effect("cancellation rejects late consent and permits another login", () =>
@@ -132,7 +134,7 @@ it.effect("cancellation rejects late consent and permits another login", () =>
134
);
135
const next = yield* controller.start("other");
136
assert.notStrictEqual(next.flowId, state.flowId);
135
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
137
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
138
);
139
140
it.effect("closes admitted provider processes and blocks new ones while login is pending", () =>
@@ -152,7 +154,7 @@ it.effect("closes admitted provider processes and blocks new ones while login is
154
assert.isTrue(
155
(yield* controller.withAccess!(Effect.void).pipe(Effect.result))._tag === "Failure",
156
);
155
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
157
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
158
);
159
160
it.effect("shared credential invalidation closes admitted processes before permitting reuse", () =>
@@ -169,7 +171,7 @@ it.effect("shared credential invalidation closes admitted processes before permi
171
yield* controller.invalidate!;
172
assert.isTrue(closed);
173
assert.strictEqual(yield* controller.withAccess!(Effect.succeed("new process")), "new process");
172
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
174
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
175
);
176
177
it.effect.each([
@@ -234,7 +236,7 @@ it.effect.each([
236
assert.isNull(verifying.interaction);
237
assert.notInclude(verifying.message ?? "", "private-token");
238
yield* controller.cancel("owner", state.flowId!);
237
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
239
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
240
);
241
242
it.effect("shows a device code only to its owner without treating it as authenticated", () =>
@@ -268,7 +270,7 @@ it.effect("shows a device code only to its owner without treating it as authenti
270
assert.isNull(other.interaction);
271
assert.isNull(other.authorizationUrl);
272
yield* controller.cancel("owner", start.flowId!);
271
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
273
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
274
);
275
276
it.effect.each([
@@ -302,7 +304,7 @@ it.effect.each([
304
Effect.map(Option.getOrThrow),
305
);
306
assert.strictEqual(failed.message, message);
305
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
307
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
308
);
309
310
const makeBlockingResponseHarness = Effect.gen(function* () {
@@ -393,7 +395,7 @@ it.effect.each(["cancel", "logout"] as const)(
395
assert.isTrue(Exit.isFailure(yield* Fiber.join(harness.response)));
396
assert.isFalse(yield* harness.controller.isChangingCredentials!);
397
assert.notEqual((yield* harness.controller.start("other")).flowId, harness.input.flowId);
396
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
398
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
399
);
400
401
it.effect(
@@ -415,7 +417,7 @@ it.effect(
417
assert.isTrue(yield* Deferred.isDone(harness.cleanupFinished));
418
assert.isTrue(Exit.isFailure(yield* Fiber.join(harness.response)));
419
yield* harness.controller.withAccess!(Effect.void);
418
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
420
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
421
);
422
423
it.effect("closing the controller scope interrupts and drains its adapter response", () =>
@@ -431,7 +433,7 @@ it.effect("closing the controller scope interrupts and drains its adapter respon
433
yield* Fiber.join(closing);
434
assert.isTrue(yield* Deferred.isDone(harness.cleanupFinished));
435
assert.isTrue(Exit.isFailure(yield* Fiber.join(harness.response)));
434
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
436
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
437
);
438
439
it.effect("a failed method refresh keeps the last discovered methods", () =>
@@ -458,7 +460,7 @@ it.effect("a failed method refresh keeps the last discovered methods", () =>
460
.pipe(Stream.runHead, Effect.map(Option.getOrThrow));
461
assert.deepEqual(state.methods, [method]);
462
assert.strictEqual(state.message, "interrupted");
461
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
463
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
464
);
465
466
it.effect("rebuilding a controller leaves sessions it admitted to their owners", () =>
@@ -475,7 +477,7 @@ it.effect("rebuilding a controller leaves sessions it admitted to their owners",
477
);
478
yield* Scope.close(scope, Exit.void);
479
assert.isFalse(closed);
478
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
480
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
481
);
482
483
it.effect("profile import stops owned sessions and gates access until credentials are saved", () =>
@@ -514,5 +516,5 @@ it.effect("profile import stops owned sessions and gates access until credential
516
yield* controller.withAccess!(Effect.succeed("new credential process")),
517
"new credential process",
518
);
517
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
519
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
520
);
packages/provider-core/src/server/providerAuthFlow.ts
+3
-3
@@ -10,7 +10,7 @@ import * as Cause from "effect/Cause";
10
import * as Option from "effect/Option";
11
import * as Schema from "effect/Schema";
12
import * as Clock from "effect/Clock";
13
-import * as Crypto from "effect/Crypto";
13
+import * as SecureRandom from "effect/crypto/SecureRandom";
14
import * as DateTime from "effect/DateTime";
15
import * as Effect from "effect/Effect";
16
import * as Deferred from "effect/Deferred";
@@ -72,7 +72,7 @@ export const make = Effect.fn("ProviderAuthFlow.make")(function* (options: {
72
readonly timeoutMs?: number;
73
}) {
74
const scope = yield* Scope.Scope;
75
- const crypto = yield* Crypto.Crypto;
75
+ const random = yield* SecureRandom.SecureRandom;
76
const lock = yield* Semaphore.make(1);
77
const timeoutMs = options.timeoutMs ?? 300_000;
78
const empty: ProviderAuthState = {
@@ -238,7 +238,7 @@ export const make = Effect.fn("ProviderAuthFlow.make")(function* (options: {
238
operation: "start",
239
detail: "Provider setup is already in progress.",
240
});
241
- const id = yield* crypto.randomUUIDv4().pipe(
241
+ const id = yield* random.uuidV4().pipe(
242
Effect.mapError(
243
() =>
244
new ProviderSetupError({
packages/provider-cursor/src/server/CursorAccountReader.ts
+2
-2
@@ -1,5 +1,5 @@
1
import * as Context from "effect/Context";
2
-import * as Crypto from "effect/Crypto";
2
+import * as Digest from "effect/crypto/Digest";
3
import * as Effect from "effect/Effect";
4
import * as FileSystem from "effect/FileSystem";
5
import * as HttpClient from "effect/http/HttpClient";
@@ -25,7 +25,7 @@ export const layer = Layer.effect(
25
Effect.gen(function* () {
26
const keychain = yield* CursorKeychain.CursorKeychain;
27
const context = yield* Effect.context<
28
- FileSystem.FileSystem | Crypto.Crypto | HttpClient.HttpClient
28
+ FileSystem.FileSystem | Digest.Digest | HttpClient.HttpClient
29
>();
30
return CursorAccountReader.of({
31
read: Effect.fn("CursorAccountReader.read")(function (credentialSource, sinceMs, untilMs) {
packages/provider-cursor/src/server/CursorUsageAccounts.ts
+3
-5
@@ -5,7 +5,7 @@ import { writeFileStringAtomically } from "@t3tools/shared/atomicWrite";
5
import * as HostProcess from "@t3tools/shared/HostProcess";
6
import * as Clock from "effect/Clock";
7
import * as Context from "effect/Context";
8
-import * as Crypto from "effect/Crypto";
8
+import * as Digest from "effect/crypto/Digest";
9
import * as Deferred from "effect/Deferred";
10
import * as Effect from "effect/Effect";
11
import * as Hex from "effect/encoding/Hex";
@@ -60,7 +60,7 @@ const make = Effect.gen(function* () {
60
const accountReader = yield* CursorAccountReader.CursorAccountReader;
61
const hostEnvironment = yield* HostProcess.Environment;
62
const platform = yield* HostProcess.Platform;
63
- const crypto = yield* Crypto.Crypto;
63
+ const digest = yield* Digest.Digest;
64
65
const cachePath = path.join(host.paths.stateDir, CURSOR_ACCOUNT_CACHE_FILE_NAME);
66
const caches = new Map<string, CursorAccountCache>();
@@ -215,9 +215,7 @@ const make = Effect.gen(function* () {
215
: credential.kind === "apiKey"
216
? // A fingerprint, so a replaced key never reads the previous account's cache.
217
`api-key:${Hex.encode(
218
- yield* crypto
219
- .digest("SHA-256", new TextEncoder().encode(credential.apiKey))
220
- .pipe(Effect.orDie),
218
+ yield* digest.digest(Digest.sha256, new TextEncoder().encode(credential.apiKey)),
219
)}`
220
: "keychain";
221
const nowMs = yield* Clock.currentTimeMillis;
packages/provider-cursor/src/server/accountUsage.test.ts
+13
-11
@@ -1,4 +1,6 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
+import * as Layer from "effect/Layer";
4
import { assert, describe, it } from "@effect/vitest";
5
import * as Context from "effect/Context";
6
import * as Effect from "effect/Effect";
@@ -116,7 +118,7 @@ describe("Cursor account history", () => {
118
});
119
assert.strictEqual(result.records[0]?.reportedCostUsd, 0.25);
120
assert.isFalse(result.accountKey?.includes("demo") ?? true);
119
- }).pipe(Effect.provide(NodeServices.layer)),
121
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
122
);
123
124
it.effect("reads Cursor account history beyond 100 pages", () =>
@@ -135,7 +137,7 @@ describe("Cursor account history", () => {
137
assert.isNull(result.error);
138
assert.strictEqual(requests, 101);
139
assert.deepStrictEqual(result.records, []);
138
- }).pipe(Effect.provide(NodeServices.layer)),
140
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
141
);
142
143
it.effect("accepts confirmed empty Cursor usage but rejects error envelopes", () =>
@@ -169,7 +171,7 @@ describe("Cursor account history", () => {
171
assert.isNotNull(result.error);
172
assert.deepStrictEqual(result.records, []);
173
}
172
- }).pipe(Effect.provide(NodeServices.layer)),
174
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
175
);
176
177
it.effect("requires a terminal Cursor page after a full page reaches the reported count", () =>
@@ -195,7 +197,7 @@ describe("Cursor account history", () => {
197
assert.isNull(result.error);
198
assert.strictEqual(result.records.length, 1000);
199
assert.strictEqual(requests, 2);
198
- }).pipe(Effect.provide(NodeServices.layer)),
200
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
201
);
202
203
it.effect(
@@ -246,7 +248,7 @@ describe("Cursor account history", () => {
248
});
249
assert.isNotNull(inconsistent.error);
250
assert.deepStrictEqual(inconsistent.records, []);
249
- }).pipe(Effect.provide(NodeServices.layer)),
251
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
252
);
253
254
it.effect(
@@ -281,7 +283,7 @@ describe("Cursor account history", () => {
283
);
284
assert.isTrue(missing.missing);
285
assert.isFalse(requested);
284
- }).pipe(Effect.provide(NodeServices.layer)),
286
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
287
);
288
});
289
@@ -315,7 +317,7 @@ describe("readCursorAccountUsage", () => {
317
],
318
]);
319
assert.strictEqual(result.records[0]?.totals.outputTokens, 4);
318
- }).pipe(Effect.provide(NodeServices.layer)),
320
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
321
);
322
323
it.effect("stops waiting for an API key exchange that never answers", () =>
@@ -331,7 +333,7 @@ describe("readCursorAccountUsage", () => {
333
yield* TestClock.adjust("10 seconds");
334
const result = yield* Fiber.join(read);
335
assert.strictEqual(result.error, "Cursor account usage could not be read.");
334
- }).pipe(Effect.provide(NodeServices.layer)),
336
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
337
);
338
339
it.effect("asks for Keychain approval when the prompt goes unanswered", () =>
@@ -351,7 +353,7 @@ describe("readCursorAccountUsage", () => {
353
missing: false,
354
error: "Allow Keychain access on the Mac running T3 Code, then refresh.",
355
});
354
- }).pipe(Effect.provide(NodeServices.layer)),
356
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
357
);
358
359
it.effect("reads the pages behind the first together and keeps them in page order", () =>
@@ -385,7 +387,7 @@ describe("readCursorAccountUsage", () => {
387
result.records.map((record) => record.timestampMs),
388
Array.from({ length: 8001 }, (_, index) => 1780000000000 + index),
389
);
388
- }).pipe(Effect.provide(NodeServices.layer)),
390
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
391
);
392
393
it.effect("ends like a page-by-page read when a page fails, leaving no request open", () =>
@@ -425,6 +427,6 @@ describe("readCursorAccountUsage", () => {
427
assert.deepStrictEqual(result.records, []);
428
assert.strictEqual(open, 0);
429
}
428
- }).pipe(Effect.provide(NodeServices.layer)),
430
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
431
);
432
});
packages/provider-cursor/src/server/accountUsage.ts
+4
-4
@@ -1,5 +1,5 @@
1
import type { UsageRecord } from "@t3tools/provider-core/server/usage";
2
-import * as Crypto from "effect/Crypto";
2
+import * as Digest from "effect/crypto/Digest";
3
import * as Duration from "effect/Duration";
4
import * as Effect from "effect/Effect";
5
import * as Base64Url from "effect/encoding/Base64Url";
@@ -59,8 +59,8 @@ const billedEventIdentity = (...fields: readonly unknown[]) => JSON.stringify(fi
59
const textEncoder = new TextEncoder();
60
61
const accountHash = Effect.fn("accountHash")(function* (value: string) {
62
- const crypto = yield* Crypto.Crypto;
63
- return Hex.encode(yield* crypto.digest("SHA-256", textEncoder.encode(value)));
62
+ const digest = yield* Digest.Digest;
63
+ return Hex.encode(yield* digest.digest(Digest.sha256, textEncoder.encode(value)));
64
});
65
66
function canonicalJson(value: unknown): string {
@@ -104,7 +104,7 @@ export const readCursorAccountUsage = Effect.fn("readCursorAccountUsage")(functi
104
): Effect.fn.Return<
105
CursorAccountUsageReadResult,
106
never,
107
- FileSystem.FileSystem | Crypto.Crypto | HttpClient.HttpClient
107
+ FileSystem.FileSystem | Digest.Digest | HttpClient.HttpClient
108
> {
109
const fileSystem = yield* FileSystem.FileSystem;
110
const httpClient = yield* HttpClient.HttpClient;
packages/provider-cursor/src/server/auth.test.ts
+3
-1
@@ -1,5 +1,7 @@
1
import type { SdkLoginOptions, StoredSdkCredentials } from "@cursor/sdk";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
+import * as Layer from "effect/Layer";
5
import { expect, it } from "@effect/vitest";
6
import { ProviderInstanceId, ProviderSetupError, type ProviderAuthState } from "@t3tools/contracts";
7
import * as Clock from "effect/Clock";
@@ -79,7 +81,7 @@ const phase = (auth: Auth, phase: ProviderAuthState["phase"], session = owner) =
81
Effect.map(Option.getOrThrow),
82
);
83
82
-it.layer(NodeServices.layer)("CursorAuth", (it) => {
84
+it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CursorAuth", (it) => {
85
it.effect("closes SDK sessions and interrupts in-flight credential work before signing out", () =>
86
Effect.gen(function* () {
87
const harness = yield* makeHarness();
packages/provider-cursor/src/server/auth.ts
+3
-3
@@ -6,7 +6,7 @@ import {
6
} from "@t3tools/contracts";
7
import * as Cause from "effect/Cause";
8
import * as Clock from "effect/Clock";
9
-import * as Crypto from "effect/Crypto";
9
+import * as SecureRandom from "effect/crypto/SecureRandom";
10
import * as DateTime from "effect/DateTime";
11
import * as Effect from "effect/Effect";
12
import * as Exit from "effect/Exit";
@@ -52,7 +52,7 @@ export interface CursorAuthOptions {
52
53
export const makeCursorAuth = Effect.fn("makeCursorAuth")(function* (options: CursorAuthOptions) {
54
const scope = yield* Scope.Scope;
55
- const crypto = yield* Crypto.Crypto;
55
+ const random = yield* SecureRandom.SecureRandom;
56
const lock = yield* Semaphore.make(1);
57
const configuredKey = options.apiKey?.trim() || undefined;
58
const emptyState: ProviderAuthState = {
@@ -339,7 +339,7 @@ export const makeCursorAuth = Effect.fn("makeCursorAuth")(function* (options: Cu
339
operation: "start",
340
detail: "Cursor setup is already in progress.",
341
});
342
- const id = yield* crypto.randomUUIDv4().pipe(
342
+ const id = yield* random.uuidV4().pipe(
343
Effect.mapError(
344
(cause) =>
345
new ProviderSetupError({
packages/provider-cursor/src/server/driver.test.ts
+2
-1
@@ -1,5 +1,6 @@
1
// @effect-diagnostics nodeBuiltinImport:off
2
import type { AgentOptions, SDKModel } from "@cursor/sdk";
3
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
4
import * as NodeServices from "@effect/platform-node/NodeServices";
5
import { expect, it } from "@effect/vitest";
6
import {
@@ -42,7 +43,7 @@ import { loadCursorSdk } from "./sdk.ts";
43
const { Cursor } = loadCursorSdk();
44
45
const layerTest = TestProviderHost.layer({ runBackgroundWork: false }).pipe(
45
- Layer.provideMerge(NodeServices.layer),
46
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
47
Layer.provideMerge(IdAllocator.layer),
48
Layer.provideMerge(McpProviderSessions.layer),
49
Layer.provideMerge(CursorSdk.layer),
packages/provider-cursor/src/server/driver.ts
+2
-2
@@ -5,7 +5,7 @@ import {
5
} from "@t3tools/contracts";
6
import { CursorSettings } from "../settings.ts";
7
import * as Effect from "effect/Effect";
8
-import * as Crypto from "effect/Crypto";
8
+import * as SecureRandom from "effect/crypto/SecureRandom";
9
import * as FileSystem from "effect/FileSystem";
10
import * as Path from "effect/Path";
11
import * as Schema from "effect/Schema";
@@ -51,7 +51,7 @@ const MAINTENANCE_CAPABILITIES = makeManualOnlyProviderMaintenanceCapabilities({
51
52
export type CursorDriverEnv =
53
| CursorAdapterV2DriverEnv
54
- | Crypto.Crypto
54
+ | SecureRandom.SecureRandom
55
| FileSystem.FileSystem
56
| Path.Path
57
| HttpClient.HttpClient
packages/provider-fx/src/server/acpSupport.ts
+2
-2
@@ -7,7 +7,7 @@ import {
7
} from "@t3tools/contracts";
8
import type { FxSettings } from "../settings.ts";
9
import { getModelSelectionStringOptionValue } from "@t3tools/shared/model";
10
-import type * as Crypto from "effect/Crypto";
10
+import type * as SecureRandom from "effect/crypto/SecureRandom";
11
import * as Effect from "effect/Effect";
12
import * as Layer from "effect/Layer";
13
import type * as Scope from "effect/Scope";
@@ -219,7 +219,7 @@ export const makeFxAcpRuntime = Effect.fn("makeFxAcpRuntime")(function* (
219
): Effect.fn.Return<
220
AcpSessionRuntime.AcpSessionRuntime["Service"],
221
EffectAcpErrors.AcpError,
222
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
222
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom | Scope.Scope
223
> {
224
const { fxSettings, environment, ...runtimeOptions } = input;
225
const context = yield* Layer.build(
packages/provider-fx/src/server/adapter.ts
+3
-3
@@ -2,7 +2,7 @@ import * as HostProcess from "@t3tools/shared/HostProcess";
2
import { resolveSelfInvocation, type SelfInvocation } from "@t3tools/shared/nodeRuntime";
3
import { type OrchestrationV2ProviderCapabilities } from "@t3tools/contracts";
4
import { FxSettings } from "../settings.ts";
5
-import type * as Crypto from "effect/Crypto";
5
+import type * as SecureRandom from "effect/crypto/SecureRandom";
6
import * as Effect from "effect/Effect";
7
import type * as FileSystem from "effect/FileSystem";
8
import * as Option from "effect/Option";
@@ -159,7 +159,7 @@ export interface FxAdapterV2Options {
159
) => Effect.Effect<
160
AcpSessionRuntime.AcpSessionRuntime["Service"],
161
EffectAcpErrors.AcpError,
162
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
162
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom | Scope.Scope
163
>;
164
readonly assertComplete?: Effect.Effect<void, EffectAcpErrors.AcpError>;
165
}
@@ -203,7 +203,7 @@ export const makeFxAdapterV2 = Effect.fn("makeFxAdapterV2")(function* (
203
204
export type FxAdapterV2DriverEnv =
205
| ChildProcessSpawner.ChildProcessSpawner
206
- | Crypto.Crypto
206
+ | SecureRandom.SecureRandom
207
| FileSystem.FileSystem
208
| IdAllocator.IdAllocatorV2
209
| Path.Path
packages/provider-fx/src/server/driver.ts
+2
-2
@@ -1,7 +1,7 @@
1
import { TextGenerationError } from "@t3tools/contracts";
2
import { FxSettings } from "../settings.ts";
3
import * as HostProcess from "@t3tools/shared/HostProcess";
4
-import type * as Crypto from "effect/Crypto";
4
+import type * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as Effect from "effect/Effect";
6
import * as FileSystem from "effect/FileSystem";
7
import * as Path from "effect/Path";
@@ -63,7 +63,7 @@ const unsupportedTextGeneration: ProviderTextGeneration = (() => {
63
export type FxDriverEnv =
64
| FxAdapterV2DriverEnv
65
| ChildProcessSpawner.ChildProcessSpawner
66
- | Crypto.Crypto
66
+ | SecureRandom.SecureRandom
67
| FileSystem.FileSystem
68
| Path.Path
69
| ProviderHost.ProviderHost;
packages/provider-grok/src/server/acpSupport.ts
+2
-2
@@ -6,7 +6,7 @@ import {
6
type RuntimeMode,
7
} from "@t3tools/contracts";
8
import type { GrokSettings } from "../settings.ts";
9
-import * as Crypto from "effect/Crypto";
9
+import * as SecureRandom from "effect/crypto/SecureRandom";
10
import * as Effect from "effect/Effect";
11
import * as Layer from "effect/Layer";
12
import * as Scope from "effect/Scope";
@@ -126,7 +126,7 @@ export const makeGrokAcpRuntime = Effect.fn("GrokAcpSupport.makeGrokAcpRuntime")
126
): Effect.fn.Return<
127
AcpSessionRuntime.AcpSessionRuntime["Service"],
128
EffectAcpErrors.AcpError,
129
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
129
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom | Scope.Scope
130
> {
131
const processGroupPlatform = yield* HostProcess.Platform.pipe(Effect.provide(NodeServices.layer));
132
const acpContext = yield* Layer.build(
packages/provider-grok/src/server/adapter.ts
+3
-3
@@ -14,7 +14,7 @@ import {
14
type RuntimeMode,
15
} from "@t3tools/contracts";
16
import { GrokSettings } from "../settings.ts";
17
-import * as Crypto from "effect/Crypto";
17
+import * as SecureRandom from "effect/crypto/SecureRandom";
18
import * as Effect from "effect/Effect";
19
import * as FileSystem from "effect/FileSystem";
20
import * as Path from "effect/Path";
@@ -128,7 +128,7 @@ export interface GrokAdapterV2Options {
128
) => Effect.Effect<
129
AcpSessionRuntime.AcpSessionRuntime["Service"],
130
EffectAcpErrors.AcpError,
131
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
131
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom | Scope.Scope
132
>;
133
readonly assertComplete?: Effect.Effect<void, EffectAcpErrors.AcpError>;
134
}
@@ -357,7 +357,7 @@ export const makeGrokAdapterV2 = Effect.fn("makeGrokAdapterV2")(function* (
357
358
export type GrokAdapterV2DriverEnv =
359
| ChildProcessSpawner.ChildProcessSpawner
360
- | Crypto.Crypto
360
+ | SecureRandom.SecureRandom
361
| FileSystem.FileSystem
362
| IdAllocator.IdAllocatorV2
363
| Path.Path
packages/provider-grok/src/server/driver.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { expect, it } from "@effect/vitest";
4
import { ProviderInstanceId } from "@t3tools/contracts";
@@ -21,7 +22,7 @@ import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
22
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
23
24
const layerTest = TestProviderHost.layer({ runBackgroundWork: false }).pipe(
24
- Layer.provideMerge(NodeServices.layer),
25
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
26
Layer.provideMerge(IdAllocator.layer),
27
Layer.provideMerge(McpProviderSessions.layer),
28
Layer.provideMerge(ProviderLatestVersions.layer),
packages/provider-grok/src/server/driver.ts
+4
-4
@@ -1,6 +1,6 @@
1
import { ProviderDriverKind } from "@t3tools/contracts";
2
import { GrokSettings } from "../settings.ts";
3
-import * as Crypto from "effect/Crypto";
3
+import * as SecureRandom from "effect/crypto/SecureRandom";
4
import * as Effect from "effect/Effect";
5
import * as FileSystem from "effect/FileSystem";
6
import * as Path from "effect/Path";
@@ -93,7 +93,7 @@ export type GrokDriverEnv =
93
| GrokAdapterV2DriverEnv
94
| ProviderHost.ProviderHost
95
| ChildProcessSpawner.ChildProcessSpawner
96
- | Crypto.Crypto
96
+ | SecureRandom.SecureRandom
97
| FileSystem.FileSystem
98
| HttpClient.HttpClient
99
| ProviderLatestVersions.ProviderLatestVersions
@@ -117,7 +117,7 @@ export const GrokDriver: ProviderDriver<GrokSettings, GrokDriverEnv, Path.Path>
117
enabled,
118
config,
119
}) {
120
- const crypto = yield* Crypto.Crypto;
120
+ const random = yield* SecureRandom.SecureRandom;
121
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
122
const httpClient = yield* HttpClient.HttpClient;
123
const latestVersions = yield* ProviderLatestVersions.ProviderLatestVersions;
@@ -189,7 +189,7 @@ export const GrokDriver: ProviderDriver<GrokSettings, GrokDriverEnv, Path.Path>
189
Effect.provideService(HttpClient.HttpClient, httpClient),
190
Effect.provideService(FileSystem.FileSystem, fileSystem),
191
Effect.provideService(Path.Path, path),
192
- Effect.provideService(Crypto.Crypto, crypto),
192
+ Effect.provideService(SecureRandom.SecureRandom, random),
193
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
194
);
195
packages/provider-grok/src/server/status.ts
+2
-2
@@ -9,7 +9,7 @@ import {
9
import type { GrokSettings } from "../settings.ts";
10
import type * as EffectAcpSchema from "effect-acp/compat";
11
import { causeErrorTag } from "@t3tools/shared/observability";
12
-import * as Crypto from "effect/Crypto";
12
+import * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as DateTime from "effect/DateTime";
14
import * as Effect from "effect/Effect";
15
import * as Exit from "effect/Exit";
@@ -401,7 +401,7 @@ export const checkGrokProviderStatus = Effect.fn("checkGrokProviderStatus")(func
401
): Effect.fn.Return<
402
ServerProviderDraft,
403
never,
404
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto
404
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom
405
> {
406
const checkedAt = DateTime.formatIso(yield* DateTime.now);
407
const fallbackModels = grokModelsFromSettings(grokSettings.customModels);
packages/provider-grok/src/server/textGeneration.ts
+3
-3
@@ -1,4 +1,4 @@
1
-import * as Crypto from "effect/Crypto";
1
+import * as SecureRandom from "effect/crypto/SecureRandom";
2
import * as Effect from "effect/Effect";
3
import * as Option from "effect/Option";
4
import * as Ref from "effect/Ref";
@@ -27,7 +27,7 @@ export const makeGrokTextGeneration = Effect.fn("makeGrokTextGeneration")(functi
27
grokSettings: GrokSettings,
28
environment: NodeJS.ProcessEnv = process.env,
29
) {
30
- const crypto = yield* Crypto.Crypto;
30
+ const random = yield* SecureRandom.SecureRandom;
31
const commandSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
32
33
const runGrokJson: TextGenerationOperations.Runner = Effect.fn("GrokTextGeneration.runGrokJson")(
@@ -41,7 +41,7 @@ export const makeGrokTextGeneration = Effect.fn("makeGrokTextGeneration")(functi
41
cwd,
42
clientInfo: { name: "t3-code-git-text", version: "0.0.0" },
43
}).pipe(
44
- Effect.provideService(Crypto.Crypto, crypto),
44
+ Effect.provideService(SecureRandom.SecureRandom, random),
45
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, commandSpawner),
46
);
47
packages/provider-kiro/src/server/acpSupport.ts
+2
-2
@@ -1,7 +1,7 @@
1
import type * as EffectAcpSchema from "effect-acp/compat";
2
import type { ProviderApprovalOption, RuntimeMode } from "@t3tools/contracts";
3
import type { KiroSettings } from "../settings.ts";
4
-import type * as Crypto from "effect/Crypto";
4
+import type * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as Effect from "effect/Effect";
6
import * as Layer from "effect/Layer";
7
import type * as Scope from "effect/Scope";
@@ -138,7 +138,7 @@ export const makeKiroAcpRuntime = Effect.fn("KiroAcpSupport.makeKiroAcpRuntime")
138
): Effect.fn.Return<
139
AcpSessionRuntime.AcpSessionRuntime["Service"],
140
EffectAcpErrors.AcpError,
141
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
141
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom | Scope.Scope
142
> {
143
const { settings, environment, ...runtimeOptions } = input;
144
const context = yield* Layer.build(
packages/provider-kiro/src/server/adapter.ts
+3
-3
@@ -7,7 +7,7 @@ import {
7
} from "@t3tools/contracts";
8
import { KiroSettings } from "../settings.ts";
9
import { getModelSelectionStringOptionValue } from "@t3tools/shared/model";
10
-import type * as Crypto from "effect/Crypto";
10
+import type * as SecureRandom from "effect/crypto/SecureRandom";
11
import * as Effect from "effect/Effect";
12
import type * as FileSystem from "effect/FileSystem";
13
import * as Option from "effect/Option";
@@ -199,7 +199,7 @@ export interface KiroAdapterV2Options {
199
) => Effect.Effect<
200
AcpSessionRuntime.AcpSessionRuntime["Service"],
201
EffectAcpErrors.AcpError,
202
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | Scope.Scope
202
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom | Scope.Scope
203
>;
204
readonly assertComplete?: Effect.Effect<void, EffectAcpErrors.AcpError>;
205
readonly testHooks?: Parameters<typeof makeAcpAdapterV2>[0]["testHooks"];
@@ -590,7 +590,7 @@ export const makeKiroAdapterV2 = Effect.fn("makeKiroAdapterV2")(function* (
590
591
export type KiroAdapterV2DriverEnv =
592
| ChildProcessSpawner.ChildProcessSpawner
593
- | Crypto.Crypto
593
+ | SecureRandom.SecureRandom
594
| FileSystem.FileSystem
595
| IdAllocator.IdAllocatorV2
596
| Path.Path
packages/provider-kiro/src/server/driver.ts
+4
-4
@@ -1,7 +1,7 @@
1
import { ProviderDriverKind, TextGenerationError } from "@t3tools/contracts";
2
import { KiroSettings } from "../settings.ts";
3
import * as HostProcess from "@t3tools/shared/HostProcess";
4
-import * as Crypto from "effect/Crypto";
4
+import * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as Effect from "effect/Effect";
6
import * as Schema from "effect/Schema";
7
import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
@@ -59,7 +59,7 @@ const unsupportedTextGeneration: ProviderTextGeneration = (() => {
59
export type KiroDriverEnv =
60
| KiroAdapterV2DriverEnv
61
| ChildProcessSpawner.ChildProcessSpawner
62
- | Crypto.Crypto
62
+ | SecureRandom.SecureRandom
63
| ProviderHost.ProviderHost;
64
65
export const KiroDriver: ProviderDriver<KiroSettings, KiroDriverEnv> = {
@@ -79,7 +79,7 @@ export const KiroDriver: ProviderDriver<KiroSettings, KiroDriverEnv> = {
79
config,
80
}) {
81
const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
82
- const crypto = yield* Crypto.Crypto;
82
+ const crypto = yield* SecureRandom.SecureRandom;
83
const processEnv = yield* mergeProviderInstanceEnvironment(
84
environment,
85
yield* HostProcess.Environment,
@@ -107,7 +107,7 @@ export const KiroDriver: ProviderDriver<KiroSettings, KiroDriverEnv> = {
107
checkProvider: checkKiroProviderStatus(effectiveConfig, processEnv).pipe(
108
Effect.map(stampIdentity),
109
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
110
- Effect.provideService(Crypto.Crypto, crypto),
110
+ Effect.provideService(SecureRandom.SecureRandom, crypto),
111
),
112
}).pipe(
113
Effect.mapError(
packages/provider-kiro/src/server/status.ts
+2
-2
@@ -9,7 +9,7 @@ import type { KiroSettings } from "../settings.ts";
9
import * as HostProcess from "@t3tools/shared/HostProcess";
10
import { createModelCapabilities } from "@t3tools/shared/model";
11
import { resolveSpawnCommand } from "@t3tools/shared/shell";
12
-import type * as Crypto from "effect/Crypto";
12
+import type * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as DateTime from "effect/DateTime";
14
import * as Effect from "effect/Effect";
15
import * as Option from "effect/Option";
@@ -360,7 +360,7 @@ export const checkKiroProviderStatus = Effect.fn("checkKiroProviderStatus")(func
360
): Effect.fn.Return<
361
ServerProviderDraft,
362
never,
363
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto
363
+ ChildProcessSpawner.ChildProcessSpawner | SecureRandom.SecureRandom
364
> {
365
const checkedAt = DateTime.formatIso(yield* DateTime.now);
366
if (!settings.enabled) {
packages/provider-opencode/src/server/driver.test.ts
+4
-3
@@ -3,6 +3,7 @@ import * as NodeFS from "node:fs";
3
import * as NodeOS from "node:os";
4
import * as NodePath from "node:path";
5
6
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
7
import * as NodeServices from "@effect/platform-node/NodeServices";
8
import { assert, it } from "@effect/vitest";
9
import { DEFAULT_SERVER_SETTINGS, ProviderInstanceId } from "@t3tools/contracts";
@@ -59,7 +60,7 @@ const layer = Layer.mergeAll(
60
ProviderEventLoggers.NoOpProviderEventLoggers,
61
),
62
Layer.succeed(OpenCodeRuntime.OpenCodeRuntime, openCode2Runtime),
62
-).pipe(Layer.provideMerge(NodeServices.layer));
63
+).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
64
65
const create = (config: Partial<OpenCodeSettings>, http: HttpClient.HttpClient) =>
66
OpenCodeDriver.create({
@@ -458,7 +459,7 @@ const resolveUpdate = (generation: "v1" | "v2", binaryPath: string) =>
459
ChildProcessSpawner.ChildProcessSpawner,
460
ChildProcessSpawner.make(() => Effect.die("resolving an update must not spawn")),
461
),
461
- Effect.provide(NodeServices.layer),
462
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
463
);
464
465
it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")(
@@ -540,7 +541,7 @@ const layerUpdate = Layer.mergeAll(
541
ProviderEventLoggers.NoOpProviderEventLoggers,
542
),
543
Layer.succeed(OpenCodeRuntime.OpenCodeRuntime, changingRuntime),
543
-).pipe(Layer.provideMerge(NodeServices.layer));
544
+).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
545
546
it.layer(layerUpdate)("OpenCodeDriver updates", (it) => {
547
it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")(
packages/provider-opencode/src/server/driver.ts
+6
-4
@@ -1,6 +1,7 @@
1
import { ProviderDriverKind } from "@t3tools/contracts";
2
import { OpenCodeSettings } from "../settings.ts";
3
-import * as Crypto from "effect/Crypto";
3
+import * as Digest from "effect/crypto/Digest";
4
+import * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as Deferred from "effect/Deferred";
6
import * as Effect from "effect/Effect";
7
import * as Option from "effect/Option";
@@ -159,7 +160,8 @@ export type OpenCodeDriverEnv =
160
| OpenCodeAdapterV2.OpenCodeAdapterV2DriverEnv
161
| ProviderHost.ProviderHost
162
| ChildProcessSpawner.ChildProcessSpawner
162
- | Crypto.Crypto
163
+ | Digest.Digest
164
+ | SecureRandom.SecureRandom
165
| FileSystem.FileSystem
166
| HttpClient.HttpClient
167
| ProviderLatestVersions.ProviderLatestVersions
@@ -193,7 +195,7 @@ export const OpenCodeDriver: ProviderDriver<
195
const openCodeRuntime = yield* OpenCodeRuntime.OpenCodeRuntime;
196
const httpClient = yield* HttpClient.HttpClient;
197
const latestVersions = yield* ProviderLatestVersions.ProviderLatestVersions;
196
- const crypto = yield* Crypto.Crypto;
198
+ const digest = yield* Digest.Digest;
199
const host = yield* ProviderHost.ProviderHost;
200
const processEnv = yield* mergeProviderInstanceEnvironment(environment);
201
const continuationIdentity = defaultProviderContinuationIdentity({
@@ -344,7 +346,7 @@ export const OpenCodeDriver: ProviderDriver<
346
Effect.provideService(FileSystem.FileSystem, fileSystem),
347
Effect.provideService(Path.Path, pathService),
348
Effect.provideService(HttpClient.HttpClient, httpClient),
347
- Effect.provideService(Crypto.Crypto, crypto),
349
+ Effect.provideService(Digest.Digest, digest),
350
);
351
const checkProvider = Effect.all(
352
{
packages/provider-opencode/src/server/status.test.ts
+7
-6
@@ -1,6 +1,7 @@
1
import * as NodeAssert from "node:assert/strict";
2
import * as NodeSqlite from "node:sqlite";
3
4
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
5
import * as NodeServices from "@effect/platform-node/NodeServices";
6
import { it } from "@effect/vitest";
7
import * as Deferred from "effect/Deferred";
@@ -73,7 +74,7 @@ it.effect("reads Go limits with the instance's XDG credentials and preserves res
74
);
75
}),
76
),
76
- Effect.provide(NodeServices.layer),
77
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
78
);
79
NodeAssert.equal(limits.unavailable, undefined);
80
NodeAssert.equal(
@@ -223,7 +224,7 @@ it.effect(
224
consoleStatus === 500 ? undefined : fingerprints.get(requested.at(-1)!),
225
);
226
}
226
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
227
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
228
);
229
230
it.effect("prefers the selected stored Go key over the auth.json key OpenCode 2 imported", () =>
@@ -292,7 +293,7 @@ it.effect("prefers the selected stored Go key over the auth.json key OpenCode 2
293
NodeAssert.equal(limits.unavailable, undefined);
294
NodeAssert.equal(limits.windows.length, 3);
295
}
295
- }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
296
+ }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
297
);
298
299
it.effect("does not read local credentials for external or disabled OpenCode instances", () =>
@@ -312,7 +313,7 @@ it.effect("does not read local credentials for external or disabled OpenCode ins
313
HttpClient.HttpClient,
314
HttpClient.make(() => Effect.die("unexpected usage request")),
315
),
315
- Effect.provide(NodeServices.layer),
316
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
317
);
318
NodeAssert.equal(limits.unavailable?.reason, "unsupported");
319
}
@@ -345,7 +346,7 @@ it.effect("keeps Go entitlement absence distinct from failed or malformed usage
346
Effect.succeed(HttpClientResponse.fromWeb(request, Response.json({}, { status }))),
347
),
348
),
348
- Effect.provide(NodeServices.layer),
349
+ Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
350
);
351
NodeAssert.equal(limits.unavailable?.reason, reason);
352
NodeAssert.equal(limits.credentialFingerprint, undefined);
@@ -477,7 +478,7 @@ beforeEach(() => {
478
});
479
480
const layerTest = Layer.succeed(OpenCodeRuntime.OpenCodeRuntime, OpenCodeRuntimeTestDouble).pipe(
480
- Layer.provideMerge(NodeServices.layer),
481
+ Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
482
);
483
484
const makeOpenCodeSettings = (overrides?: Partial<OpenCodeSettings>): OpenCodeSettings =>
packages/provider-opencode/src/server/usageLimits.ts
+4
-4
@@ -1,7 +1,7 @@
1
import * as NodeSqlite from "node:sqlite";
2
3
import type { ServerProviderUsageWindow } from "@t3tools/contracts";
4
-import * as Crypto from "effect/Crypto";
4
+import * as Digest from "effect/crypto/Digest";
5
import * as DateTime from "effect/DateTime";
6
import * as Effect from "effect/Effect";
7
import * as FileSystem from "effect/FileSystem";
@@ -164,10 +164,10 @@ export const readOpenCodeGoUsageLimits = Effect.fn("readOpenCodeGoUsageLimits")(
164
resetsAt: DateTime.formatIso(body.usage.monthly.resetsAt),
165
},
166
];
167
- const crypto = yield* Crypto.Crypto;
167
+ const digest = yield* Digest.Digest;
168
// Unkeyed hashes match across environments; random Go keys resist offline guessing.
169
- const credentialFingerprint = yield* crypto
170
- .digest("SHA-256", new TextEncoder().encode(`opencode-go\0${apiKey}`))
169
+ const credentialFingerprint = yield* digest
170
+ .digest(Digest.sha256, new TextEncoder().encode(`opencode-go\0${apiKey}`))
171
.pipe(Effect.map(Hex.encode), Effect.orDie);
172
return {
173
...makeUsageLimits({ checkedAt, windows }),
packages/provider-opencode/src/server/v2/OpenCode2Server.test.ts
+7
-2
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, it } from "@effect/vitest";
4
import * as HostProcess from "@t3tools/shared/HostProcess";
@@ -111,7 +112,7 @@ describe("OpenCode2Server error details", () => {
112
Layer.mergeAll(
113
OpenCode2Client.layer.pipe(Layer.provide(httpClient)),
114
OpenCodeRuntime.layer.pipe(Layer.provide(OpenCodeServerLedger.layerTest)),
114
- ).pipe(Layer.provideMerge(NodeServices.layer)),
115
+ ).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
116
),
117
);
118
@@ -213,7 +214,11 @@ describe("OpenCode2Server spawned server", () => {
214
Layer.mergeAll(
215
OpenCode2Client.layer,
216
OpenCodeRuntime.layer.pipe(Layer.provide(OpenCodeServerLedger.layerTest)),
216
- ).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, FetchHttpClient.layer))),
217
+ ).pipe(
218
+ Layer.provideMerge(
219
+ Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, FetchHttpClient.layer),
220
+ ),
221
+ ),
222
),
223
),
224
);
packages/provider-opencode/src/server/v2/OpenCode2Server.ts
+3
-3
@@ -1,7 +1,7 @@
1
// One OpenCode 2 process serves all directories; share it across instance threads.
2
import type { OpenCodeClient } from "@opencode/client/effect";
3
import * as Context from "effect/Context";
4
-import * as Crypto from "effect/Crypto";
4
+import * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as Effect from "effect/Effect";
6
import * as Base64Url from "effect/encoding/Base64Url";
7
import * as P from "effect/Predicate";
@@ -34,8 +34,8 @@ export class OpenCode2Server extends Context.Service<
34
* otherwise, so T3 supplies its own and keeps it in memory.
35
*/
36
const generatePassword = Effect.gen(function* () {
37
- const crypto = yield* Crypto.Crypto;
38
- const bytes = yield* crypto.randomBytes(32).pipe(Effect.orDie);
37
+ const random = yield* SecureRandom.SecureRandom;
38
+ const bytes = yield* random.randomBytes(32);
39
return Redacted.make(Base64Url.encode(bytes), { label: "OPENCODE_PASSWORD" });
40
});
41
packages/provider-opencode/src/server/v2/adapter.ts
+5
-5
@@ -40,7 +40,7 @@ import {
40
import type * as Cause from "effect/Cause";
41
import * as DateTime from "effect/DateTime";
42
import * as Deferred from "effect/Deferred";
43
-import * as Crypto from "effect/Crypto";
43
+import * as Digest from "effect/crypto/Digest";
44
import * as Effect from "effect/Effect";
45
import * as Hex from "effect/encoding/Hex";
46
import * as Exit from "effect/Exit";
@@ -355,9 +355,9 @@ const rule = (action: string, effect: Rule["effect"]): Rule => ({ action, resour
355
export const t3McpServerName = Effect.fn("t3McpServerName")(function* (threadId: string) {
356
const name = `t3-code-${threadId.replaceAll(/[^a-zA-Z0-9_-]/g, "_")}`;
357
if (name.length <= 64) return name;
358
- const crypto = yield* Crypto.Crypto;
358
+ const crypto = yield* Digest.Digest;
359
const digest = yield* crypto
360
- .digest("SHA-256", new TextEncoder().encode(threadId))
360
+ .digest(Digest.sha256, new TextEncoder().encode(threadId))
361
.pipe(Effect.orDie);
362
return `t3-code-${Hex.encode(digest).slice(0, 16)}`;
363
});
@@ -676,10 +676,10 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
676
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
677
const fileSystem = yield* FileSystem.FileSystem;
678
const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests;
679
- const crypto = yield* Crypto.Crypto;
679
+ const crypto = yield* Digest.Digest;
680
const driver = OPENCODE_PROVIDER;
681
const mcpServerNameFor = (threadId: string) =>
682
- t3McpServerName(threadId).pipe(Effect.provideService(Crypto.Crypto, crypto));
682
+ t3McpServerName(threadId).pipe(Effect.provideService(Digest.Digest, crypto));
683
684
const borrow = Effect.gen(function* () {
685
const lent = yield* Deferred.make<
packages/provider-pi/src/server/adapter.test.ts
+3
-3
@@ -179,7 +179,7 @@ interface FakePi {
179
readonly closeStdout: Effect.Effect<void>;
180
readonly lastSpawn: () => {
181
readonly args: ReadonlyArray<string>;
182
- readonly env: NodeJS.ProcessEnv;
182
+ readonly env: NonNullable<ChildProcess.CommandOptions["env"]>;
183
};
184
}
185
@@ -316,7 +316,7 @@ const makeFakePi: Effect.Effect<FakePi> = Effect.gen(function* () {
316
}
317
});
318
319
- let lastSpawn: { readonly args: ReadonlyArray<string>; readonly env: NodeJS.ProcessEnv } = {
319
+ let lastSpawn: ReturnType<FakePi["lastSpawn"]> = {
320
args: [],
321
env: {},
322
};
@@ -324,7 +324,7 @@ const makeFakePi: Effect.Effect<FakePi> = Effect.gen(function* () {
324
Effect.sync(() => {
325
if (ChildProcess.isStandardCommand(command)) {
326
lastSpawn = {
327
- args: command.args,
327
+ args: command.args.map(String),
328
env: command.options.env ?? {},
329
};
330
}
packages/secret-provider-core/src/server/SecretResolver.test.ts
+2
-1
@@ -1,3 +1,4 @@
1
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
2
import * as NodeServices from "@effect/platform-node/NodeServices";
3
import { assert, describe, it } from "@effect/vitest";
4
import {
@@ -63,7 +64,7 @@ const resolverLayer = (
64
SecretResolver.layer({
65
drivers: [driver],
66
secretProviders: Effect.sync(secretProviders),
66
- }).pipe(Layer.provide(NodeServices.layer));
67
+ }).pipe(Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
68
69
describe("SecretResolver", () => {
70
it.effect("reads a reference once and holds it", () => {
packages/secret-provider-core/src/server/driver.ts
+2
-2
@@ -1,5 +1,5 @@
1
import type { SecretProviderKind } from "@t3tools/contracts";
2
-import type * as Crypto from "effect/Crypto";
2
+import type * as SecureRandom from "effect/crypto/SecureRandom";
3
import * as Effect from "effect/Effect";
4
import type * as FileSystem from "effect/FileSystem";
5
import * as Schema from "effect/Schema";
@@ -11,7 +11,7 @@ import type { SecretProviderDefinition } from "../shared/definition.ts";
11
export type SecretProviderDriverServices =
12
| ChildProcessSpawner.ChildProcessSpawner
13
| FileSystem.FileSystem
14
- | Crypto.Crypto;
14
+ | SecureRandom.SecureRandom;
15
16
export interface SecretProviderDriver {
17
readonly kind: SecretProviderKind;
packages/secret-provider-onepassword/src/server/driver.ts
+2
-2
@@ -1,7 +1,7 @@
1
import { spawnAndCollect } from "@t3tools/provider-core/server/snapshotProbe";
2
import { defineSecretProviderDriver } from "@t3tools/secret-provider-core/server/driver";
3
import { resolveSpawnCommand } from "@t3tools/shared/shell";
4
-import * as Crypto from "effect/Crypto";
4
+import * as SecureRandom from "effect/crypto/SecureRandom";
5
import * as Duration from "effect/Duration";
6
import * as Effect from "effect/Effect";
7
import * as FileSystem from "effect/FileSystem";
@@ -51,7 +51,7 @@ const readTogether = Effect.fn("OnePasswordDriver.readTogether")(function* (
51
references: ReadonlyArray<string>,
52
) {
53
const fileSystem = yield* FileSystem.FileSystem;
54
- const separator = `__t3-secret-${yield* (yield* Crypto.Crypto).randomUUIDv4()}__`;
54
+ const separator = `__t3-secret-${yield* (yield* SecureRandom.SecureRandom).uuidV4()}__`;
55
const templatePath = yield* fileSystem.makeTempFileScoped({ prefix: "t3code-op-inject-" });
56
yield* fileSystem.writeFileString(
57
templatePath,
packages/shared/src/nodeSqliteClient.ts
+1
@@ -1242,6 +1242,7 @@ const make = Effect.fn("makeWithDatabase")(function* (
1242
);
1243
1244
const client = yield* Client.make({
1245
+ driver: "node:sqlite",
1246
acquirer: transactionAcquirer,
1247
borrower,
1248
compiler,
packages/shared/src/relayClient.test.ts
+13
-1
@@ -1,4 +1,5 @@
1
import { sha256 } from "@noble/hashes/sha2";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import { describe, expect, it } from "@effect/vitest";
5
import * as Clock from "effect/Clock";
@@ -88,7 +89,9 @@ const writeExecutable = (filePath: string, contents = "cloudflared") =>
89
});
90
91
type RelayClientTestServices =
91
- | Layer.Success<ReturnType<typeof layerHostRuntime> | typeof NodeServices.layer>
92
+ | Layer.Success<
93
+ ReturnType<typeof layerHostRuntime> | typeof NodeServices.layer | typeof NodeCrypto.layer
94
+ >
95
| HttpClient.HttpClient
96
| ChildProcessSpawner.ChildProcessSpawner;
97
@@ -141,6 +144,7 @@ const testReleaseAsset = {
144
const layerInstallRuntime = (platform: NodeJS.Platform) =>
145
Layer.mergeAll(
146
NodeServices.layer,
147
+ NodeCrypto.layer,
148
layerHttpClient(testBinary),
149
layerSpawner([]),
150
layerHostRuntime({ PATH: "" }, platform),
@@ -178,6 +182,7 @@ describe("RelayClient", () => {
182
Effect.provide(
183
Layer.mergeAll(
184
NodeServices.layer,
185
+ NodeCrypto.layer,
186
layerHttpClient(new Uint8Array()),
187
layerSpawner([]),
188
layerHostRuntime({ PATH: "" }),
@@ -338,6 +343,7 @@ describe("RelayClient", () => {
343
Effect.provide(
344
Layer.mergeAll(
345
NodeServices.layer,
346
+ NodeCrypto.layer,
347
layerHttpClient(new Uint8Array()),
348
layerSpawner([]),
349
layerHostRuntime({ PATH: "" }),
@@ -396,6 +402,7 @@ describe("RelayClient", () => {
402
Effect.provide(
403
Layer.mergeAll(
404
NodeServices.layer,
405
+ NodeCrypto.layer,
406
layerHttpClient(new TextEncoder().encode("test-binary")),
407
layerSpawner([]),
408
layerHostRuntime({ PATH: "" }),
@@ -455,6 +462,7 @@ describe("RelayClient", () => {
462
Effect.provide(
463
Layer.mergeAll(
464
NodeServices.layer,
465
+ NodeCrypto.layer,
466
layerHttpClient(new TextEncoder().encode("test-cloudflared-binary")),
467
layerSpawner([]),
468
layerHostRuntime(),
@@ -491,6 +499,7 @@ describe("RelayClient", () => {
499
Effect.provide(
500
Layer.mergeAll(
501
NodeServices.layer,
502
+ NodeCrypto.layer,
503
layerHttpClient(new TextEncoder().encode("tampered")),
504
layerSpawner([]),
505
layerHostRuntime(),
@@ -526,6 +535,7 @@ describe("RelayClient", () => {
535
Effect.provide(
536
Layer.mergeAll(
537
NodeServices.layer,
538
+ NodeCrypto.layer,
539
layerHttpClient(bytes),
540
layerSpawner(commands),
541
layerHostRuntime(),
@@ -598,6 +608,7 @@ describe("RelayClient", () => {
608
Effect.provide(
609
Layer.mergeAll(
610
NodeServices.layer,
611
+ NodeCrypto.layer,
612
layerHttpClient(new Uint8Array()),
613
layerSpawner([]),
614
layerHostRuntime(configEnv, platform),
@@ -622,6 +633,7 @@ describe("RelayClient", () => {
633
Effect.provide(
634
Layer.mergeAll(
635
NodeServices.layer,
636
+ NodeCrypto.layer,
637
layerHttpClient(new Uint8Array()),
638
layerSpawner([], options.versions),
639
layerHostRuntime({ PATH: "" }),
packages/shared/src/relayClient.ts
+9
-6
@@ -8,7 +8,8 @@ import type {
8
} from "@t3tools/contracts";
9
import * as Config from "effect/Config";
10
import * as Context from "effect/Context";
11
-import * as Crypto from "effect/Crypto";
11
+import * as Digest from "effect/crypto/Digest";
12
+import * as SecureRandom from "effect/crypto/SecureRandom";
13
import * as Data from "effect/Data";
14
import * as Duration from "effect/Duration";
15
import * as Effect from "effect/Effect";
@@ -249,12 +250,14 @@ export const makeCloudflaredRelayClient = Effect.fn("cloudflared.make")(function
250
RelayClientShape,
251
never,
252
| ChildProcessSpawner.ChildProcessSpawner
252
- | Crypto.Crypto
253
+ | SecureRandom.SecureRandom
254
+ | Digest.Digest
255
| FileSystem.FileSystem
256
| HttpClient.HttpClient
257
| Path.Path
258
> {
257
- const crypto = yield* Crypto.Crypto;
259
+ const random = yield* SecureRandom.SecureRandom;
260
+ const digest = yield* Digest.Digest;
261
const fileSystem = yield* FileSystem.FileSystem;
262
const httpClient = yield* HttpClient.HttpClient;
263
const path = yield* Path.Path;
@@ -463,7 +466,7 @@ export const makeCloudflaredRelayClient = Effect.fn("cloudflared.make")(function
466
),
467
);
468
yield* report("verifying");
466
- const checksum = yield* crypto.digest("SHA-256", bytes).pipe(
469
+ const checksum = yield* digest.digest(Digest.sha256, bytes).pipe(
470
Effect.mapError(
471
(cause) =>
472
new RelayClientInstallError({
@@ -497,7 +500,7 @@ export const makeCloudflaredRelayClient = Effect.fn("cloudflared.make")(function
500
const acquireInstallLock = Effect.fn("cloudflared.acquireInstallLock")(function* (
501
lockPath: string,
502
) {
500
- const owner = `${process.pid}-${yield* crypto.randomUUIDv4()}`;
503
+ const owner = `${process.pid}-${yield* random.uuidV4()}`;
504
const candidate = yield* Effect.acquireRelease(
505
fileSystem.makeTempDirectory({ directory: path.dirname(lockPath), prefix: ".lock-" }),
506
(directory) =>
@@ -634,7 +637,7 @@ export const makeCloudflaredRelayClient = Effect.fn("cloudflared.make")(function
637
});
638
}
639
637
- const stagedPath = `${managedPath}.${yield* crypto.randomUUIDv4()}.tmp`;
640
+ const stagedPath = `${managedPath}.${yield* random.uuidV4()}.tmp`;
641
yield* report("activating");
642
yield* renameWhenUnlocked(executablePath, stagedPath).pipe(
643
wrapInstallFailure("write_failed", "Could not stage the relay client."),
packages/source-control-core/src/server/driver.ts
+2
-2
@@ -5,7 +5,7 @@ import type {
5
SourceControlSignInPrompt,
6
SourceControlSignInResult,
7
} from "@t3tools/contracts";
8
-import type * as Crypto from "effect/Crypto";
8
+import type * as Digest from "effect/crypto/Digest";
9
import * as Effect from "effect/Effect";
10
import type * as FileSystem from "effect/FileSystem";
11
import type { HttpClient, HttpClientError, HttpClientResponse } from "effect/http";
@@ -73,7 +73,7 @@ export type SourceControlDriverServices =
73
| SourceControlRateLimit.SourceControlRateLimit
74
| HttpClient.HttpClient
75
| FileSystem.FileSystem
76
- | Crypto.Crypto;
76
+ | Digest.Digest;
77
78
export interface SourceControlDriver {
79
readonly kind: SourceControlProviderKind;
packages/source-control-github/scripts/measure-pr-preview.ts
+2
-1
@@ -2,6 +2,7 @@
2
// Real GitHub reads share repository-permission caches, excluding browser and service caches.
3
// HTTP client request counts are exact; GraphQL cost uses changes in `x-ratelimit-used`,
4
// which are approximate when other clients spend the same token's quota.
5
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
6
import * as NodeServices from "@effect/platform-node/NodeServices";
7
import * as SourceControlRateLimit from "@t3tools/source-control-core/server/SourceControlRateLimit";
8
import * as TestSourceControlHost from "@t3tools/source-control-testing/TestSourceControlHost";
@@ -97,7 +98,7 @@ const sourceControlHost = Layer.unwrap(
98
},
99
});
100
}),
100
-).pipe(Layer.provideMerge(NodeServices.layer));
101
+).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
102
103
const services = GitHubPullRequestApi.layer.pipe(
104
Layer.provideMerge(GitHubAppAccess.layer),
packages/source-control-github/src/server/GitHubCredentials.ts
+3
-3
@@ -1,7 +1,7 @@
1
import { normalizeHost } from "@t3tools/source-control-core/server/pullRequestUtils";
2
import * as Cache from "effect/Cache";
3
import * as Context from "effect/Context";
4
-import * as Crypto from "effect/Crypto";
4
+import * as Digest from "effect/crypto/Digest";
5
import * as Duration from "effect/Duration";
6
import * as Effect from "effect/Effect";
7
import * as Hex from "effect/encoding/Hex";
@@ -135,12 +135,12 @@ export function environmentToken(
135
export const make = Effect.gen(function* () {
136
const sourceControlHost = yield* SourceControlHost.SourceControlHost;
137
const process = sourceControlHost.process;
138
- const crypto = yield* Crypto.Crypto;
138
+ const crypto = yield* Digest.Digest;
139
const environment = yield* HostProcess.Environment;
140
const workingDirectory = yield* HostProcess.WorkingDirectory;
141
142
const fingerprintOf = (host: string, token: string) =>
143
- crypto.digest("SHA-256", new TextEncoder().encode(token)).pipe(
143
+ crypto.digest(Digest.sha256, new TextEncoder().encode(token)).pipe(
144
Effect.map((digest) => `${host}:${Hex.encode(digest)}`),
145
Effect.orDie,
146
);
packages/ssh/src/command.test.ts
+6
-5
@@ -1,4 +1,5 @@
1
import { assert, describe, it } from "@effect/vitest";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as Effect from "effect/Effect";
5
import * as Layer from "effect/Layer";
@@ -51,7 +52,7 @@ describe("ssh command", () => {
52
it.effect("passes an option-shaped alias to ssh as the destination", () => {
53
const spawned: Array<ReadonlyArray<string>> = [];
54
const spawner = ChildProcessSpawner.make((command) => {
54
- if (ChildProcess.isStandardCommand(command)) spawned.push(command.args);
55
+ if (ChildProcess.isStandardCommand(command)) spawned.push(command.args.map(String));
56
return Effect.succeed(makeFailedProcess({ stdout: "", stderr: "bad hostname\n" }));
57
});
58
return runSshCommand(
@@ -64,7 +65,7 @@ describe("ssh command", () => {
65
}),
66
Effect.provide(
67
Layer.merge(
67
- NodeServices.layer,
68
+ Layer.mergeAll(NodeServices.layer, NodeCrypto.layer),
69
Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
70
),
71
),
@@ -92,7 +93,7 @@ describe("ssh command", () => {
93
}),
94
"326264c4f08c8a0c",
95
);
95
- }).pipe(Effect.provide(NodeServices.layer)),
96
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
97
);
98
99
it.live.each([
@@ -140,7 +141,7 @@ describe("ssh command", () => {
141
? `[truncated]\n${redacted.slice(-4_000)}`
142
: `${redacted.slice(0, 4_000)}\n[truncated]`,
143
);
143
- }).pipe(Effect.provide(NodeServices.layer)),
144
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
145
);
146
147
it.live("enables server-alive checks for long remote commands", () =>
@@ -160,7 +161,7 @@ describe("ssh command", () => {
161
Effect.succeed(makeFailedProcess({ stdout: '{"credential":"pairing-secret"}\n' })),
162
);
163
const layerSpawner = Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner);
163
- const layerProcess = Layer.mergeAll(NodeServices.layer, layerSpawner);
164
+ const layerProcess = Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, layerSpawner);
165
166
return Effect.gen(function* () {
167
const result = yield* Effect.result(
packages/ssh/src/command.ts
+7
-6
@@ -1,6 +1,6 @@
1
import type { DesktopSshEnvironmentTarget } from "@t3tools/contracts";
2
import * as HostProcess from "@t3tools/shared/HostProcess";
3
-import * as Crypto from "effect/Crypto";
3
+import * as Digest from "effect/crypto/Digest";
4
import * as Duration from "effect/Duration";
5
import * as Effect from "effect/Effect";
6
import * as Hex from "effect/encoding/Hex";
@@ -76,11 +76,12 @@ export function targetConnectionKey(target: DesktopSshEnvironmentTarget): string
76
77
export const remoteStateKey = Effect.fn("ssh/command.remoteStateKey")(function* (
78
target: DesktopSshEnvironmentTarget,
79
-): Effect.fn.Return<string, never, Crypto.Crypto> {
80
- const crypto = yield* Crypto.Crypto;
81
- const digest = yield* crypto
82
- .digest("SHA-256", encoder.encode(targetConnectionKey(target)))
83
- .pipe(Effect.orDie);
79
+): Effect.fn.Return<string, never, Digest.Digest> {
80
+ const digestService = yield* Digest.Digest;
81
+ const digest = yield* digestService.digest(
82
+ Digest.sha256,
83
+ encoder.encode(targetConnectionKey(target)),
84
+ );
85
return Hex.encode(digest).slice(0, 16);
86
});
87
packages/ssh/src/tunnel.test.ts
+14
-3
@@ -1,4 +1,5 @@
1
import { assert, describe, it } from "@effect/vitest";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as NetService from "@t3tools/shared/Net";
5
import * as Deferred from "effect/Deferred";
@@ -76,7 +77,7 @@ const testNetService = NetService.NetService.of({
77
});
78
79
function commandArgs(command: ChildProcess.Command): ReadonlyArray<string> {
79
- return command._tag === "StandardCommand" ? command.args : [];
80
+ return command._tag === "StandardCommand" ? command.args.map(String) : [];
81
}
82
83
const ARCHIVE = { archiveVersion: "1.2.3-preview.20260911.4" } as const;
@@ -119,7 +120,10 @@ describe("ssh tunnel scripts", () => {
120
}),
121
);
122
const layerSpawner = Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner);
122
- const layerProcess = Layer.merge(NodeServices.layer, layerSpawner);
123
+ const layerProcess = Layer.merge(
124
+ Layer.mergeAll(NodeServices.layer, NodeCrypto.layer),
125
+ layerSpawner,
126
+ );
127
128
return Effect.gen(function* () {
129
const result = yield* SshTunnel.launchOrReuseRemoteServer(target, undefined, ARCHIVE);
@@ -149,7 +153,10 @@ describe("ssh tunnel scripts", () => {
153
),
154
);
155
const layerSpawner = Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner);
152
- const layerProcess = Layer.merge(NodeServices.layer, layerSpawner);
156
+ const layerProcess = Layer.merge(
157
+ Layer.mergeAll(NodeServices.layer, NodeCrypto.layer),
158
+ layerSpawner,
159
+ );
160
return Effect.gen(function* () {
161
const result = yield* SshTunnel.issueRemotePairingToken(target, undefined, ARCHIVE);
162
assert.equal(result.credential, "LCL4R2TPHDKQ");
@@ -175,6 +182,7 @@ describe("ssh tunnel scripts", () => {
182
);
183
const layer = Layer.mergeAll(
184
NodeServices.layer,
185
+ NodeCrypto.layer,
186
Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
187
Layer.succeed(HttpClient.HttpClient, hangingHttpClient),
188
Layer.succeed(NetService.NetService, testNetService),
@@ -232,6 +240,7 @@ describe("ssh tunnel scripts", () => {
240
);
241
const layer = Layer.mergeAll(
242
NodeServices.layer,
243
+ NodeCrypto.layer,
244
Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
245
Layer.succeed(HttpClient.HttpClient, hangingHttpClient),
246
Layer.succeed(NetService.NetService, testNetService),
@@ -296,6 +305,7 @@ describe("ssh tunnel scripts", () => {
305
);
306
const layer = Layer.mergeAll(
307
NodeServices.layer,
308
+ NodeCrypto.layer,
309
Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
310
Layer.succeed(HttpClient.HttpClient, testHttpClient),
311
Layer.succeed(NetService.NetService, testNetService),
@@ -400,6 +410,7 @@ describe("ssh tunnel scripts", () => {
410
);
411
const layer = Layer.mergeAll(
412
NodeServices.layer,
413
+ NodeCrypto.layer,
414
Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
415
Layer.succeed(HttpClient.HttpClient, testHttpClient),
416
Layer.succeed(NetService.NetService, testNetService),
packages/ssh/src/tunnel.ts
+10
-10
@@ -9,7 +9,7 @@ import * as NetService from "@t3tools/shared/Net";
9
import { extractJsonObject, fromLenientJson } from "@t3tools/shared/schemaJson";
10
import { satisfiesSemverRange } from "@t3tools/shared/semver";
11
import * as Context from "effect/Context";
12
-import * as Crypto from "effect/Crypto";
12
+import * as Digest from "effect/crypto/Digest";
13
import * as Effect from "effect/Effect";
14
import * as Exit from "effect/Exit";
15
import * as Fiber from "effect/Fiber";
@@ -86,7 +86,7 @@ interface SshTunnelEntry {
86
87
type SshEnvironmentEffectContext =
88
| ChildProcessSpawner.ChildProcessSpawner
89
- | Crypto.Crypto
89
+ | Digest.Digest
90
| FileSystem.FileSystem
91
| Path.Path
92
| HttpClient.HttpClient
@@ -867,7 +867,7 @@ export const launchOrReuseRemoteServer = Effect.fn("ssh/tunnel.launchOrReuseRemo
867
): Effect.fn.Return<
868
{ readonly remotePort: number; readonly remoteServerKind: "external" | "managed" | null },
869
SshCommandError | SshInvalidTargetError | SshLaunchError,
870
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | FileSystem.FileSystem | Path.Path
870
+ ChildProcessSpawner.ChildProcessSpawner | Digest.Digest | FileSystem.FileSystem | Path.Path
871
> {
872
const stateKey = yield* remoteStateKey(target);
873
yield* Effect.logInfo("ssh.remoteServer.launch.start", {
@@ -929,7 +929,7 @@ export const issueRemotePairingToken = Effect.fn("ssh/tunnel.issueRemotePairingT
929
readonly credential: string;
930
},
931
SshCommandError | SshInvalidTargetError | SshPairingError,
932
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | FileSystem.FileSystem | Path.Path
932
+ ChildProcessSpawner.ChildProcessSpawner | Digest.Digest | FileSystem.FileSystem | Path.Path
933
> {
934
const stateKey = yield* remoteStateKey(target);
935
yield* Effect.logDebug("ssh.remoteServer.pairingToken.start", {
@@ -981,7 +981,7 @@ const stopRemoteServer = Effect.fn("ssh/tunnel.stopRemoteServer")(function* (
981
): Effect.fn.Return<
982
void,
983
SshCommandError | SshInvalidTargetError,
984
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | FileSystem.FileSystem | Path.Path
984
+ ChildProcessSpawner.ChildProcessSpawner | Digest.Digest | FileSystem.FileSystem | Path.Path
985
> {
986
const stateKey = yield* remoteStateKey(target);
987
yield* Effect.logInfo("ssh.remoteServer.stop.start", {
@@ -1007,7 +1007,7 @@ const readRemoteServerLogTail = Effect.fn("ssh/tunnel.readRemoteServerLogTail")(
1007
): Effect.fn.Return<
1008
string,
1009
SshCommandError | SshInvalidTargetError,
1010
- ChildProcessSpawner.ChildProcessSpawner | Crypto.Crypto | FileSystem.FileSystem | Path.Path
1010
+ ChildProcessSpawner.ChildProcessSpawner | Digest.Digest | FileSystem.FileSystem | Path.Path
1011
> {
1012
const result = yield* runSshCommand(target, {
1013
remoteCommandArgs: ["sh", "-s"],
@@ -1110,7 +1110,7 @@ const startSshTunnel = Effect.fn("ssh/tunnel.startSshTunnel")(function* (input:
1110
SshTunnelEntry,
1111
SshCommandError | SshInvalidTargetError | SshReadinessError,
1112
| ChildProcessSpawner.ChildProcessSpawner
1113
- | Crypto.Crypto
1113
+ | Digest.Digest
1114
| FileSystem.FileSystem
1115
| Path.Path
1116
| HttpClient.HttpClient
@@ -1555,7 +1555,7 @@ const makeSshEnvironmentManager = Effect.fn("ssh/tunnel.SshEnvironmentManager.ma
1555
);
1556
tunnels.set(input.key, tunnelEntry);
1557
const spawnerService = yield* ChildProcessSpawner.ChildProcessSpawner;
1558
- const cryptoService = yield* Crypto.Crypto;
1558
+ const digestService = yield* Digest.Digest;
1559
const fileSystemService = yield* FileSystem.FileSystem;
1560
const pathService = yield* Path.Path;
1561
yield* Scope.addFinalizer(
@@ -1595,7 +1595,7 @@ const makeSshEnvironmentManager = Effect.fn("ssh/tunnel.SshEnvironmentManager.ma
1595
},
1596
).pipe(
1597
Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawnerService),
1598
- Effect.provideService(Crypto.Crypto, cryptoService),
1598
+ Effect.provideService(Digest.Digest, digestService),
1599
Effect.provideService(FileSystem.FileSystem, fileSystemService),
1600
Effect.provideService(Path.Path, pathService),
1601
);
@@ -1778,7 +1778,7 @@ const makeSshEnvironmentManager = Effect.fn("ssh/tunnel.SshEnvironmentManager.ma
1778
});
1779
1780
/**
1781
- * @effect-expect-leaking ChildProcessSpawner | Crypto | FileSystem | HttpClient | NetService | Path | SshPasswordPrompt
1781
+ * @effect-expect-leaking ChildProcessSpawner | Digest | FileSystem | HttpClient | NetService | Path | SshPasswordPrompt
1782
*/
1783
export class SshEnvironmentManager extends Context.Service<
1784
SshEnvironmentManager,
patches/@alchemy.run__test@2.0.0-beta.85.patch
renamed
+3
-3
@@ -1,7 +1,7 @@
1
-diff --git a/lib/Test/Vitest.js b/lib/Test/Vitest.js
1
+diff --git a/lib/Vitest.js b/lib/Vitest.js
2
index 48cce71..ae67044 100644
3
---- a/lib/Test/Vitest.js
4
-+++ b/lib/Test/Vitest.js
3
+--- a/lib/Vitest.js
4
++++ b/lib/Vitest.js
5
@@ -3,7 +3,7 @@ import { it } from "@effect/vitest";
6
import * as Effect from "effect/Effect";
7
import * as Exit from "effect/Exit";
patches/@effect__vitest@4.1.2.patch
renamed
+11
-11
@@ -1,5 +1,5 @@
1
diff --git a/dist/index.d.ts b/dist/index.d.ts
2
-index 845cb4c..24ede42 100644
2
+index 0db951b..d6b6a6b 100644
3
--- a/dist/index.d.ts
4
+++ b/dist/index.d.ts
5
@@ -10,14 +10,14 @@ import type * as Effect from "effect/Effect";
@@ -20,7 +20,7 @@ index 845cb4c..24ede42 100644
20
* Vitest test API without additional fixtures.
21
*
22
diff --git a/dist/index.js b/dist/index.js
23
-index 178cc74..9289296 100644
23
+index d10d1e7..6839558 100644
24
--- a/dist/index.js
25
+++ b/dist/index.js
26
@@ -5,7 +5,7 @@ import * as internal from "./internal/internal.js";
@@ -33,18 +33,18 @@ index 178cc74..9289296 100644
33
* Invokes the Effect Vitest equality-tester registration hook.
34
*
35
diff --git a/dist/internal/internal.js b/dist/internal/internal.js
36
-index 7138319..4092c67 100644
36
+index 6c1b1c1..cdc3b26 100644
37
--- a/dist/internal/internal.js
38
+++ b/dist/internal/internal.js
39
-@@ -12,7 +12,7 @@ import * as Schedule from "effect/Schedule";
39
+@@ -13,7 +13,7 @@ import * as Schedule from "effect/Schedule";
40
import * as Scope from "effect/Scope";
41
import * as TestClock from "effect/testing/TestClock";
42
import * as TestConsole from "effect/testing/TestConsole";
43
-import * as V from "vitest";
44
+import * as V from "vite-plus/test";
45
const getCurrentSuite = V.TestRunner.getCurrentSuite;
46
- const runPromise = /*#__PURE__*/Effect.fnUntraced(function* (effect, _ctx) {
47
- const exit = yield* Effect.exit(effect);
46
+ const runPromise = (effect, ctx) => Effect.runPromise(
47
+ // Only the test is interruptible: once the signal aborts, the fiber stops
48
diff --git a/dist/utils.js b/dist/utils.js
49
index b97edbe..7dfd64a 100644
50
--- a/dist/utils.js
@@ -59,7 +59,7 @@ index b97edbe..7dfd64a 100644
59
// Primitives
60
// ----------------------------
61
diff --git a/package.json b/package.json
62
-index b78f4d6..8c43672 100644
62
+index 068e75e..d14a80e 100644
63
--- a/package.json
64
+++ b/package.json
65
@@ -37,7 +37,6 @@
@@ -67,11 +67,11 @@ index b78f4d6..8c43672 100644
67
},
68
"peerDependencies": {
69
- "vitest": ">=5.0.0 <6.0.0",
70
- "effect": "^4.0.5"
70
+ "effect": "^4.1.2"
71
},
72
"devDependencies": {
73
diff --git a/src/index.ts b/src/index.ts
74
-index 9d65132..4aadda8 100644
74
+index cb3bf6f..8024206 100644
75
--- a/src/index.ts
76
+++ b/src/index.ts
77
@@ -10,7 +10,7 @@ import type * as Effect from "effect/Effect"
@@ -93,10 +93,10 @@ index 9d65132..4aadda8 100644
93
/**
94
* Vitest test API without additional fixtures.
95
diff --git a/src/internal/internal.ts b/src/internal/internal.ts
96
-index b43385b..4da79fd 100644
96
+index e6ab75a..3b938a4 100644
97
--- a/src/internal/internal.ts
98
+++ b/src/internal/internal.ts
99
-@@ -14,7 +14,7 @@ import type * as Schema from "effect/Schema"
99
+@@ -15,7 +15,7 @@ import type * as Schema from "effect/Schema"
100
import * as Scope from "effect/Scope"
101
import * as TestClock from "effect/testing/TestClock"
102
import * as TestConsole from "effect/testing/TestConsole"
pnpm-lock.yaml
+574
-519
@@ -165,29 +165,32 @@ settings:
165
catalogs:
166
default:
167
'@alchemy.run/axiom':
168
- specifier: 2.0.0-beta.84
169
- version: 2.0.0-beta.84
168
+ specifier: 2.0.0-beta.85
169
+ version: 2.0.0-beta.85
170
'@alchemy.run/cloudflare':
171
- specifier: 2.0.0-beta.84
172
- version: 2.0.0-beta.84
171
+ specifier: 2.0.0-beta.85
172
+ version: 2.0.0-beta.85
173
'@alchemy.run/drizzle':
174
- specifier: 2.0.0-beta.84
175
- version: 2.0.0-beta.84
174
+ specifier: 2.0.0-beta.85
175
+ version: 2.0.0-beta.85
176
'@alchemy.run/planetscale':
177
- specifier: 2.0.0-beta.84
178
- version: 2.0.0-beta.84
177
+ specifier: 2.0.0-beta.85
178
+ version: 2.0.0-beta.85
179
+ '@alchemy.run/test':
180
+ specifier: 2.0.0-beta.85
181
+ version: 2.0.0-beta.85
182
'@distilled.cloud/cloudflare':
180
- specifier: 1.0.0-rc.17
181
- version: 1.0.0-rc.17
183
+ specifier: 1.0.0-rc.18
184
+ version: 1.0.0-rc.18
185
'@effect/graphql-generator':
183
- specifier: 4.0.5
184
- version: 4.0.5
186
+ specifier: 4.1.2
187
+ version: 4.1.2
188
'@effect/openapi-generator':
186
- specifier: 4.0.5
187
- version: 4.0.5
189
+ specifier: 4.1.2
190
+ version: 4.1.2
191
'@effect/sql-sqlite-do':
189
- specifier: 4.0.5
190
- version: 4.0.5
192
+ specifier: 4.1.2
193
+ version: 4.1.2
194
'@noble/curves':
195
specifier: 1.9.1
196
version: 1.9.1
@@ -270,7 +273,7 @@ overrides:
273
micromark-extension-llm-math: 3.1.0
274
micromark: 4.0.2
275
mdast-util-to-hast: 13.2.1
273
- alchemy: 2.0.0-beta.84
276
+ alchemy: 2.0.0-beta.85
277
expo-audio: 58.0.9
278
expo-network: 58.0.3
279
'@clerk/expo-native-components': 0.4.0
@@ -320,11 +323,12 @@ overrides:
323
'@clerk/expo': 4.14.0
324
'@clerk/react': 6.18.0
325
'@clerk/shared': 4.41.0
323
- '@effect/atom-react': 4.0.5
324
- '@effect/platform-node': 4.0.5
325
- '@effect/platform-node-shared': 4.0.5
326
- '@effect/sql-pg': 4.0.5
327
- '@effect/vitest': 4.0.5
326
+ '@effect/atom-react': 4.1.2
327
+ '@effect/platform-bun': 4.1.2
328
+ '@effect/platform-node': 4.1.2
329
+ '@effect/platform-node-shared': 4.1.2
330
+ '@effect/sql-pg': 4.1.2
331
+ '@effect/vitest': 4.1.2
332
'@effect/vitest>vitest': '-'
333
'@expo/dom-webview': 58.0.2
334
'@expo/metro-config': 58.0.14
@@ -339,9 +343,9 @@ overrides:
343
'@tailwindcss/oxide': 4.3.3
344
'@tailwindcss/vite': 4.3.3
345
'@types/node': 24.12.4
342
- effect: 4.0.5
343
- '@opencode/protocol>effect': 4.0.5
344
- '@opencode/schema>effect': 4.0.5
346
+ effect: 4.1.2
347
+ '@opencode/protocol>effect': 4.1.2
348
+ '@opencode/schema>effect': 4.1.2
349
node-abi: 4.33.0
350
electron-webauthn>@electron-webauthn/macos: 1.3.1
351
'@electron-webauthn/macos>objc-js': 1.5.0
@@ -359,8 +363,9 @@ packageExtensionsChecksum: sha256-EowbsmlBFaoO0Ypufw901RnvdyjKG5dcdk2FRbc7Dr0=
363
pnpmfileChecksum: sha256-STsbxG7+RxOFI611PrDEj1TonJgqKKllY9hYCFMLYiU=
364
365
patchedDependencies:
366
+ '@alchemy.run/test@2.0.0-beta.85': 29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e
367
'@clerk/expo-native-components@0.4.0': 7a808b92da8460750b85818552e13be3fb73d111691c7db76965970351e124e4
363
- '@effect/vitest@4.0.5': 2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02
368
+ '@effect/vitest@4.1.2': 299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7
369
'@expo/fingerprint@0.21.5': 8fba80d6bbce46c72de427fe8c7907462d262a0bfe50c6b2b7ee9c4e0c61e5e1
370
'@expo/metro-config@58.0.14': 90fa980e8b6480631fb2fbb04559834e3c612db40c550cd828f11be297d8d760
371
'@expo/ui@58.0.20': 64559cb60723e19a8a72256d4c78d1315d937a7af3b32d19860ea596f88736ce
@@ -371,7 +376,6 @@ patchedDependencies:
376
'@react-native-ai/apple@0.12.0': 2d09870c2848d185cb05b53ed823a46e12dba519324d8dd8e584e28731990f9d
377
'@react-native-menu/menu@2.0.0': 910ec1bf22aa85a96fcf12299cd823bc30f702dd9b2d77b564d10b9ed709f7f6
378
'@react-navigation/native-stack@7.21.0': 990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42
374
- alchemy@2.0.0-beta.84: 824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042
379
app-builder-lib@26.16.1: 0fbe9ae51783f5768ebe197d12d1fdb7d477a08c92e5db2f6356bcce62613c53
380
dbus-next@0.10.2: cfff57561b0ee59b5addb3b2e6c6f20906e967507a530ab67e8db8108e520ba4
381
expo-audio@58.0.9: 530af071088a809fe1a97ce2b2269c78335fbb5dcd3893d6937ff5c304c85a0a
@@ -428,8 +432,8 @@ importers:
432
specifier: 0.13.0
433
version: 0.13.0
434
'@effect/platform-node':
431
- specifier: 4.0.5
432
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
435
+ specifier: 4.1.2
436
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
437
'@napi-rs/keyring':
438
specifier: ^1.3.0
439
version: 1.3.0
@@ -452,8 +456,8 @@ importers:
456
specifier: 0.10.2
457
version: 0.10.2(patch_hash=cfff57561b0ee59b5addb3b2e6c6f20906e967507a530ab67e8db8108e520ba4)
458
effect:
455
- specifier: 4.0.5
456
- version: 4.0.5
459
+ specifier: 4.1.2
460
+ version: 4.1.2
461
electron:
462
specifier: 44.10.0
463
version: 44.10.0(supports-color@8.1.1)
@@ -480,8 +484,8 @@ importers:
484
version: 7.4.2
485
devDependencies:
486
'@effect/vitest':
483
- specifier: 4.0.5
484
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
487
+ specifier: 4.1.2
488
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
489
'@types/node':
490
specifier: 24.12.4
491
version: 24.12.4
@@ -535,8 +539,8 @@ importers:
539
specifier: 0.4.0
540
version: 0.4.0(patch_hash=7a808b92da8460750b85818552e13be3fb73d111691c7db76965970351e124e4)(@tsc-rs/typescript@0.8.0)(expo@58.0.14)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1)
541
'@effect/atom-react':
538
- specifier: 4.0.5
539
- version: 4.0.5(effect@4.0.5)(react@19.3.0)(scheduler@0.28.0)
542
+ specifier: 4.1.2
543
+ version: 4.1.2(effect@4.1.2)(react@19.3.0)(scheduler@0.28.0)
544
'@expo-google-fonts/dm-sans':
545
specifier: ^0.4.2
546
version: 0.4.2
@@ -610,8 +614,8 @@ importers:
614
specifier: 8.0.3
615
version: 8.0.3
616
effect:
613
- specifier: 4.0.5
614
- version: 4.0.5
617
+ specifier: 4.1.2
618
+ version: 4.1.2
619
expo:
620
specifier: 58.0.14
621
version: 58.0.14(277a83826bb26ba15256633fefeb0bc2)
@@ -794,11 +798,11 @@ importers:
798
specifier: ^7.29.7
799
version: 7.29.7(supports-color@8.1.1)
800
'@effect/platform-node':
797
- specifier: 4.0.5
798
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
801
+ specifier: 4.1.2
802
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
803
'@effect/vitest':
800
- specifier: 4.0.5
801
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
804
+ specifier: 4.1.2
805
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
806
'@pierre/trees':
807
specifier: 1.0.0-beta.6
808
version: 1.0.0-beta.6(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
@@ -836,11 +840,11 @@ importers:
840
specifier: 1.2.0
841
version: 1.2.0(zod@4.6.5)
842
'@effect/platform-node':
839
- specifier: 4.0.5
840
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
843
+ specifier: 4.1.2
844
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
845
'@effect/platform-node-shared':
842
- specifier: 4.0.5
843
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(utf-8-validate@6.0.6)
846
+ specifier: 4.1.2
847
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
848
'@ff-labs/fff-node':
849
specifier: 0.11.0
850
version: 0.11.0(patch_hash=cc71fcec015f4d39bc96ae2e2bf6b0ca678124c722c66a7841efce9d34b5983c)
@@ -911,8 +915,8 @@ importers:
915
specifier: 8.0.3
916
version: 8.0.3
917
effect:
914
- specifier: 4.0.5
915
- version: 4.0.5
918
+ specifier: 4.1.2
919
+ version: 4.1.2
920
ffi-rs:
921
specifier: 1.3.2
922
version: 1.3.2
@@ -952,10 +956,10 @@ importers:
956
devDependencies:
957
'@effect/graphql-generator':
958
specifier: 'catalog:'
955
- version: 4.0.5(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.0.5)
959
+ version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)
960
'@effect/vitest':
957
- specifier: 4.0.5
958
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
961
+ specifier: 4.1.2
962
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
963
'@opencode-ai/sdk':
964
specifier: ^1.3.15
965
version: 1.15.13
@@ -1053,8 +1057,8 @@ importers:
1057
specifier: ^3.2.2
1058
version: 3.2.2(react@19.3.0)
1059
'@effect/atom-react':
1056
- specifier: 4.0.5
1057
- version: 4.0.5(effect@4.0.5)(react@19.3.0)(scheduler@0.28.0)
1060
+ specifier: 4.1.2
1061
+ version: 4.1.2(effect@4.1.2)(react@19.3.0)(scheduler@0.28.0)
1062
'@fontsource-variable/inter':
1063
specifier: ^5.3.0
1064
version: 5.3.0
@@ -1149,8 +1153,8 @@ importers:
1153
specifier: ^3.4.16
1154
version: 3.4.16
1155
effect:
1152
- specifier: 4.0.5
1153
- version: 4.0.5
1156
+ specifier: 4.1.2
1157
+ version: 4.1.2
1158
entities:
1159
specifier: 8.1.0
1160
version: 8.1.0
@@ -1252,11 +1256,11 @@ importers:
1256
version: 5.0.14(@types/react@19.3.0)(react@19.3.0)(use-sync-external-store@1.6.0(react@19.3.0))
1257
devDependencies:
1258
'@effect/platform-node':
1255
- specifier: 4.0.5
1256
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1259
+ specifier: 4.1.2
1260
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1261
'@effect/vitest':
1258
- specifier: 4.0.5
1259
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1262
+ specifier: 4.1.2
1263
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1264
'@tailwindcss/vite':
1265
specifier: 4.3.3
1266
version: 4.3.3(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))
@@ -1321,8 +1325,8 @@ importers:
1325
evals:
1326
dependencies:
1327
'@effect/platform-node':
1324
- specifier: 4.0.5
1325
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1328
+ specifier: 4.1.2
1329
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1330
'@t3tools/contracts':
1331
specifier: workspace:*
1332
version: link:../packages/contracts
@@ -1333,12 +1337,12 @@ importers:
1337
specifier: workspace:*
1338
version: link:../packages/shared
1339
effect:
1336
- specifier: 4.0.5
1337
- version: 4.0.5
1340
+ specifier: 4.1.2
1341
+ version: 4.1.2
1342
devDependencies:
1343
'@effect/vitest':
1340
- specifier: 4.0.5
1341
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1344
+ specifier: 4.1.2
1345
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1346
'@types/node':
1347
specifier: 24.12.4
1348
version: 24.12.4
@@ -1353,28 +1357,28 @@ importers:
1357
dependencies:
1358
'@alchemy.run/axiom':
1359
specifier: 'catalog:'
1356
- version: 2.0.0-beta.84(74118100341fd69edb1510aa7b7f1bd2)
1360
+ version: 2.0.0-beta.85(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)
1361
'@alchemy.run/cloudflare':
1362
specifier: 'catalog:'
1359
- version: 2.0.0-beta.84(24ce6902b7189b66a257867375b8f56d)
1363
+ version: 2.0.0-beta.85(3c6bb1d0d4de1cb5d4932cf1224d79e6)
1364
'@alchemy.run/drizzle':
1365
specifier: 'catalog:'
1362
- version: 2.0.0-beta.84(621723465c0c1236eb5d87515baf6818)
1366
+ version: 2.0.0-beta.85(0f2f0b2f6e85ad5bbc9df78a7c15a609)
1367
'@alchemy.run/planetscale':
1368
specifier: 'catalog:'
1365
- version: 2.0.0-beta.84(1b64d144d22bc50b8239f5331dd49513)
1369
+ version: 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)
1370
'@clerk/backend':
1371
specifier: 3.25.0
1372
version: 3.25.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1373
'@distilled.cloud/cloudflare':
1374
specifier: 'catalog:'
1371
- version: 1.0.0-rc.17(effect@4.0.5)
1375
+ version: 1.0.0-rc.18(effect@4.1.2)
1376
'@effect/sql-pg':
1373
- specifier: 4.0.5
1374
- version: 4.0.5(effect@4.0.5)
1377
+ specifier: 4.1.2
1378
+ version: 4.1.2(effect@4.1.2)
1379
'@effect/sql-sqlite-do':
1380
specifier: 'catalog:'
1377
- version: 4.0.5(effect@4.0.5)
1381
+ version: 4.1.2(effect@4.1.2)
1382
'@noble/curves':
1383
specifier: 'catalog:'
1384
version: 1.9.1
@@ -1391,24 +1395,27 @@ importers:
1395
specifier: workspace:*
1396
version: link:../../packages/shared
1397
alchemy:
1394
- specifier: 2.0.0-beta.84
1395
- version: 2.0.0-beta.84(patch_hash=824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042)(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
1398
+ specifier: 2.0.0-beta.85
1399
+ version: 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
1400
drizzle-orm:
1401
specifier: 1.0.0-rc.5-ab785fc
1398
- version: 1.0.0-rc.5-ab785fc(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.0.6(effect@4.0.5))(@effect/sql-pg@4.0.5(effect@4.0.5))(@effect/sql-sqlite-bun@4.0.0-rc.112(effect@4.0.5))(@effect/sql-sqlite-do@4.0.5(effect@4.0.5))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.0.5)(expo-sqlite@58.0.13(expo@58.0.14)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.5)
1402
+ version: 1.0.0-rc.5-ab785fc(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.2))(@effect/sql-pg@4.1.2(effect@4.1.2))(@effect/sql-sqlite-do@4.1.2(effect@4.1.2))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.2)(expo-sqlite@58.0.13(expo@58.0.14)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.5)
1403
effect:
1400
- specifier: 4.0.5
1401
- version: 4.0.5
1404
+ specifier: 4.1.2
1405
+ version: 4.1.2
1406
devDependencies:
1407
+ '@alchemy.run/test':
1408
+ specifier: 'catalog:'
1409
+ version: 2.0.0-beta.85(patch_hash=29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e)(071253407c4f3cb63d401833ee1dda26)
1410
'@cloudflare/workers-types':
1411
specifier: ^4.20260601.1
1412
version: 4.20260604.1
1413
'@effect/platform-node':
1407
- specifier: 4.0.5
1408
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1414
+ specifier: 4.1.2
1415
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1416
'@effect/vitest':
1410
- specifier: 4.0.5
1411
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1417
+ specifier: 4.1.2
1418
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1419
'@electric-sql/pglite':
1420
specifier: 0.3.15
1421
version: 0.3.15
@@ -1432,16 +1439,16 @@ importers:
1439
dependencies:
1440
'@alchemy.run/axiom':
1441
specifier: 'catalog:'
1435
- version: 2.0.0-beta.84(74118100341fd69edb1510aa7b7f1bd2)
1442
+ version: 2.0.0-beta.85(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)
1443
'@alchemy.run/cloudflare':
1444
specifier: 'catalog:'
1438
- version: 2.0.0-beta.84(24ce6902b7189b66a257867375b8f56d)
1445
+ version: 2.0.0-beta.85(3c6bb1d0d4de1cb5d4932cf1224d79e6)
1446
alchemy:
1440
- specifier: 2.0.0-beta.84
1441
- version: 2.0.0-beta.84(patch_hash=824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042)(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
1447
+ specifier: 2.0.0-beta.85
1448
+ version: 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
1449
effect:
1443
- specifier: 4.0.5
1444
- version: 4.0.5
1450
+ specifier: 4.1.2
1451
+ version: 4.1.2
1452
jose:
1453
specifier: 'catalog:'
1454
version: 6.2.2
@@ -1450,11 +1457,11 @@ importers:
1457
specifier: ^4.20260601.1
1458
version: 4.20260604.1
1459
'@effect/platform-node':
1453
- specifier: 4.0.5
1454
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1460
+ specifier: 4.1.2
1461
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1462
'@effect/vitest':
1456
- specifier: 4.0.5
1457
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1463
+ specifier: 4.1.2
1464
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1465
'@types/node':
1466
specifier: 24.12.4
1467
version: 24.12.4
@@ -1471,15 +1478,15 @@ importers:
1478
specifier: ^1.63.0
1479
version: 1.89.0
1480
effect:
1474
- specifier: 4.0.5
1475
- version: 4.0.5
1481
+ specifier: 4.1.2
1482
+ version: 4.1.2
1483
devDependencies:
1484
'@effect/platform-node':
1478
- specifier: 4.0.5
1479
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1485
+ specifier: 4.1.2
1486
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1487
'@effect/vitest':
1481
- specifier: 4.0.5
1482
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1488
+ specifier: 4.1.2
1489
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1490
vite-plus:
1491
specifier: 1.4.0
1492
version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
@@ -1529,8 +1536,8 @@ importers:
1536
specifier: workspace:*
1537
version: link:../source-control-definitions
1538
effect:
1532
- specifier: 4.0.5
1533
- version: 4.0.5
1539
+ specifier: 4.1.2
1540
+ version: 4.1.2
1541
jszip:
1542
specifier: 3.10.1
1543
version: 3.10.1
@@ -1539,8 +1546,8 @@ importers:
1546
version: 0.180.0
1547
devDependencies:
1548
'@effect/vitest':
1542
- specifier: 4.0.5
1543
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1549
+ specifier: 4.1.2
1550
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1551
'@types/three':
1552
specifier: 0.180.0
1553
version: 0.180.0
@@ -1551,12 +1558,12 @@ importers:
1558
packages/contracts:
1559
dependencies:
1560
effect:
1554
- specifier: 4.0.5
1555
- version: 4.0.5
1561
+ specifier: 4.1.2
1562
+ version: 4.1.2
1563
devDependencies:
1564
'@effect/vitest':
1558
- specifier: 4.0.5
1559
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1565
+ specifier: 4.1.2
1566
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1567
vite-plus:
1568
specifier: 1.4.0
1569
version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
@@ -1564,18 +1571,18 @@ importers:
1571
packages/effect-acp:
1572
dependencies:
1573
effect:
1567
- specifier: 4.0.5
1568
- version: 4.0.5
1574
+ specifier: 4.1.2
1575
+ version: 4.1.2
1576
devDependencies:
1577
'@effect/openapi-generator':
1578
specifier: 'catalog:'
1572
- version: 4.0.5(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.0.5)(encoding@0.1.13)
1579
+ version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)(encoding@0.1.13)
1580
'@effect/platform-node':
1574
- specifier: 4.0.5
1575
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1581
+ specifier: 4.1.2
1582
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1583
'@effect/vitest':
1577
- specifier: 4.0.5
1578
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1584
+ specifier: 4.1.2
1585
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1586
'@types/node':
1587
specifier: 24.12.4
1588
version: 24.12.4
@@ -1586,18 +1593,18 @@ importers:
1593
packages/effect-codex-app-server:
1594
dependencies:
1595
effect:
1589
- specifier: 4.0.5
1590
- version: 4.0.5
1596
+ specifier: 4.1.2
1597
+ version: 4.1.2
1598
devDependencies:
1599
'@effect/openapi-generator':
1600
specifier: 'catalog:'
1594
- version: 4.0.5(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.0.5)(encoding@0.1.13)
1601
+ version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)(encoding@0.1.13)
1602
'@effect/platform-node':
1596
- specifier: 4.0.5
1597
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1603
+ specifier: 4.1.2
1604
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1605
'@effect/vitest':
1599
- specifier: 4.0.5
1600
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1606
+ specifier: 4.1.2
1607
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1608
'@types/node':
1609
specifier: 24.12.4
1610
version: 24.12.4
@@ -1620,15 +1627,15 @@ importers:
1627
specifier: 8.0.3
1628
version: 8.0.3
1629
effect:
1623
- specifier: 4.0.5
1624
- version: 4.0.5
1630
+ specifier: 4.1.2
1631
+ version: 4.1.2
1632
devDependencies:
1633
'@effect/platform-node':
1627
- specifier: 4.0.5
1628
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1634
+ specifier: 4.1.2
1635
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1636
'@effect/vitest':
1630
- specifier: 4.0.5
1631
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1637
+ specifier: 4.1.2
1638
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1639
'@types/node':
1640
specifier: 24.12.4
1641
version: 24.12.4
@@ -1657,15 +1664,15 @@ importers:
1664
specifier: workspace:*
1665
version: link:../shared
1666
effect:
1660
- specifier: 4.0.5
1661
- version: 4.0.5
1667
+ specifier: 4.1.2
1668
+ version: 4.1.2
1669
devDependencies:
1670
'@effect/platform-node':
1664
- specifier: 4.0.5
1665
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1671
+ specifier: 4.1.2
1672
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1673
'@effect/vitest':
1667
- specifier: 4.0.5
1668
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1674
+ specifier: 4.1.2
1675
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1676
'@t3tools/provider-testing':
1677
specifier: workspace:*
1678
version: link:../provider-testing
@@ -1688,15 +1695,15 @@ importers:
1695
specifier: workspace:*
1696
version: link:../shared
1697
effect:
1691
- specifier: 4.0.5
1692
- version: 4.0.5
1698
+ specifier: 4.1.2
1699
+ version: 4.1.2
1700
devDependencies:
1701
'@effect/platform-node':
1695
- specifier: 4.0.5
1696
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1702
+ specifier: 4.1.2
1703
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1704
'@effect/vitest':
1698
- specifier: 4.0.5
1699
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1705
+ specifier: 4.1.2
1706
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1707
'@types/node':
1708
specifier: 24.12.4
1709
version: 24.12.4
@@ -1722,18 +1729,18 @@ importers:
1729
specifier: workspace:*
1730
version: link:../shared
1731
effect:
1725
- specifier: 4.0.5
1726
- version: 4.0.5
1732
+ specifier: 4.1.2
1733
+ version: 4.1.2
1734
yaml:
1735
specifier: ^2.9.0
1736
version: 2.9.0
1737
devDependencies:
1738
'@effect/platform-node':
1732
- specifier: 4.0.5
1733
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1739
+ specifier: 4.1.2
1740
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1741
'@effect/vitest':
1735
- specifier: 4.0.5
1736
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1742
+ specifier: 4.1.2
1743
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1744
'@t3tools/provider-testing':
1745
specifier: workspace:*
1746
version: link:../provider-testing
@@ -1759,15 +1766,15 @@ importers:
1766
specifier: workspace:*
1767
version: link:../shared
1768
effect:
1762
- specifier: 4.0.5
1763
- version: 4.0.5
1769
+ specifier: 4.1.2
1770
+ version: 4.1.2
1771
devDependencies:
1772
'@effect/platform-node':
1766
- specifier: 4.0.5
1767
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1773
+ specifier: 4.1.2
1774
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1775
'@effect/vitest':
1769
- specifier: 4.0.5
1770
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1776
+ specifier: 4.1.2
1777
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1778
'@types/node':
1779
specifier: 24.12.4
1780
version: 24.12.4
@@ -1793,15 +1800,15 @@ importers:
1800
specifier: workspace:*
1801
version: link:../shared
1802
effect:
1796
- specifier: 4.0.5
1797
- version: 4.0.5
1803
+ specifier: 4.1.2
1804
+ version: 4.1.2
1805
devDependencies:
1806
'@effect/platform-node':
1800
- specifier: 4.0.5
1801
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1807
+ specifier: 4.1.2
1808
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1809
'@effect/vitest':
1803
- specifier: 4.0.5
1804
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1810
+ specifier: 4.1.2
1811
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1812
'@t3tools/provider-testing':
1813
specifier: workspace:*
1814
version: link:../provider-testing
@@ -1830,12 +1837,12 @@ importers:
1837
specifier: workspace:*
1838
version: link:../shared
1839
effect:
1833
- specifier: 4.0.5
1834
- version: 4.0.5
1840
+ specifier: 4.1.2
1841
+ version: 4.1.2
1842
devDependencies:
1843
'@effect/vitest':
1837
- specifier: 4.0.5
1838
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1844
+ specifier: 4.1.2
1845
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1846
'@types/node':
1847
specifier: 24.12.4
1848
version: 24.12.4
@@ -1861,15 +1868,15 @@ importers:
1868
specifier: workspace:*
1869
version: link:../shared
1870
effect:
1864
- specifier: 4.0.5
1865
- version: 4.0.5
1871
+ specifier: 4.1.2
1872
+ version: 4.1.2
1873
devDependencies:
1874
'@effect/platform-node':
1868
- specifier: 4.0.5
1869
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1875
+ specifier: 4.1.2
1876
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1877
'@effect/vitest':
1871
- specifier: 4.0.5
1872
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1878
+ specifier: 4.1.2
1879
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1880
'@t3tools/provider-testing':
1881
specifier: workspace:*
1882
version: link:../provider-testing
@@ -1887,7 +1894,7 @@ importers:
1894
version: 1.15.13
1895
'@opencode/client':
1896
specifier: 2.0.28
1890
- version: 2.0.28(effect@4.0.5)
1897
+ version: 2.0.28(effect@4.1.2)
1898
'@opencode/protocol':
1899
specifier: 2.0.28
1900
version: 2.0.28
@@ -1904,15 +1911,15 @@ importers:
1911
specifier: workspace:*
1912
version: link:../shared
1913
effect:
1907
- specifier: 4.0.5
1908
- version: 4.0.5
1914
+ specifier: 4.1.2
1915
+ version: 4.1.2
1916
devDependencies:
1917
'@effect/platform-node':
1911
- specifier: 4.0.5
1912
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1918
+ specifier: 4.1.2
1919
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1920
'@effect/vitest':
1914
- specifier: 4.0.5
1915
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1921
+ specifier: 4.1.2
1922
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1923
'@t3tools/provider-testing':
1924
specifier: workspace:*
1925
version: link:../provider-testing
@@ -1935,15 +1942,15 @@ importers:
1942
specifier: workspace:*
1943
version: link:../shared
1944
effect:
1938
- specifier: 4.0.5
1939
- version: 4.0.5
1945
+ specifier: 4.1.2
1946
+ version: 4.1.2
1947
devDependencies:
1948
'@effect/platform-node':
1942
- specifier: 4.0.5
1943
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1949
+ specifier: 4.1.2
1950
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1951
'@effect/vitest':
1945
- specifier: 4.0.5
1946
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1952
+ specifier: 4.1.2
1953
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1954
'@t3tools/provider-testing':
1955
specifier: workspace:*
1956
version: link:../provider-testing
@@ -1957,8 +1964,8 @@ importers:
1964
packages/provider-testing:
1965
dependencies:
1966
'@effect/platform-node':
1960
- specifier: 4.0.5
1961
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1967
+ specifier: 4.1.2
1968
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1969
'@t3tools/contracts':
1970
specifier: workspace:*
1971
version: link:../contracts
@@ -1969,8 +1976,8 @@ importers:
1976
specifier: workspace:*
1977
version: link:../shared
1978
effect:
1972
- specifier: 4.0.5
1973
- version: 4.0.5
1979
+ specifier: 4.1.2
1980
+ version: 4.1.2
1981
devDependencies:
1982
'@types/node':
1983
specifier: 24.12.4
@@ -1982,15 +1989,15 @@ importers:
1989
specifier: workspace:*
1990
version: link:../contracts
1991
effect:
1985
- specifier: 4.0.5
1986
- version: 4.0.5
1992
+ specifier: 4.1.2
1993
+ version: 4.1.2
1994
devDependencies:
1995
'@effect/platform-node':
1989
- specifier: 4.0.5
1990
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
1996
+ specifier: 4.1.2
1997
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
1998
'@effect/vitest':
1992
- specifier: 4.0.5
1993
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
1999
+ specifier: 4.1.2
2000
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2001
'@types/node':
2002
specifier: 24.12.4
2003
version: 24.12.4
@@ -2022,15 +2029,15 @@ importers:
2029
specifier: workspace:*
2030
version: link:../shared
2031
effect:
2025
- specifier: 4.0.5
2026
- version: 4.0.5
2032
+ specifier: 4.1.2
2033
+ version: 4.1.2
2034
devDependencies:
2035
'@effect/platform-node':
2029
- specifier: 4.0.5
2030
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
2036
+ specifier: 4.1.2
2037
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2038
'@effect/vitest':
2032
- specifier: 4.0.5
2033
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2039
+ specifier: 4.1.2
2040
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2041
'@types/node':
2042
specifier: 24.12.4
2043
version: 24.12.4
@@ -2050,8 +2057,8 @@ importers:
2057
specifier: workspace:*
2058
version: link:../contracts
2059
effect:
2053
- specifier: 4.0.5
2054
- version: 4.0.5
2060
+ specifier: 4.1.2
2061
+ version: 4.1.2
2062
ffi-rs:
2063
specifier: 1.3.2
2064
version: 1.3.2
@@ -2102,11 +2109,11 @@ importers:
2109
version: 2.9.0
2110
devDependencies:
2111
'@effect/platform-node':
2105
- specifier: 4.0.5
2106
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
2112
+ specifier: 4.1.2
2113
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2114
'@effect/vitest':
2108
- specifier: 4.0.5
2109
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2115
+ specifier: 4.1.2
2116
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2117
'@types/mdast':
2118
specifier: ^4.0.4
2119
version: 4.0.4
@@ -2135,15 +2142,15 @@ importers:
2142
specifier: 8.0.3
2143
version: 8.0.3
2144
effect:
2138
- specifier: 4.0.5
2139
- version: 4.0.5
2145
+ specifier: 4.1.2
2146
+ version: 4.1.2
2147
devDependencies:
2148
'@effect/platform-node':
2142
- specifier: 4.0.5
2143
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
2149
+ specifier: 4.1.2
2150
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2151
'@effect/vitest':
2145
- specifier: 4.0.5
2146
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2152
+ specifier: 4.1.2
2153
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2154
'@t3tools/source-control-testing':
2155
specifier: workspace:*
2156
version: link:../source-control-testing
@@ -2169,15 +2176,15 @@ importers:
2176
specifier: workspace:*
2177
version: link:../source-control-core
2178
effect:
2172
- specifier: 4.0.5
2173
- version: 4.0.5
2179
+ specifier: 4.1.2
2180
+ version: 4.1.2
2181
devDependencies:
2182
'@effect/platform-node':
2176
- specifier: 4.0.5
2177
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
2183
+ specifier: 4.1.2
2184
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2185
'@effect/vitest':
2179
- specifier: 4.0.5
2180
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2186
+ specifier: 4.1.2
2187
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2188
'@t3tools/source-control-testing':
2189
specifier: workspace:*
2190
version: link:../source-control-testing
@@ -2197,12 +2204,12 @@ importers:
2204
specifier: workspace:*
2205
version: link:../shared
2206
effect:
2200
- specifier: 4.0.5
2201
- version: 4.0.5
2207
+ specifier: 4.1.2
2208
+ version: 4.1.2
2209
devDependencies:
2210
'@effect/vitest':
2204
- specifier: 4.0.5
2205
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2211
+ specifier: 4.1.2
2212
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2213
'@types/node':
2214
specifier: 24.12.4
2215
version: 24.12.4
@@ -2249,15 +2256,15 @@ importers:
2256
specifier: workspace:*
2257
version: link:../source-control-core
2258
effect:
2252
- specifier: 4.0.5
2253
- version: 4.0.5
2259
+ specifier: 4.1.2
2260
+ version: 4.1.2
2261
devDependencies:
2262
'@effect/platform-node':
2256
- specifier: 4.0.5
2257
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
2263
+ specifier: 4.1.2
2264
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2265
'@effect/vitest':
2259
- specifier: 4.0.5
2260
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2266
+ specifier: 4.1.2
2267
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2268
'@t3tools/source-control-testing':
2269
specifier: workspace:*
2270
version: link:../source-control-testing
@@ -2283,12 +2290,12 @@ importers:
2290
specifier: workspace:*
2291
version: link:../source-control-core
2292
effect:
2286
- specifier: 4.0.5
2287
- version: 4.0.5
2293
+ specifier: 4.1.2
2294
+ version: 4.1.2
2295
devDependencies:
2296
'@effect/vitest':
2290
- specifier: 4.0.5
2291
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2297
+ specifier: 4.1.2
2298
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2299
'@t3tools/source-control-testing':
2300
specifier: workspace:*
2301
version: link:../source-control-testing
@@ -2314,18 +2321,18 @@ importers:
2321
specifier: workspace:*
2322
version: link:../source-control-core
2323
effect:
2317
- specifier: 4.0.5
2318
- version: 4.0.5
2324
+ specifier: 4.1.2
2325
+ version: 4.1.2
2326
devDependencies:
2327
'@effect/graphql-generator':
2328
specifier: 'catalog:'
2322
- version: 4.0.5(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.0.5)
2329
+ version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)
2330
'@effect/platform-node':
2324
- specifier: 4.0.5
2325
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
2331
+ specifier: 4.1.2
2332
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2333
'@effect/vitest':
2327
- specifier: 4.0.5
2328
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2334
+ specifier: 4.1.2
2335
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2336
'@t3tools/source-control-testing':
2337
specifier: workspace:*
2338
version: link:../source-control-testing
@@ -2348,12 +2355,12 @@ importers:
2355
specifier: workspace:*
2356
version: link:../source-control-core
2357
effect:
2351
- specifier: 4.0.5
2352
- version: 4.0.5
2358
+ specifier: 4.1.2
2359
+ version: 4.1.2
2360
devDependencies:
2361
'@effect/vitest':
2355
- specifier: 4.0.5
2356
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2362
+ specifier: 4.1.2
2363
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2364
'@t3tools/source-control-testing':
2365
specifier: workspace:*
2366
version: link:../source-control-testing
@@ -2367,8 +2374,8 @@ importers:
2374
packages/source-control-testing:
2375
dependencies:
2376
'@effect/platform-node':
2370
- specifier: 4.0.5
2371
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
2377
+ specifier: 4.1.2
2378
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2379
'@t3tools/contracts':
2380
specifier: workspace:*
2381
version: link:../contracts
@@ -2379,8 +2386,8 @@ importers:
2386
specifier: workspace:*
2387
version: link:../source-control-core
2388
effect:
2382
- specifier: 4.0.5
2383
- version: 4.0.5
2389
+ specifier: 4.1.2
2390
+ version: 4.1.2
2391
devDependencies:
2392
'@types/node':
2393
specifier: 24.12.4
@@ -2395,15 +2402,15 @@ importers:
2402
specifier: workspace:*
2403
version: link:../shared
2404
effect:
2398
- specifier: 4.0.5
2399
- version: 4.0.5
2405
+ specifier: 4.1.2
2406
+ version: 4.1.2
2407
devDependencies:
2408
'@effect/platform-node':
2402
- specifier: 4.0.5
2403
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
2409
+ specifier: 4.1.2
2410
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2411
'@effect/vitest':
2405
- specifier: 4.0.5
2406
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2412
+ specifier: 4.1.2
2413
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2414
'@types/node':
2415
specifier: 24.12.4
2416
version: 24.12.4
@@ -2417,12 +2424,12 @@ importers:
2424
specifier: workspace:*
2425
version: link:../shared
2426
effect:
2420
- specifier: 4.0.5
2421
- version: 4.0.5
2427
+ specifier: 4.1.2
2428
+ version: 4.1.2
2429
devDependencies:
2430
'@effect/vitest':
2424
- specifier: 4.0.5
2425
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2431
+ specifier: 4.1.2
2432
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2433
'@types/node':
2434
specifier: 24.12.4
2435
version: 24.12.4
@@ -2433,8 +2440,8 @@ importers:
2440
scripts:
2441
dependencies:
2442
'@effect/platform-node':
2436
- specifier: 4.0.5
2437
- version: 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
2443
+ specifier: 4.1.2
2444
+ version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
2445
'@electron/asar':
2446
specifier: ^4.3.0
2447
version: 4.3.0
@@ -2454,8 +2461,8 @@ importers:
2461
specifier: 0.21.32
2462
version: 0.21.32
2463
effect:
2457
- specifier: 4.0.5
2458
- version: 4.0.5
2464
+ specifier: 4.1.2
2465
+ version: 4.1.2
2466
playwright-core:
2467
specifier: 1.60.0
2468
version: 1.60.0
@@ -2470,8 +2477,8 @@ importers:
2477
version: 0.35.4(@types/node@24.12.4)
2478
devDependencies:
2479
'@effect/vitest':
2473
- specifier: 4.0.5
2474
- version: 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2480
+ specifier: 4.1.2
2481
+ version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
2482
'@types/plist':
2483
specifier: 'catalog:'
2484
version: 3.0.5
@@ -2515,25 +2522,25 @@ packages:
2522
resolution: {integrity: sha512-IpefF5ssZVOZCD4Wu7zxt6PwZoGT2HLVjxpJ10Bjx6EAmRfLYJPjyrfxb0RYDlwvXnDb9nkQ7Do/oJVDuRFzew==}
2523
engines: {node: '>=18'}
2524
2518
- '@alchemy.run/acme@2.0.0-beta.84':
2519
- resolution: {integrity: sha512-ma7HaEN5K7hsNlSkK7CEGn+08hKi4xP1puEAoSO7UACXc/j/2gZKljuztADyCOKOdp8nIMJ/zH12Qs7J11E8cQ==}
2525
+ '@alchemy.run/acme@2.0.0-beta.85':
2526
+ resolution: {integrity: sha512-hOV18VHG6ivrbPnk35hoqlCQPc6bR8b9soGmHlSkbnPIgVZUg7jpliF9AztSSJbJK4GHcBFc9hWetwCRHzGYAg==}
2527
peerDependencies:
2521
- alchemy: 2.0.0-beta.84
2522
- effect: 4.0.5
2528
+ alchemy: 2.0.0-beta.85
2529
+ effect: 4.1.2
2530
2524
- '@alchemy.run/axiom@2.0.0-beta.84':
2525
- resolution: {integrity: sha512-7kZpp2Trdw7pp/27EWspAcXxcNQfxyFLwY0P/WjnDHg/WqNK0AHFNBGgQoY6jI/vA8YO5DxdzfzI53Tj6hCRZA==}
2531
+ '@alchemy.run/axiom@2.0.0-beta.85':
2532
+ resolution: {integrity: sha512-dpBBDxZaRlRIiszRYTUB9M3e3yN6hvkyYTpc0E66tJfcESY6rwp2O2fl38Mun5iLEyGJb2Gvv4HqPiURYWzrHw==}
2533
peerDependencies:
2527
- alchemy: 2.0.0-beta.84
2528
- effect: 4.0.5
2534
+ alchemy: 2.0.0-beta.85
2535
+ effect: 4.1.2
2536
2530
- '@alchemy.run/cloudflare-runtime@2.0.0-beta.84':
2531
- resolution: {integrity: sha512-wmlfbJHBEpyKpKosIKi6yte0T6WKofed0rDHR1zk7tZdqwUKNNSRcbR9ejfJ4mty7lkQH0fLKn4vcmfnlX9KDQ==}
2537
+ '@alchemy.run/cloudflare-runtime@2.0.0-beta.85':
2538
+ resolution: {integrity: sha512-OyGH/j5R9QaUdMjvm3y6pIUpMa7T9SvVYvlVd+fWo/eltOf+k/KQxC12QHC2fe22GVs3apL28l9f4VUH8N9aEA==}
2539
peerDependencies:
2533
- '@distilled.cloud/cloudflare': 1.0.0-rc.17
2534
- '@effect/platform-bun': ^4.0.5
2535
- '@effect/platform-node': 4.0.5
2536
- effect: 4.0.5
2540
+ '@distilled.cloud/cloudflare': 1.0.0-rc.18
2541
+ '@effect/platform-bun': 4.1.2
2542
+ '@effect/platform-node': 4.1.2
2543
+ effect: 4.1.2
2544
rolldown: 1.2.13
2545
vite: ^7.0.0 || ^8.0.0
2546
peerDependenciesMeta:
@@ -2546,16 +2553,16 @@ packages:
2553
vite:
2554
optional: true
2555
2549
- '@alchemy.run/cloudflare@2.0.0-beta.84':
2550
- resolution: {integrity: sha512-8AEp0664arL1BLPIxQJ/lgIUPRvsk0SxC/6fW6S3Gt2SOauUF2YpUsgRr94m4pTX453gacMXwJ/kw8lgOv+TMw==}
2556
+ '@alchemy.run/cloudflare@2.0.0-beta.85':
2557
+ resolution: {integrity: sha512-gS/LYJIpEiRthx+Eqr/+O9TseXB7PGuWWkOc96oHfqwDHu+8zUzaY1pwsc0qQ1eAlgd/xy8YWnM6JThc6eXOUQ==}
2558
peerDependencies:
2552
- '@alchemy.run/domain': 2.0.0-beta.84
2553
- '@alchemy.run/frontend-frameworks': 2.0.0-beta.84
2554
- '@effect/platform-bun': ^4.0.5
2555
- '@effect/platform-node': 4.0.5
2556
- alchemy: 2.0.0-beta.84
2557
- effect: 4.0.5
2558
- vite: ^8.0.7
2559
+ '@alchemy.run/domain': 2.0.0-beta.85
2560
+ '@alchemy.run/frontend-frameworks': 2.0.0-beta.85
2561
+ '@effect/platform-bun': 4.1.2
2562
+ '@effect/platform-node': 4.1.2
2563
+ alchemy: 2.0.0-beta.85
2564
+ effect: 4.1.2
2565
+ vite: ^7.0.0 || ^8.0.0
2566
peerDependenciesMeta:
2567
'@alchemy.run/domain':
2568
optional: true
@@ -2568,27 +2575,27 @@ packages:
2575
vite:
2576
optional: true
2577
2571
- '@alchemy.run/docker@2.0.0-beta.84':
2572
- resolution: {integrity: sha512-VaUNlldyPcCrrGDCfFUJD+pvNt3Rpbly+0lzZ4S8AfkpxMD4rZy7GdXcfPzeA26tcDzfsDVax7BGlArzupEc0g==}
2578
+ '@alchemy.run/docker@2.0.0-beta.85':
2579
+ resolution: {integrity: sha512-AhVdcCTu/paBdDUtGc2U4WEa8+gczkkf7oH7XEeIVjlQ+xX3hmYWlspdfejoJ9pb2JT4myfvp5EeXi/Jcp+W2g==}
2580
peerDependencies:
2574
- '@effect/platform-bun': ^4.0.5
2575
- alchemy: 2.0.0-beta.84
2576
- effect: 4.0.5
2581
+ '@effect/platform-bun': 4.1.2
2582
+ alchemy: 2.0.0-beta.85
2583
+ effect: 4.1.2
2584
peerDependenciesMeta:
2585
'@effect/platform-bun':
2586
optional: true
2587
2581
- '@alchemy.run/drizzle@2.0.0-beta.84':
2582
- resolution: {integrity: sha512-C+3k4J9wE64+z4NmDB+CBIjc/xiT0Dw63Dgo5v98yh1QKCdXeo3ypBgCSQTdrvimXJEYjwF+HDfAqP84M8/8Hw==}
2588
+ '@alchemy.run/drizzle@2.0.0-beta.85':
2589
+ resolution: {integrity: sha512-65goZGSiDgTMBH1XXjhgP/wKd5mfhaGe9RjQHiGCwWVtwExbfc+qhYd2n7AzwkgXWWcgW7A43pv4nvtzcPsNWw==}
2590
peerDependencies:
2584
- '@alchemy.run/cloudflare': 2.0.0-beta.84
2585
- '@effect/sql-libsql': ^4.0.5
2586
- '@effect/sql-mysql2': ^4.0.5
2587
- '@effect/sql-pg': 4.0.5
2588
- alchemy: 2.0.0-beta.84
2589
- drizzle-kit: 1.0.0-rc.5-ab785fc
2590
- drizzle-orm: 1.0.0-rc.5-ab785fc
2591
- effect: 4.0.5
2591
+ '@alchemy.run/cloudflare': 2.0.0-beta.85
2592
+ '@effect/sql-libsql': ^4.1.0
2593
+ '@effect/sql-mysql2': ^4.1.0
2594
+ '@effect/sql-pg': 4.1.2
2595
+ alchemy: 2.0.0-beta.85
2596
+ drizzle-kit: 1.0.0-rc.5
2597
+ drizzle-orm: 1.0.0-rc.5
2598
+ effect: 4.1.2
2599
peerDependenciesMeta:
2600
'@alchemy.run/cloudflare':
2601
optional: true
@@ -2601,14 +2608,14 @@ packages:
2608
drizzle-kit:
2609
optional: true
2610
2604
- '@alchemy.run/node-utils@2.0.0-beta.84':
2605
- resolution: {integrity: sha512-UdvCtwEeLmRNN89gVjkMIQTqzkE+xPQb26dPsQM6JzDdHUyqaTyg64U4RmfUjUul0sWQbbVIeAO475GQYbGELw==}
2611
+ '@alchemy.run/node-utils@2.0.0-beta.85':
2612
+ resolution: {integrity: sha512-2gxqMNMoJdx13w7wlDJw+gaXQ8e1VxQFsKldOvweqpd7JEgB5TGn3oO8r1sb/GB9+UzqXdh8tKp2MOVgFOrmbg==}
2613
2607
- '@alchemy.run/planetscale@2.0.0-beta.84':
2608
- resolution: {integrity: sha512-j0Y4oreytRcH/fickgRPP6+i4KC8vTX/gEz58WVho+hHcajgxGAcxnrSUCoV4YgKFOigR5ONkq+OhbR5a+VPVw==}
2614
+ '@alchemy.run/planetscale@2.0.0-beta.85':
2615
+ resolution: {integrity: sha512-rBG26S6nGVF3fzCTnvMKu/Un/5H+YepOIJyld+1JeaAKV78z3U+bYtR+dSWR6KcW8tG8xX9pj83sisZdp0iNog==}
2616
peerDependencies:
2610
- alchemy: 2.0.0-beta.84
2611
- effect: 4.0.5
2617
+ alchemy: 2.0.0-beta.85
2618
+ effect: 4.1.2
2619
mysql2: ^3.24.2
2620
pg: ^8.22.0
2621
peerDependenciesMeta:
@@ -2629,14 +2636,14 @@ packages:
2636
react-devtools-core:
2637
optional: true
2638
2632
- '@alchemy.run/sql@2.0.0-beta.84':
2633
- resolution: {integrity: sha512-GdP9zDnm6b25p8DZfeg8HbPk66pfIuTA+IHFSC/I8iKbjUE49WoqBmdSUSJtL4ZmTvndTDCYZ7Y9PehBjNTL+w==}
2639
+ '@alchemy.run/sql@2.0.0-beta.85':
2640
+ resolution: {integrity: sha512-8827sU12RJRNjj+HM9XMxnw86gxzrg5c4dAon7KEs9xgV96OW2RaJlcrL9bJ4L2QZWzRTayHh5S1KKio4uUAOw==}
2641
peerDependencies:
2635
- '@effect/sql-libsql': ^4.0.5
2636
- '@effect/sql-mysql2': ^4.0.5
2637
- '@effect/sql-pg': 4.0.5
2638
- alchemy: 2.0.0-beta.84
2639
- effect: 4.0.5
2642
+ '@effect/sql-libsql': ^4.1.0
2643
+ '@effect/sql-mysql2': ^4.1.0
2644
+ '@effect/sql-pg': 4.1.2
2645
+ alchemy: 2.0.0-beta.85
2646
+ effect: 4.1.2
2647
mysql2: ^3.24.2
2648
pg: ^8.22.0
2649
peerDependenciesMeta:
@@ -2651,6 +2658,26 @@ packages:
2658
pg:
2659
optional: true
2660
2661
+ '@alchemy.run/test@2.0.0-beta.85':
2662
+ resolution: {integrity: sha512-/dwCV4a30g75dgasqLzOnSHKU3qGInmd87C9QZja8rhr7ooZNF8kl60W0JmPhZqotICzdt9R7bI35MsUFxlLGg==}
2663
+ engines: {bun: '>=1.3'}
2664
+ hasBin: true
2665
+ peerDependencies:
2666
+ '@effect/vitest': 4.1.2
2667
+ '@opentui/core': ^0.6.6
2668
+ alchemy: 2.0.0-beta.85
2669
+ effect: 4.1.2
2670
+ vitest: ^5.0.4
2671
+ peerDependenciesMeta:
2672
+ '@effect/vitest':
2673
+ optional: true
2674
+ '@opentui/core':
2675
+ optional: true
2676
+ alchemy:
2677
+ optional: true
2678
+ vitest:
2679
+ optional: true
2680
+
2681
'@anthropic-ai/claude-agent-sdk@0.3.276':
2682
resolution: {integrity: sha512-Dic43v4uuGLhibPAArWy3RSfq3zHdn+4Oh2AI2/18a5tlbNKkvChEpazyp8c+grUJvzxkzt0jETCa1wrADbkyw==}
2683
engines: {node: '>=18.0.0'}
@@ -3420,32 +3447,32 @@ packages:
3447
workerd:
3448
optional: true
3449
3423
- '@cloudflare/workerd-darwin-64@1.20261012.1':
3424
- resolution: {integrity: sha512-dkTL9aY3V4D40b+jBpGPCistWUPFQ/M61wlWi6i1o8MvHFFgEw7EQkcaYEv6Yd3bkPDD/3TFT4hRsMb2xVZSwQ==}
3450
+ '@cloudflare/workerd-darwin-64@1.20261026.1':
3451
+ resolution: {integrity: sha512-5IGoYEBQdJeHUn3mOalHQOtt2NXBKvvsqiK2cwIl9OZB6DtpmEmGDzbeFmOgsEQcGrK9f4KnLbr0SQUglnibIQ==}
3452
engines: {node: '>=16'}
3453
cpu: [x64]
3454
os: [darwin]
3455
3429
- '@cloudflare/workerd-darwin-arm64@1.20261012.1':
3430
- resolution: {integrity: sha512-2/nVGcKXjNNI+DhxKSepTKvFng9H7aN2WXv6Zu67iqgI6JrxypNt5kTPv4ZHosxrcfyKMci/2RfN7GIrN0BitQ==}
3456
+ '@cloudflare/workerd-darwin-arm64@1.20261026.1':
3457
+ resolution: {integrity: sha512-ewhmUr/1S8/ik7MjPcQqq7Kx91I6AVLSlTTblbU8OkZ4CiPy92N3WBNMZ06BUkJaFS+XThbXyN/4FDF6xIFo5w==}
3458
engines: {node: '>=16'}
3459
cpu: [arm64]
3460
os: [darwin]
3461
3435
- '@cloudflare/workerd-linux-64@1.20261012.1':
3436
- resolution: {integrity: sha512-uMe7ONHnLxStD1Ye0YFHBO36uj4cStv5P53rW+5GVWXFT8BRjqVixlH0IqCAHe1Pmcwyd1+7fVoGde89MZSCJg==}
3462
+ '@cloudflare/workerd-linux-64@1.20261026.1':
3463
+ resolution: {integrity: sha512-S65mog+1LKp5KT3u+Q3bWg7VQhqqfLL8aM2o2gfchbXwKOX13ZKWuCq4ZxTAxFhG7M31LfEL1iV6K+myFpjhaA==}
3464
engines: {node: '>=16'}
3465
cpu: [x64]
3466
os: [linux]
3467
3441
- '@cloudflare/workerd-linux-arm64@1.20261012.1':
3442
- resolution: {integrity: sha512-I0VMdcXk7ygG5vYDce0ePTBFdnBXC0i9WiBY5mWiv0iTinbfea6/rHqSQ7B1UMpjgrYVs9E0m4bZ9ufsk5GCFA==}
3468
+ '@cloudflare/workerd-linux-arm64@1.20261026.1':
3469
+ resolution: {integrity: sha512-sM+rsagLWdSGb8GP5Qz40nmufbx8EawRD+jw+ySzdiv3owLOLlP0Z1Nzl4s5gtZ6OPCHSVsQxdWNCDfnJLbiVA==}
3470
engines: {node: '>=16'}
3471
cpu: [arm64]
3472
os: [linux]
3473
3447
- '@cloudflare/workerd-windows-64@1.20261012.1':
3448
- resolution: {integrity: sha512-c5hQvNx574UEoknaCFvMa/NdLrrYiALNbe6sx1okW8uOiRYWxrFuA8WpXFnBJ5XJypm0TEAHYaUTGv3rRLpY7Q==}
3474
+ '@cloudflare/workerd-windows-64@1.20261026.1':
3475
+ resolution: {integrity: sha512-7T6udxUWajK0NIpLkmX5FU7i7MnoFYWA3CXmywvO1SmWdabuNCqcB4Wc+88QBIbYhbmAbW+7yfIe7No2nmdoSA==}
3476
engines: {node: '>=16'}
3477
cpu: [x64]
3478
os: [win32]
@@ -3600,40 +3627,45 @@ packages:
3627
'@dimforge/rapier3d-compat@0.12.0':
3628
resolution: {integrity: sha512-uekIGetywIgopfD97oDL5PfeezkFpNhwlzlaEYNOA0N6ghdsOvh/HYjSMek5Q2O1PYvRSDFcqFVJl4r4ZBwOow==}
3629
3603
- '@distilled.cloud/acme@1.0.0-rc.17':
3604
- resolution: {integrity: sha512-s6qWikqh+kdcl0dKOXvYS+++das2f073hkQtHZ9Htt7Oi0hcAFIk7i4is0h4GBjsJX/8bCx0D6EtUVeXUuQI9g==}
3630
+ '@distilled.cloud/acme@1.0.0-rc.18':
3631
+ resolution: {integrity: sha512-OWO6NG9IcpDqZCzlrN5T4MIQqSbpZ5cw61Ru/dYn1vr3AIyx3Vlg+Ew8NhlunpURr4wqDUW2/7QW3fKbrmfwLg==}
3632
peerDependencies:
3606
- effect: 4.0.5
3633
+ effect: 4.1.2
3634
3608
- '@distilled.cloud/aws4signer@1.0.0-rc.17':
3609
- resolution: {integrity: sha512-4wOoFuiadiKOEfDcL0VwGwg4XmZ3vmMxrNJAnTKf87k2WN2Shs7KeUp4GS1TzGGO3NrrpvVw8RFK+dOomDMj5w==}
3635
+ '@distilled.cloud/aws4signer@1.0.0-rc.18':
3636
+ resolution: {integrity: sha512-eYJi2rsblwjxpa0kj2qUQYqY9cEwD6ow0njiFL6I5ZnlOqrE8I3aLiWvScoc3s9bQUQD5nFdmSnORoPJ5GsHKg==}
3637
peerDependencies:
3611
- effect: 4.0.5
3638
+ effect: 4.1.2
3639
3613
- '@distilled.cloud/axiom@1.0.0-rc.17':
3614
- resolution: {integrity: sha512-QRjfgxQsajursE+ar/urY1d3qrjmyjjZEnxNZnlJc7G/2o1p863ClcIwlyAe6u8CfeGf6HL/tc3GVmD4yHek2g==}
3640
+ '@distilled.cloud/aws@1.0.0-rc.18':
3641
+ resolution: {integrity: sha512-VZDlOGEXvXvTdY/0sTEoTWnPCGde+fjvq1ZIW3wgiZK/X8ChbbonGArg+Sc9OO4E9tr1WBymASrZ906uLnLWFw==}
3642
peerDependencies:
3616
- effect: 4.0.5
3643
+ effect: 4.1.2
3644
3618
- '@distilled.cloud/cloudflare@1.0.0-rc.17':
3619
- resolution: {integrity: sha512-xT7EFAAUUd9AZetUjXsiwMkpGatdxGNuMZrhuX5cG4MicmJizn9gn5xdqNsojkj4qzv08qIVL9j1XGV20IoYuA==}
3645
+ '@distilled.cloud/axiom@1.0.0-rc.18':
3646
+ resolution: {integrity: sha512-8z6PPKm3OlEI9ovuSgqnQBYrGU5Fg8LVrk/Xs85NBDH8kJ69ttdJ8vaSb6hILi9hHluefvYO7SJ1XTOXxH+vCw==}
3647
peerDependencies:
3621
- effect: 4.0.5
3648
+ effect: 4.1.2
3649
3623
- '@distilled.cloud/core@1.0.0-rc.17':
3624
- resolution: {integrity: sha512-BHcVEtqIbyyqU3S3o8DjUtqoAJ4FLnsb4BX3nTK2+mcDARS2Puc+Qak6sn+b+W5CRKOOWyrhltbc+kaYDUwxeQ==}
3650
+ '@distilled.cloud/cloudflare@1.0.0-rc.18':
3651
+ resolution: {integrity: sha512-UJB7pitkg7msm7BGTuAE8yYx4GzKdPLRtiOm3G3XHw07xLUlqEiEr4xpSf0CeziWzDygjI53FSkpC2qyVZr49g==}
3652
peerDependencies:
3626
- effect: 4.0.5
3653
+ effect: 4.1.2
3654
3628
- '@distilled.cloud/iceberg@1.0.0-rc.17':
3629
- resolution: {integrity: sha512-hO9Kqc91dq7SLBCagxlr2RDSTbp7/urqjfxNitSNaaOyKIsUr85llsADT/rS6H85ezOsGf2vSP5y1Qk0kQWLCg==}
3655
+ '@distilled.cloud/core@1.0.0-rc.18':
3656
+ resolution: {integrity: sha512-Iui60+sNl1CwUu7NKGLuFf3VC4H9xYzfm0Fc8ZQvd87qwf1sDMB3EAWZrq/QFgrwzSY16z2mJ0PNHaBUnGet8A==}
3657
peerDependencies:
3631
- effect: 4.0.5
3658
+ effect: 4.1.2
3659
3633
- '@distilled.cloud/planetscale@1.0.0-rc.17':
3634
- resolution: {integrity: sha512-njhj8KAcjSUShf5WK1J7GaLQb496QefHgKBQnQ5g+AJr0u9VPYcugdhuslWsd+L634GL13IHjXVnB2Fp36uy9w==}
3660
+ '@distilled.cloud/iceberg@1.0.0-rc.18':
3661
+ resolution: {integrity: sha512-XjUJ/vEOylhIZbAm85O9H6YqXKWGfVROT5BE9BGA/RXvo0bLK2+sUcjC6BoN77a99lImJkrXJuvbHBhNebObEA==}
3662
peerDependencies:
3636
- effect: 4.0.5
3663
+ effect: 4.1.2
3664
+
3665
+ '@distilled.cloud/planetscale@1.0.0-rc.18':
3666
+ resolution: {integrity: sha512-GSpQVfwYq2QKjjQpjiMl4IUBgyS7doNX4mnIzIRzM44BMMtTwx0gMcBj7b7PVAA0O7MyKLKV134Ba1+w3u71kw==}
3667
+ peerDependencies:
3668
+ effect: 4.1.2
3669
3670
'@dnd-kit/accessibility@3.1.1':
3671
resolution: {integrity: sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==}
@@ -3666,64 +3698,64 @@ packages:
3698
'@drizzle-team/brocli@0.12.0':
3699
resolution: {integrity: sha512-mlUE+rZ8CatQekLhnaiN91Iemdd+e2gFKooGlnRB3oPTL3VghLfX24dx7HrzMNeC1JrIB/0kpsfyty3f5HNfxQ==}
3700
3669
- '@effect/atom-react@4.0.5':
3670
- resolution: {integrity: sha512-tqTSiy0rWBitej7kPfvTSw29q4ipof52+txDg6bIBJx0ksHVzVXaFTsssDa+AZBeImafK0xmjm9m1XzPfE6k2A==}
3701
+ '@effect/atom-react@4.1.2':
3702
+ resolution: {integrity: sha512-XRAm4lks2kzNFQIz9QTGKR02CaDTR9VJNRXDjDAR8OzM15ybrK4YkB7OlFZ9U+hxXe3DXJZx7RU1/xI2Em2PGQ==}
3703
peerDependencies:
3672
- effect: 4.0.5
3704
+ effect: 4.1.2
3705
react: '>=19.0.0 <20.0.0'
3706
scheduler: '>=0.25.0 <0.29.0'
3707
3676
- '@effect/graphql-generator@4.0.5':
3677
- resolution: {integrity: sha512-2QtEQxP4RRANWVJVe/wQBmG6SGePDfhgqpOeyfa7JlTsbnJbf3J25lmTz/faO3fGgicTVTTMruHTY6CR16KILg==}
3708
+ '@effect/graphql-generator@4.1.2':
3709
+ resolution: {integrity: sha512-V6y46lsINE3mHzNTYlYY4UA5RJZkywYAorPL0Bl7U4ggGk8P8gqVcc8iGnUoHzlR97TKbNucOSYvCiFv2oidVg==}
3710
hasBin: true
3711
peerDependencies:
3680
- '@effect/platform-node': 4.0.5
3681
- effect: 4.0.5
3712
+ '@effect/platform-node': 4.1.2
3713
+ effect: 4.1.2
3714
3683
- '@effect/openapi-generator@4.0.5':
3684
- resolution: {integrity: sha512-pksR5BhRKQQfDcpA8AbxCiAFLAbdnZseiRmgr1UtVi1x/IyEuS8WmXoFD1C424TEyS+n2Q6lPpR0ue/WQ743aw==}
3715
+ '@effect/openapi-generator@4.1.2':
3716
+ resolution: {integrity: sha512-seh1li7cp6XE734rWmsQ/lQ2RFp1YCMb1PP6pZ7CvFAeoAUsgM4J2z8iCllY8yE2VnswWWw9GQ/XKHLm/gpGzg==}
3717
hasBin: true
3718
peerDependencies:
3687
- '@effect/platform-node': 4.0.5
3688
- effect: 4.0.5
3719
+ '@effect/platform-node': 4.1.2
3720
+ effect: 4.1.2
3721
3690
- '@effect/platform-node-shared@4.0.5':
3691
- resolution: {integrity: sha512-a8rCdEkfZBGe9C6bsIjxVZuRp73svIyK5IHwHdDAVsvZXjrbkxusfI+rZ8WlX31RP1mKizwI/E72GQTNfdMWHw==}
3692
- engines: {node: '>=18.0.0'}
3722
+ '@effect/platform-bun@4.1.2':
3723
+ resolution: {integrity: sha512-waEAa84CITqjctgw9VdhlL9PyXRHICG3KAWTFRDPUE2XL/pfMPhO7V9oFdfx22dbAhhUzV+MHs0d9hnmy/DQ7w==}
3724
peerDependencies:
3694
- effect: 4.0.5
3725
+ effect: 4.1.2
3726
3696
- '@effect/platform-node@4.0.5':
3697
- resolution: {integrity: sha512-v4KD5fWvEUa4QmWFpZFbBsRhmfnTP6ETCME2r9ifyXVDPjhfpxpTZl41prjgQFMqZBHdWWCl7YC5ImbXv5ui5g==}
3698
- engines: {node: '>=18.0.0'}
3727
+ '@effect/platform-node-shared@4.1.2':
3728
+ resolution: {integrity: sha512-wSwl9A/G1hcVvF8nLI+YfB3EyOIDvWS6+lsTZBkmgDnPBL7m8YWZF+1HD+mdEsb52SUGfukip46Q3gRwSdk3QA==}
3729
+ engines: {node: '>=22.19.0'}
3730
peerDependencies:
3700
- effect: 4.0.5
3701
- redis: '>=5.0.0 <7.0.0'
3731
+ effect: 4.1.2
3732
3703
- '@effect/sql-d1@4.0.6':
3704
- resolution: {integrity: sha512-W149Svo5pR+7eoKtTmMX3aFCJKQmvMdypKhMlFekKvy2UjY6h5Af8d+9YeBeOXkYtDQjxNs4l6iv7EqbF6XBbg==}
3733
+ '@effect/platform-node@4.1.2':
3734
+ resolution: {integrity: sha512-ye0UjxORdd5Qu3paZ1LljgGOALWHt7muP9VTpjUSCNfcesiB/Hm7wPJIvZeu4gnwpTe5BtEnO1VHngWqjJp8mA==}
3735
+ engines: {node: '>=22.19.0'}
3736
peerDependencies:
3706
- effect: 4.0.5
3737
+ effect: 4.1.2
3738
+ redis: '>=5.1.0 <7.0.0'
3739
3708
- '@effect/sql-pg@4.0.5':
3709
- resolution: {integrity: sha512-F9tG76H+aryhYcp5pvgd+MwWrNltv3XAuLcZSBsOOX6q+PEl+IM4zkQKzx0TF9OsEMH/SQ+3gZRdYWOsDF+vJQ==}
3740
+ '@effect/sql-d1@4.1.1':
3741
+ resolution: {integrity: sha512-CQMOiw9bmj4ifsUA4KLwIgBJBMpPHaF3OYdXnA9oOxeEmD61+XDLkJUSA2mG7BWCIEZc7MquGxl3HuUVOeqtSA==}
3742
peerDependencies:
3711
- effect: 4.0.5
3743
+ effect: 4.1.2
3744
3713
- '@effect/sql-sqlite-bun@4.0.0-rc.112':
3714
- resolution: {integrity: sha512-EqR8pWZo3VzedRvP6qo5HcfqNmFvSa+sQLWQl3oBMx2KY1FCc8NYjep79wYjNkW0qABnffrPUXCMTOncd1A+5g==}
3745
+ '@effect/sql-pg@4.1.2':
3746
+ resolution: {integrity: sha512-0UehR7B5W8dC+dX6fDeWStLbVbBb2M4pk4HBATEeH0cmV4Odl2lckTg0jFmLuadekTLa4OyB+bZQo1yTG1y2Mw==}
3747
peerDependencies:
3716
- effect: 4.0.5
3748
+ effect: 4.1.2
3749
3718
- '@effect/sql-sqlite-do@4.0.5':
3719
- resolution: {integrity: sha512-TGlU65ZJJMa81I7EoicQXxhRsJDxDPz6A/PNOPzMYRgmCdLs6EsTTXIkKZ+8apb7pl2o0OKVcrT6i6mGlluyLg==}
3750
+ '@effect/sql-sqlite-do@4.1.2':
3751
+ resolution: {integrity: sha512-1qlYhIvNsvYxvfp1183FPMGnHN/9TAGtlMLsBB7OrVE5R/9bWnWyahMxGID79sJ6csW3Azeyxk3ZwRdWXLvNTQ==}
3752
peerDependencies:
3721
- effect: 4.0.5
3753
+ effect: 4.1.2
3754
3723
- '@effect/vitest@4.0.5':
3724
- resolution: {integrity: sha512-q64paZ/i4V2NiRhTyqCmT2KiDbFjlxc2EZrZca8GGt+Nf8844946HyJM5bPk/q+YeRkFSxIrlCs+J+LSfky/wA==}
3755
+ '@effect/vitest@4.1.2':
3756
+ resolution: {integrity: sha512-JJPwAHkJHxvM/woW9mMW/khjasAHcmwWdOMAgMy16rfqsxcVhFDnrRsvN9VI2+kMv8zDCCyBE2q1n5hzZlfE0w==}
3757
peerDependencies:
3726
- effect: 4.0.5
3758
+ effect: 4.1.2
3759
3760
'@electric-sql/pglite@0.3.15':
3761
resolution: {integrity: sha512-Cj++n1Mekf9ETfdc16TlDi+cDDQF0W7EcbyRHYOAeZdsAe8M/FJg18itDTSwyHfar2WIezawM9o0EKaRGVKygQ==}
@@ -5193,7 +5225,7 @@ packages:
5225
'@opencode/client@2.0.28':
5226
resolution: {integrity: sha512-YV0Yxk93/K2h4Xy/sEW/4ZYGMwn7ltxG2Y/Vdy2VCIZ2z0/r9MI6x5/XawSNfCvImBxuHkQNbYtu9Rgp3ArJ4g==}
5227
peerDependencies:
5196
- effect: 4.0.5
5228
+ effect: 4.1.2
5229
solid-js: '>=1.9.0'
5230
peerDependenciesMeta:
5231
effect:
@@ -7579,16 +7611,15 @@ packages:
7611
ajv@8.20.0:
7612
resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}
7613
7582
- alchemy@2.0.0-beta.84:
7583
- resolution: {integrity: sha512-GAcfT/fvolC5C4t6yKx2P3e4rYmaM3aXhtnwK2FnGDFUCdv5zIQatiVXtoNuABzFgMn6UIj9jxrCWWweXoWgmA==}
7614
+ alchemy@2.0.0-beta.85:
7615
+ resolution: {integrity: sha512-dRSyfVDfU3wevBT0Iam6PUjQTn6PY6Lyd2BOeg9ToE208ifrx0sdmNUag8lLeiHisxlhaJJRyOtqKcWZ7lY0Pw==}
7616
hasBin: true
7617
peerDependencies:
7586
- '@alchemy.run/frontend-frameworks': 2.0.0-beta.84
7587
- '@effect/platform-bun': ^4.0.5
7588
- '@effect/platform-node': 4.0.5
7589
- '@effect/vitest': 4.0.5
7590
- effect: 4.0.5
7591
- vite: ^8.0.7
7618
+ '@alchemy.run/frontend-frameworks': 2.0.0-beta.85
7619
+ '@effect/platform-bun': 4.1.2
7620
+ '@effect/platform-node': 4.1.2
7621
+ effect: 4.1.2
7622
+ vite: ^7.0.0 || ^8.0.0
7623
ws: 8.22.0
7624
peerDependenciesMeta:
7625
'@alchemy.run/frontend-frameworks':
@@ -7597,8 +7628,6 @@ packages:
7628
optional: true
7629
'@effect/platform-node':
7630
optional: true
7600
- '@effect/vitest':
7601
- optional: true
7631
vite:
7632
optional: true
7633
ws:
@@ -8404,7 +8433,7 @@ packages:
8433
'@effect/sql-d1': '>=4.0.0-beta.105 || >=4.0.0'
8434
'@effect/sql-libsql': '>=4.0.0-beta.105 || >=4.0.0'
8435
'@effect/sql-mysql2': '>=4.0.0-beta.105 || >=4.0.0'
8407
- '@effect/sql-pg': 4.0.5
8436
+ '@effect/sql-pg': 4.1.2
8437
'@effect/sql-pglite': '>=4.0.0-beta.105 || >=4.0.0'
8438
'@effect/sql-sqlite-bun': '>=4.0.0-beta.105 || >=4.0.0'
8439
'@effect/sql-sqlite-do': '>=4.0.0-beta.105 || >=4.0.0'
@@ -8435,7 +8464,7 @@ packages:
8464
arktype: '>=2.0.0'
8465
better-sqlite3: '>=9.3.0'
8466
bun-types: '*'
8438
- effect: 4.0.5
8467
+ effect: 4.1.2
8468
expo-sqlite: '>=14.0.0'
8469
minipg: '>=0.2.0'
8470
mssql: ^11.0.1
@@ -8562,8 +8591,8 @@ packages:
8591
ee-first@1.1.1:
8592
resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
8593
8565
- effect@4.0.5:
8566
- resolution: {integrity: sha512-BY4/28NlpOd99yzmV741xbVGmp+1U7tks4oB7F/Png64bTa5tm5eCA6W0RiXsnuLDDoJpjfVSo4Dnq4BZb/89Q==}
8594
+ effect@4.1.2:
8595
+ resolution: {integrity: sha512-d3Oah1WyKxFLFh19yWheS5IXIVaITzxZ71JkE1rkUozq/6EcJSU5nPk5bF2QrSygZ3SQoiNQB8TsxFriyMeMaQ==}
8596
8597
ejs@3.1.10:
8598
resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
@@ -12298,8 +12327,8 @@ packages:
12327
engines: {node: '>=20.11'}
12328
hasBin: true
12329
12301
- workerd@1.20261012.1:
12302
- resolution: {integrity: sha512-tEHoMPsMga0seVjxfsR8Pd3f8IRqYwkq++dTUKI5Gdgj6zuSDluYwisydq+dn90SsIACwBquJUQ1nBpcOqaWTA==}
12330
+ workerd@1.20261026.1:
12331
+ resolution: {integrity: sha512-zMkGDn4DHj7AEDrD0FT3VuaVf9QKWbE3Xg6j8oGt1vE+UtDY5gubW5jcyEYXULy5ojCYwVbmEyDkiukWY7gtVg==}
12332
engines: {node: '>=16'}
12333
hasBin: true
12334
@@ -12497,35 +12526,36 @@ snapshots:
12526
dependencies:
12527
json-schema: 0.4.0
12528
12500
- '@alchemy.run/acme@2.0.0-beta.84(74118100341fd69edb1510aa7b7f1bd2)':
12529
+ '@alchemy.run/acme@2.0.0-beta.85(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)':
12530
dependencies:
12502
- '@distilled.cloud/acme': 1.0.0-rc.17(effect@4.0.5)
12503
- alchemy: 2.0.0-beta.84(patch_hash=824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042)(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12504
- effect: 4.0.5
12531
+ '@distilled.cloud/acme': 1.0.0-rc.18(effect@4.1.2)
12532
+ alchemy: 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12533
+ effect: 4.1.2
12534
12506
- '@alchemy.run/axiom@2.0.0-beta.84(74118100341fd69edb1510aa7b7f1bd2)':
12535
+ '@alchemy.run/axiom@2.0.0-beta.85(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)':
12536
dependencies:
12508
- '@distilled.cloud/axiom': 1.0.0-rc.17(effect@4.0.5)
12509
- '@distilled.cloud/core': 1.0.0-rc.17(effect@4.0.5)
12510
- alchemy: 2.0.0-beta.84(patch_hash=824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042)(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12511
- effect: 4.0.5
12537
+ '@distilled.cloud/axiom': 1.0.0-rc.18(effect@4.1.2)
12538
+ '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
12539
+ alchemy: 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12540
+ effect: 4.1.2
12541
12513
- '@alchemy.run/cloudflare-runtime@2.0.0-beta.84(@distilled.cloud/cloudflare@1.0.0-rc.17(effect@4.0.5))(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(rolldown@1.2.13)':
12542
+ '@alchemy.run/cloudflare-runtime@2.0.0-beta.85(@distilled.cloud/cloudflare@1.0.0-rc.18(effect@4.1.2))(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(rolldown@1.2.13)':
12543
dependencies:
12515
- '@alchemy.run/node-utils': 2.0.0-beta.84
12516
- '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261012.1)
12517
- '@distilled.cloud/cloudflare': 1.0.0-rc.17(effect@4.0.5)
12544
+ '@alchemy.run/node-utils': 2.0.0-beta.85
12545
+ '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261026.1)
12546
+ '@distilled.cloud/cloudflare': 1.0.0-rc.18(effect@4.1.2)
12547
'@puppeteer/browsers': 3.2.6(yauzl@3.4.0)
12548
capnp-es: 0.0.16(@tsc-rs/typescript@0.8.0)
12520
- effect: 4.0.5
12549
+ effect: 4.1.2
12550
magic-string: 0.30.21
12551
mime: 4.1.1
12552
sharp: 0.35.5(@types/node@24.12.4)
12553
unenv: 2.0.0-rc.24
12525
- workerd: 1.20261012.1
12554
+ workerd: 1.20261026.1
12555
yauzl: 3.4.0
12556
optionalDependencies:
12528
- '@effect/platform-node': 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
12557
+ '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
12558
+ '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
12559
rolldown: 1.2.13
12560
vite: '@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0)'
12561
transitivePeerDependencies:
@@ -12533,24 +12563,27 @@ snapshots:
12563
- proxy-agent
12564
- typescript
12565
12536
- '@alchemy.run/cloudflare@2.0.0-beta.84(24ce6902b7189b66a257867375b8f56d)':
12537
- dependencies:
12538
- '@alchemy.run/acme': 2.0.0-beta.84(74118100341fd69edb1510aa7b7f1bd2)
12539
- '@alchemy.run/cloudflare-runtime': 2.0.0-beta.84(@distilled.cloud/cloudflare@1.0.0-rc.17(effect@4.0.5))(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(rolldown@1.2.13)
12540
- '@alchemy.run/docker': 2.0.0-beta.84(74118100341fd69edb1510aa7b7f1bd2)
12541
- '@alchemy.run/sql': 2.0.0-beta.84(1b64d144d22bc50b8239f5331dd49513)
12542
- '@distilled.cloud/aws4signer': 1.0.0-rc.17(effect@4.0.5)
12543
- '@distilled.cloud/cloudflare': 1.0.0-rc.17(effect@4.0.5)
12544
- '@distilled.cloud/core': 1.0.0-rc.17(effect@4.0.5)
12545
- '@distilled.cloud/iceberg': 1.0.0-rc.17(effect@4.0.5)
12546
- '@effect/sql-d1': 4.0.6(effect@4.0.5)
12547
- alchemy: 2.0.0-beta.84(patch_hash=824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042)(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12548
- effect: 4.0.5
12566
+ '@alchemy.run/cloudflare@2.0.0-beta.85(3c6bb1d0d4de1cb5d4932cf1224d79e6)':
12567
+ dependencies:
12568
+ '@alchemy.run/acme': 2.0.0-beta.85(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)
12569
+ '@alchemy.run/cloudflare-runtime': 2.0.0-beta.85(@distilled.cloud/cloudflare@1.0.0-rc.18(effect@4.1.2))(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(rolldown@1.2.13)
12570
+ '@alchemy.run/docker': 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)
12571
+ '@alchemy.run/sql': 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)
12572
+ '@distilled.cloud/aws': 1.0.0-rc.18(effect@4.1.2)
12573
+ '@distilled.cloud/aws4signer': 1.0.0-rc.18(effect@4.1.2)
12574
+ '@distilled.cloud/cloudflare': 1.0.0-rc.18(effect@4.1.2)
12575
+ '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
12576
+ '@distilled.cloud/iceberg': 1.0.0-rc.18(effect@4.1.2)
12577
+ '@effect/sql-d1': 4.1.1(effect@4.1.2)
12578
+ alchemy: 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12579
+ effect: 4.1.2
12580
pathe: 2.0.3
12581
+ picomatch: 4.0.7
12582
rolldown: 1.2.13
12583
tinyglobby: 0.2.17
12584
optionalDependencies:
12553
- '@effect/platform-node': 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
12585
+ '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
12586
+ '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
12587
vite: '@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0)'
12588
transitivePeerDependencies:
12589
- '@effect/sql-libsql'
@@ -12562,40 +12595,42 @@ snapshots:
12595
- proxy-agent
12596
- typescript
12597
12565
- '@alchemy.run/docker@2.0.0-beta.84(74118100341fd69edb1510aa7b7f1bd2)':
12598
+ '@alchemy.run/docker@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)':
12599
dependencies:
12567
- alchemy: 2.0.0-beta.84(patch_hash=824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042)(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12568
- effect: 4.0.5
12600
+ alchemy: 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12601
+ effect: 4.1.2
12602
rolldown: 1.2.13
12603
+ optionalDependencies:
12604
+ '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
12605
12571
- '@alchemy.run/drizzle@2.0.0-beta.84(621723465c0c1236eb5d87515baf6818)':
12606
+ '@alchemy.run/drizzle@2.0.0-beta.85(0f2f0b2f6e85ad5bbc9df78a7c15a609)':
12607
dependencies:
12573
- '@alchemy.run/sql': 2.0.0-beta.84(1b64d144d22bc50b8239f5331dd49513)
12574
- '@effect/sql-d1': 4.0.6(effect@4.0.5)
12575
- '@effect/sql-sqlite-do': 4.0.5(effect@4.0.5)
12576
- alchemy: 2.0.0-beta.84(patch_hash=824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042)(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12577
- drizzle-orm: 1.0.0-rc.5-ab785fc(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.0.6(effect@4.0.5))(@effect/sql-pg@4.0.5(effect@4.0.5))(@effect/sql-sqlite-bun@4.0.0-rc.112(effect@4.0.5))(@effect/sql-sqlite-do@4.0.5(effect@4.0.5))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.0.5)(expo-sqlite@58.0.13(expo@58.0.14)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.5)
12578
- effect: 4.0.5
12608
+ '@alchemy.run/sql': 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)
12609
+ '@effect/sql-d1': 4.1.1(effect@4.1.2)
12610
+ '@effect/sql-sqlite-do': 4.1.2(effect@4.1.2)
12611
+ alchemy: 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12612
+ drizzle-orm: 1.0.0-rc.5-ab785fc(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.2))(@effect/sql-pg@4.1.2(effect@4.1.2))(@effect/sql-sqlite-do@4.1.2(effect@4.1.2))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.2)(expo-sqlite@58.0.13(expo@58.0.14)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.5)
12613
+ effect: 4.1.2
12614
optionalDependencies:
12580
- '@alchemy.run/cloudflare': 2.0.0-beta.84(24ce6902b7189b66a257867375b8f56d)
12581
- '@effect/sql-pg': 4.0.5(effect@4.0.5)
12615
+ '@alchemy.run/cloudflare': 2.0.0-beta.85(3c6bb1d0d4de1cb5d4932cf1224d79e6)
12616
+ '@effect/sql-pg': 4.1.2(effect@4.1.2)
12617
drizzle-kit: 1.0.0-rc.5-ab785fc
12618
transitivePeerDependencies:
12619
- mysql2
12620
- pg
12621
12587
- '@alchemy.run/node-utils@2.0.0-beta.84':
12622
+ '@alchemy.run/node-utils@2.0.0-beta.85':
12623
dependencies:
12624
chokidar: 5.0.0
12625
rolldown: 1.2.13
12626
12592
- '@alchemy.run/planetscale@2.0.0-beta.84(1b64d144d22bc50b8239f5331dd49513)':
12627
+ '@alchemy.run/planetscale@2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)':
12628
dependencies:
12594
- '@alchemy.run/sql': 2.0.0-beta.84(1b64d144d22bc50b8239f5331dd49513)
12595
- '@distilled.cloud/core': 1.0.0-rc.17(effect@4.0.5)
12596
- '@distilled.cloud/planetscale': 1.0.0-rc.17(effect@4.0.5)
12597
- alchemy: 2.0.0-beta.84(patch_hash=824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042)(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12598
- effect: 4.0.5
12629
+ '@alchemy.run/sql': 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)
12630
+ '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
12631
+ '@distilled.cloud/planetscale': 1.0.0-rc.18(effect@4.1.2)
12632
+ alchemy: 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12633
+ effect: 4.1.2
12634
optionalDependencies:
12635
pg: 8.23.0
12636
transitivePeerDependencies:
@@ -12608,14 +12643,26 @@ snapshots:
12643
'@types/react': 19.3.0
12644
react-devtools-core: 6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6)
12645
12611
- '@alchemy.run/sql@2.0.0-beta.84(1b64d144d22bc50b8239f5331dd49513)':
12646
+ '@alchemy.run/sql@2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)':
12647
dependencies:
12613
- alchemy: 2.0.0-beta.84(patch_hash=824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042)(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12614
- effect: 4.0.5
12648
+ alchemy: 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12649
+ effect: 4.1.2
12650
optionalDependencies:
12616
- '@effect/sql-pg': 4.0.5(effect@4.0.5)
12651
+ '@effect/sql-pg': 4.1.2(effect@4.1.2)
12652
pg: 8.23.0
12653
12654
+ '@alchemy.run/test@2.0.0-beta.85(patch_hash=29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e)(071253407c4f3cb63d401833ee1dda26)':
12655
+ dependencies:
12656
+ '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
12657
+ effect: 4.1.2
12658
+ optionalDependencies:
12659
+ '@effect/vitest': 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
12660
+ alchemy: 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
12661
+ vitest: 5.0.5(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/browser-preview@5.0.5)(@vitest/ui@5.0.5)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0)
12662
+ transitivePeerDependencies:
12663
+ - bufferutil
12664
+ - utf-8-validate
12665
+
12666
'@anthropic-ai/claude-agent-sdk@0.3.276(@anthropic-ai/sdk@0.93.0(zod@4.6.5))(@modelcontextprotocol/sdk@1.29.0(supports-color@8.1.1)(zod@4.6.5))(zod@4.6.5)':
12667
dependencies:
12668
'@anthropic-ai/sdk': 0.93.0(zod@4.6.5)
@@ -13449,25 +13496,25 @@ snapshots:
13496
react: 19.3.0
13497
react-dom: 19.3.0(react@19.3.0)
13498
13452
- '@cloudflare/unenv-preset@2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261012.1)':
13499
+ '@cloudflare/unenv-preset@2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261026.1)':
13500
dependencies:
13501
unenv: 2.0.0-rc.24
13502
optionalDependencies:
13456
- workerd: 1.20261012.1
13503
+ workerd: 1.20261026.1
13504
13458
- '@cloudflare/workerd-darwin-64@1.20261012.1':
13505
+ '@cloudflare/workerd-darwin-64@1.20261026.1':
13506
optional: true
13507
13461
- '@cloudflare/workerd-darwin-arm64@1.20261012.1':
13508
+ '@cloudflare/workerd-darwin-arm64@1.20261026.1':
13509
optional: true
13510
13464
- '@cloudflare/workerd-linux-64@1.20261012.1':
13511
+ '@cloudflare/workerd-linux-64@1.20261026.1':
13512
optional: true
13513
13467
- '@cloudflare/workerd-linux-arm64@1.20261012.1':
13514
+ '@cloudflare/workerd-linux-arm64@1.20261026.1':
13515
optional: true
13516
13470
- '@cloudflare/workerd-windows-64@1.20261012.1':
13517
+ '@cloudflare/workerd-windows-64@1.20261026.1':
13518
optional: true
13519
13520
'@cloudflare/workers-types@4.20260604.1': {}
@@ -13578,39 +13625,45 @@ snapshots:
13625
13626
'@dimforge/rapier3d-compat@0.12.0': {}
13627
13581
- '@distilled.cloud/acme@1.0.0-rc.17(effect@4.0.5)':
13628
+ '@distilled.cloud/acme@1.0.0-rc.18(effect@4.1.2)':
13629
+ dependencies:
13630
+ '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
13631
+ effect: 4.1.2
13632
+
13633
+ '@distilled.cloud/aws4signer@1.0.0-rc.18(effect@4.1.2)':
13634
dependencies:
13583
- '@distilled.cloud/core': 1.0.0-rc.17(effect@4.0.5)
13584
- effect: 4.0.5
13635
+ '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
13636
+ effect: 4.1.2
13637
13586
- '@distilled.cloud/aws4signer@1.0.0-rc.17(effect@4.0.5)':
13638
+ '@distilled.cloud/aws@1.0.0-rc.18(effect@4.1.2)':
13639
dependencies:
13588
- '@distilled.cloud/core': 1.0.0-rc.17(effect@4.0.5)
13589
- effect: 4.0.5
13640
+ '@distilled.cloud/aws4signer': 1.0.0-rc.18(effect@4.1.2)
13641
+ '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
13642
+ effect: 4.1.2
13643
13591
- '@distilled.cloud/axiom@1.0.0-rc.17(effect@4.0.5)':
13644
+ '@distilled.cloud/axiom@1.0.0-rc.18(effect@4.1.2)':
13645
dependencies:
13593
- '@distilled.cloud/core': 1.0.0-rc.17(effect@4.0.5)
13594
- effect: 4.0.5
13646
+ '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
13647
+ effect: 4.1.2
13648
13596
- '@distilled.cloud/cloudflare@1.0.0-rc.17(effect@4.0.5)':
13649
+ '@distilled.cloud/cloudflare@1.0.0-rc.18(effect@4.1.2)':
13650
dependencies:
13598
- '@distilled.cloud/core': 1.0.0-rc.17(effect@4.0.5)
13599
- effect: 4.0.5
13651
+ '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
13652
+ effect: 4.1.2
13653
13601
- '@distilled.cloud/core@1.0.0-rc.17(effect@4.0.5)':
13654
+ '@distilled.cloud/core@1.0.0-rc.18(effect@4.1.2)':
13655
dependencies:
13603
- effect: 4.0.5
13656
+ effect: 4.1.2
13657
13605
- '@distilled.cloud/iceberg@1.0.0-rc.17(effect@4.0.5)':
13658
+ '@distilled.cloud/iceberg@1.0.0-rc.18(effect@4.1.2)':
13659
dependencies:
13607
- '@distilled.cloud/core': 1.0.0-rc.17(effect@4.0.5)
13608
- effect: 4.0.5
13660
+ '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
13661
+ effect: 4.1.2
13662
13610
- '@distilled.cloud/planetscale@1.0.0-rc.17(effect@4.0.5)':
13663
+ '@distilled.cloud/planetscale@1.0.0-rc.18(effect@4.1.2)':
13664
dependencies:
13612
- '@distilled.cloud/core': 1.0.0-rc.17(effect@4.0.5)
13613
- effect: 4.0.5
13665
+ '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
13666
+ effect: 4.1.2
13667
13668
'@dnd-kit/accessibility@3.1.1(react@19.3.0)':
13669
dependencies:
@@ -13646,65 +13699,68 @@ snapshots:
13699
13700
'@drizzle-team/brocli@0.12.0': {}
13701
13649
- '@effect/atom-react@4.0.5(effect@4.0.5)(react@19.3.0)(scheduler@0.28.0)':
13702
+ '@effect/atom-react@4.1.2(effect@4.1.2)(react@19.3.0)(scheduler@0.28.0)':
13703
dependencies:
13651
- effect: 4.0.5
13704
+ effect: 4.1.2
13705
react: 19.3.0
13706
scheduler: 0.28.0
13707
13655
- '@effect/graphql-generator@4.0.5(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.0.5)':
13708
+ '@effect/graphql-generator@4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)':
13709
dependencies:
13657
- '@effect/platform-node': 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
13658
- effect: 4.0.5
13710
+ '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
13711
+ effect: 4.1.2
13712
13660
- '@effect/openapi-generator@4.0.5(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.0.5)(encoding@0.1.13)':
13713
+ '@effect/openapi-generator@4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)(encoding@0.1.13)':
13714
dependencies:
13662
- '@effect/platform-node': 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
13663
- effect: 4.0.5
13715
+ '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
13716
+ effect: 4.1.2
13717
swagger2openapi: 7.0.8(encoding@0.1.13)
13718
transitivePeerDependencies:
13719
- encoding
13720
13668
- '@effect/platform-node-shared@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(utf-8-validate@6.0.6)':
13721
+ '@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)':
13722
+ dependencies:
13723
+ '@effect/platform-node-shared': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
13724
+ effect: 4.1.2
13725
+ transitivePeerDependencies:
13726
+ - bufferutil
13727
+ - utf-8-validate
13728
+
13729
+ '@effect/platform-node-shared@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)':
13730
dependencies:
13731
'@types/ws': 8.18.2
13671
- effect: 4.0.5
13732
+ effect: 4.1.2
13733
ws: 8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
13734
transitivePeerDependencies:
13735
- bufferutil
13736
- utf-8-validate
13737
13677
- '@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)':
13738
+ '@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)':
13739
dependencies:
13679
- '@effect/platform-node-shared': 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(utf-8-validate@6.0.6)
13680
- effect: 4.0.5
13740
+ '@effect/platform-node-shared': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
13741
+ effect: 4.1.2
13742
redis: 6.2.1
13743
undici: 8.11.2
13744
transitivePeerDependencies:
13745
- bufferutil
13746
- utf-8-validate
13747
13687
- '@effect/sql-d1@4.0.6(effect@4.0.5)':
13748
+ '@effect/sql-d1@4.1.1(effect@4.1.2)':
13749
dependencies:
13750
'@cloudflare/workers-types': 5.20261026.1
13690
- effect: 4.0.5
13751
+ effect: 4.1.2
13752
13692
- '@effect/sql-pg@4.0.5(effect@4.0.5)':
13753
+ '@effect/sql-pg@4.1.2(effect@4.1.2)':
13754
dependencies:
13694
- effect: 4.0.5
13695
-
13696
- '@effect/sql-sqlite-bun@4.0.0-rc.112(effect@4.0.5)':
13697
- dependencies:
13698
- effect: 4.0.5
13699
- optional: true
13755
+ effect: 4.1.2
13756
13701
- '@effect/sql-sqlite-do@4.0.5(effect@4.0.5)':
13757
+ '@effect/sql-sqlite-do@4.1.2(effect@4.1.2)':
13758
dependencies:
13703
- effect: 4.0.5
13759
+ effect: 4.1.2
13760
13705
- '@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)':
13761
+ '@effect/vitest@4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)':
13762
dependencies:
13707
- effect: 4.0.5
13763
+ effect: 4.1.2
13764
vite-plus: 1.4.0(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
13765
transitivePeerDependencies:
13766
- '@arethetypeswrong/core'
@@ -15158,22 +15214,22 @@ snapshots:
15214
dependencies:
15215
cross-spawn: 7.0.6
15216
15161
- '@opencode/client@2.0.28(effect@4.0.5)':
15217
+ '@opencode/client@2.0.28(effect@4.1.2)':
15218
dependencies:
15219
'@opencode/protocol': 2.0.28
15220
'@opencode/schema': 2.0.28
15221
optionalDependencies:
15166
- effect: 4.0.5
15222
+ effect: 4.1.2
15223
15224
'@opencode/protocol@2.0.28':
15225
dependencies:
15226
'@opencode/schema': 2.0.28
15171
- effect: 4.0.5
15227
+ effect: 4.1.2
15228
15229
'@opencode/schema@2.0.28':
15230
dependencies:
15231
'@standard-schema/spec': 1.1.0
15176
- effect: 4.0.5
15232
+ effect: 4.1.2
15233
15234
'@oslojs/asn1@1.0.0':
15235
dependencies:
@@ -17165,12 +17221,12 @@ snapshots:
17221
json-schema-traverse: 1.0.0
17222
require-from-string: 2.0.2
17223
17168
- alchemy@2.0.0-beta.84(patch_hash=824006659fa28ca31e490ce1fc3611f77436005ce9fa0f638be46564133cf042)(@effect/platform-node@4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6))(@effect/vitest@4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.0.5)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)):
17224
+ alchemy@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)):
17225
dependencies:
17170
- '@alchemy.run/node-utils': 2.0.0-beta.84
17226
+ '@alchemy.run/node-utils': 2.0.0-beta.85
17227
'@alchemy.run/sigil': 0.1.0-alpha.1(@types/react@19.3.0)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))
17228
capnweb: 0.12.0
17173
- effect: 4.0.5
17229
+ effect: 4.1.2
17230
fflate: 0.8.3
17231
pathe: 2.0.3
17232
picomatch: 4.0.7
@@ -17178,8 +17234,8 @@ snapshots:
17234
tinyglobby: 0.2.17
17235
yaml: 2.9.0
17236
optionalDependencies:
17181
- '@effect/platform-node': 4.0.5(bufferutil@4.1.0)(effect@4.0.5)(redis@6.2.1)(utf-8-validate@6.0.6)
17182
- '@effect/vitest': 4.0.5(patch_hash=2731c9c3761c595f25ddc625a7d61ca376b389d5b3049ecb837c8940f21cfa02)(@astrojs/compiler-rs@0.5.1)(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(bufferutil@4.1.0)(effect@4.0.5)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.60.0)(terser@5.48.0)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
17237
+ '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
17238
+ '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
17239
vite: '@voidzero-dev/vite-plus-core@1.4.0(@tsc-rs/typescript@0.8.0)(@types/node@24.12.4)(@volar/typescript@2.4.28(@tsc-rs/typescript@0.8.0))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(unrun@0.2.39)(yaml@2.9.0)'
17240
ws: 8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
17241
transitivePeerDependencies:
@@ -18127,18 +18183,17 @@ snapshots:
18183
get-tsconfig: 4.14.3
18184
jiti: 2.7.0
18185
18130
- drizzle-orm@1.0.0-rc.5-ab785fc(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.0.6(effect@4.0.5))(@effect/sql-pg@4.0.5(effect@4.0.5))(@effect/sql-sqlite-bun@4.0.0-rc.112(effect@4.0.5))(@effect/sql-sqlite-do@4.0.5(effect@4.0.5))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.0.5)(expo-sqlite@58.0.13(expo@58.0.14)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.5):
18186
+ drizzle-orm@1.0.0-rc.5-ab785fc(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.2))(@effect/sql-pg@4.1.2(effect@4.1.2))(@effect/sql-sqlite-do@4.1.2(effect@4.1.2))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.2)(expo-sqlite@58.0.13(expo@58.0.14)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.5):
18187
optionalDependencies:
18188
'@cloudflare/workers-types': 4.20260604.1
18133
- '@effect/sql-d1': 4.0.6(effect@4.0.5)
18134
- '@effect/sql-pg': 4.0.5(effect@4.0.5)
18135
- '@effect/sql-sqlite-bun': 4.0.0-rc.112(effect@4.0.5)
18136
- '@effect/sql-sqlite-do': 4.0.5(effect@4.0.5)
18189
+ '@effect/sql-d1': 4.1.1(effect@4.1.2)
18190
+ '@effect/sql-pg': 4.1.2(effect@4.1.2)
18191
+ '@effect/sql-sqlite-do': 4.1.2(effect@4.1.2)
18192
'@electric-sql/pglite': 0.3.15
18193
'@libsql/client': 0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6)
18194
'@types/sql.js': 1.4.11
18195
bun-types: 1.3.14
18141
- effect: 4.0.5
18196
+ effect: 4.1.2
18197
expo-sqlite: 58.0.13(expo@58.0.14)(react-native@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.0(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
18198
pg: 8.23.0
18199
sql.js: 1.15.0
@@ -18160,7 +18215,7 @@ snapshots:
18215
18216
ee-first@1.1.1: {}
18217
18163
- effect@4.0.5: {}
18218
+ effect@4.1.2: {}
18219
18220
ejs@3.1.10:
18221
dependencies:
@@ -22792,13 +22847,13 @@ snapshots:
22847
22848
why-is-node-running@3.2.1: {}
22849
22795
- workerd@1.20261012.1:
22850
+ workerd@1.20261026.1:
22851
optionalDependencies:
22797
- '@cloudflare/workerd-darwin-64': 1.20261012.1
22798
- '@cloudflare/workerd-darwin-arm64': 1.20261012.1
22799
- '@cloudflare/workerd-linux-64': 1.20261012.1
22800
- '@cloudflare/workerd-linux-arm64': 1.20261012.1
22801
- '@cloudflare/workerd-windows-64': 1.20261012.1
22852
+ '@cloudflare/workerd-darwin-64': 1.20261026.1
22853
+ '@cloudflare/workerd-darwin-arm64': 1.20261026.1
22854
+ '@cloudflare/workerd-linux-64': 1.20261026.1
22855
+ '@cloudflare/workerd-linux-arm64': 1.20261026.1
22856
+ '@cloudflare/workerd-windows-64': 1.20261026.1
22857
22858
wrap-ansi@7.0.0:
22859
dependencies:
pnpm-workspace.yaml
+49
-43
@@ -30,10 +30,11 @@ allowBuilds:
30
workerd: false
31
32
catalog:
33
- "@alchemy.run/axiom": 2.0.0-beta.84
34
- "@alchemy.run/cloudflare": 2.0.0-beta.84
35
- "@alchemy.run/drizzle": 2.0.0-beta.84
36
- "@alchemy.run/planetscale": 2.0.0-beta.84
33
+ "@alchemy.run/axiom": 2.0.0-beta.85
34
+ "@alchemy.run/cloudflare": 2.0.0-beta.85
35
+ "@alchemy.run/drizzle": 2.0.0-beta.85
36
+ "@alchemy.run/planetscale": 2.0.0-beta.85
37
+ "@alchemy.run/test": 2.0.0-beta.85
38
"@clerk/backend": 3.25.0
39
"@clerk/clerk-js": 6.40.0
40
"@clerk/electron": 0.1.3
@@ -43,15 +44,16 @@ catalog:
44
"@clerk/shared": 4.41.0
45
# Must match the version alchemy depends on: the relay overrides its
46
# Cloudflare retry policy through this package's Retry service.
46
- "@distilled.cloud/cloudflare": 1.0.0-rc.17
47
- "@effect/atom-react": 4.0.5
48
- "@effect/graphql-generator": 4.0.5
49
- "@effect/openapi-generator": 4.0.5
50
- "@effect/platform-node": 4.0.5
51
- "@effect/platform-node-shared": 4.0.5
52
- "@effect/sql-pg": 4.0.5
53
- "@effect/sql-sqlite-do": 4.0.5
54
- "@effect/vitest": 4.0.5
47
+ "@distilled.cloud/cloudflare": 1.0.0-rc.18
48
+ "@effect/atom-react": 4.1.2
49
+ "@effect/graphql-generator": 4.1.2
50
+ "@effect/openapi-generator": 4.1.2
51
+ "@effect/platform-bun": 4.1.2
52
+ "@effect/platform-node": 4.1.2
53
+ "@effect/platform-node-shared": 4.1.2
54
+ "@effect/sql-pg": 4.1.2
55
+ "@effect/sql-sqlite-do": 4.1.2
56
+ "@effect/vitest": 4.1.2
57
"@electron-webauthn/macos": 1.3.1
58
"@legendapp/list": 3.3.5
59
"@noble/curves": 1.9.1
@@ -66,8 +68,8 @@ catalog:
68
"@types/react": ~19.3.0
69
"@types/react-dom": ~19.3.0
70
"@types/ws": 8.18.2
69
- alchemy: 2.0.0-beta.84
70
- effect: 4.0.5
71
+ alchemy: 2.0.0-beta.85
72
+ effect: 4.1.2
73
electron-webauthn: 1.3.1
74
jose: 6.2.2
75
lightningcss: 1.33.0
@@ -98,23 +100,24 @@ catalog:
100
unified: 11.0.5
101
102
minimumReleaseAgeExclude:
101
- - alchemy@2.0.0-beta.84
102
- - "@alchemy.run/acme@2.0.0-beta.84"
103
- - "@alchemy.run/axiom@2.0.0-beta.84"
104
- - "@alchemy.run/cloudflare@2.0.0-beta.84"
105
- - "@alchemy.run/cloudflare-runtime@2.0.0-beta.84"
106
- - "@alchemy.run/docker@2.0.0-beta.84"
107
- - "@alchemy.run/drizzle@2.0.0-beta.84"
108
- - "@alchemy.run/node-utils@2.0.0-beta.84"
109
- - "@alchemy.run/planetscale@2.0.0-beta.84"
110
- - "@alchemy.run/sql@2.0.0-beta.84"
111
- - "@distilled.cloud/acme@1.0.0-rc.17"
112
- - "@distilled.cloud/aws4signer@1.0.0-rc.17"
113
- - "@distilled.cloud/axiom@1.0.0-rc.17"
114
- - "@distilled.cloud/cloudflare@1.0.0-rc.17"
115
- - "@distilled.cloud/core@1.0.0-rc.17"
116
- - "@distilled.cloud/iceberg@1.0.0-rc.17"
117
- - "@distilled.cloud/planetscale@1.0.0-rc.17"
103
+ - alchemy@2.0.0-beta.85
104
+ - "@alchemy.run/acme@2.0.0-beta.85"
105
+ - "@alchemy.run/axiom@2.0.0-beta.85"
106
+ - "@alchemy.run/cloudflare@2.0.0-beta.85"
107
+ - "@alchemy.run/cloudflare-runtime@2.0.0-beta.85"
108
+ - "@alchemy.run/docker@2.0.0-beta.85"
109
+ - "@alchemy.run/drizzle@2.0.0-beta.85"
110
+ - "@alchemy.run/node-utils@2.0.0-beta.85"
111
+ - "@alchemy.run/planetscale@2.0.0-beta.85"
112
+ - "@alchemy.run/sql@2.0.0-beta.85"
113
+ - "@alchemy.run/test@2.0.0-beta.85"
114
+ - "@distilled.cloud/acme@1.0.0-rc.18"
115
+ - "@distilled.cloud/aws4signer@1.0.0-rc.18"
116
+ - "@distilled.cloud/axiom@1.0.0-rc.18"
117
+ - "@distilled.cloud/cloudflare@1.0.0-rc.18"
118
+ - "@distilled.cloud/core@1.0.0-rc.18"
119
+ - "@distilled.cloud/iceberg@1.0.0-rc.18"
120
+ - "@distilled.cloud/planetscale@1.0.0-rc.18"
121
- "@tsc-rs/*"
122
- expo-glass-effect@58.0.4
123
- expo-blur@58.0.4
@@ -126,15 +129,16 @@ minimumReleaseAgeExclude:
129
- "@clerk/expo@4.14.0"
130
- "@clerk/react@6.18.0"
131
- "@clerk/shared@4.41.0"
129
- - "@effect/atom-react@4.0.5"
130
- - "@effect/graphql-generator@4.0.5"
131
- - "@effect/openapi-generator@4.0.5"
132
- - "@effect/platform-node-shared@4.0.5"
133
- - "@effect/platform-node@4.0.5"
134
- - "@effect/sql-pg@4.0.5"
135
- - "@effect/sql-sqlite-do@4.0.5"
136
- - "@effect/vitest@4.0.5"
137
- - effect@4.0.5
132
+ - "@effect/atom-react@4.1.2"
133
+ - "@effect/graphql-generator@4.1.2"
134
+ - "@effect/openapi-generator@4.1.2"
135
+ - "@effect/platform-node-shared@4.1.2"
136
+ - "@effect/platform-bun@4.1.2"
137
+ - "@effect/platform-node@4.1.2"
138
+ - "@effect/sql-pg@4.1.2"
139
+ - "@effect/sql-sqlite-do@4.1.2"
140
+ - "@effect/vitest@4.1.2"
141
+ - effect@4.1.2
142
- "@legendapp/list@3.3.5"
143
- "@expo/cli@58.1.1 || 58.1.9 || 58.1.11"
144
- "@expo/env@2.5.1"
@@ -233,6 +237,7 @@ minimumReleaseAgeExclude:
237
- "@cursor/sdk-linux-x64@1.2.0"
238
- "@cursor/sdk-win32-x64@1.2.0"
239
- "@cursor/sdk@1.2.0"
240
+ - "@distilled.cloud/aws@1.0.0-rc.18"
241
242
overrides:
243
# Pin every patched package, including transitive dependencies, so lockfile-free
@@ -303,6 +308,7 @@ overrides:
308
"@clerk/react": "catalog:"
309
"@clerk/shared": "catalog:"
310
"@effect/atom-react": "catalog:"
311
+ "@effect/platform-bun": "catalog:"
312
"@effect/platform-node": "catalog:"
313
"@effect/platform-node-shared": "catalog:"
314
"@effect/sql-pg": "catalog:"
@@ -367,12 +373,12 @@ patchedDependencies:
373
micromark-extension-gfm-table@2.1.1: patches/micromark-extension-gfm-table@2.1.1.patch
374
micromark@4.0.2: patches/micromark@4.0.2.patch
375
mdast-util-to-hast@13.2.1: patches/mdast-util-to-hast@13.2.1.patch
370
- alchemy@2.0.0-beta.84: patches/alchemy@2.0.0-beta.84.patch
376
expo-audio@58.0.9: patches/expo-audio@58.0.9.patch
377
expo-video@58.0.11: patches/expo-video@58.0.11.patch
378
expo-network@58.0.3: patches/expo-network@58.0.3.patch
379
"@clerk/expo-native-components@0.4.0": patches/@clerk__expo-native-components@0.4.0.patch
375
- "@effect/vitest@4.0.5": patches/@effect__vitest@4.0.5.patch
380
+ "@alchemy.run/test@2.0.0-beta.85": patches/@alchemy.run__test@2.0.0-beta.85.patch
381
+ "@effect/vitest@4.1.2": patches/@effect__vitest@4.1.2.patch
382
"@expo/metro-config@58.0.14": patches/@expo__metro-config@58.0.14.patch
383
expo-sharing@58.0.19: patches/expo-sharing@58.0.19.patch
384
expo-widgets@58.0.20: patches/expo-widgets@58.0.20.patch
scripts/mobile-behavior/device.ts
+2
-2
@@ -7,7 +7,7 @@
7
import * as NodeChildProcess from "node:child_process";
8
import * as NodeOS from "node:os";
9
import * as NodePath from "node:path";
10
-import * as NodeSocket from "@effect/platform-node/NodeSocket";
10
+import * as NodeWS from "@effect/platform-node/NodeWS";
11
import * as Clock from "effect/Clock";
12
import * as Effect from "effect/Effect";
13
import * as Schedule from "effect/Schedule";
@@ -183,7 +183,7 @@ export function makeDevice(options: DeviceOptions) {
183
}
184
},
185
Effect.scoped,
186
- Effect.provide(NodeSocket.layerWebSocketConstructorWS),
186
+ Effect.provide(NodeWS.layerWebSocketConstructor),
187
Effect.timeoutOrElse({
188
duration: "20 seconds",
189
orElse: () => Effect.fail(new DeviceError({ message: "The inspector did not answer." })),
scripts/mobile-behavior/environment.ts
+4
-4
@@ -7,7 +7,7 @@ import * as NodeChildProcess from "node:child_process";
7
import * as NodeFS from "node:fs";
8
import * as NodeNet from "node:net";
9
import * as NodePath from "node:path";
10
-import * as NodeSocket from "@effect/platform-node/NodeSocket";
10
+import * as NodeWS from "@effect/platform-node/NodeWS";
11
import {
12
CommandId,
13
EnvironmentId,
@@ -22,7 +22,7 @@ import {
22
WsRpcGroup,
23
type OrchestrationV2ThreadProjection,
24
} from "@t3tools/contracts";
25
-import * as Crypto from "effect/Crypto";
25
+import * as SecureRandom from "effect/crypto/SecureRandom";
26
import * as Effect from "effect/Effect";
27
import * as Layer from "effect/Layer";
28
import * as Schema from "effect/Schema";
@@ -34,7 +34,7 @@ const REPO_ROOT = NodePath.resolve(import.meta.dirname, "../..");
34
export const EVAL_INSTANCE = ProviderInstanceId.make("evalbot");
35
export const EVAL_MODEL = "eval/scripted";
36
37
-export const uuid = Effect.flatMap(Crypto.Crypto, (crypto) => crypto.randomUUIDv4());
37
+export const uuid = Effect.flatMap(SecureRandom.SecureRandom, (random) => random.uuidV4());
38
39
export class EnvironmentError extends Schema.TaggedError<EnvironmentError>()("EnvironmentError", {
40
message: Schema.String,
@@ -226,7 +226,7 @@ export const startEnvironment = Effect.fn("environment.start")(function* (input:
226
),
227
),
228
Layer.provide(RpcSerialization.layerJson),
229
- Layer.provide(NodeSocket.layerWebSocketConstructorWS),
229
+ Layer.provide(NodeWS.layerWebSocketConstructor),
230
),
231
);
232
const client = yield* RpcClient.make(WsRpcGroup).pipe(Effect.provideContext(protocol));
scripts/mobile-behavior/run.ts
+2
-1
@@ -9,6 +9,7 @@ import * as NodeFS from "node:fs";
9
import * as NodeOS from "node:os";
10
import * as NodePath from "node:path";
11
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
12
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
13
import * as NodeServices from "@effect/platform-node/NodeServices";
14
import * as Clock from "effect/Clock";
15
import * as Console from "effect/Console";
@@ -293,6 +294,6 @@ const command = Command.make(
294
);
295
296
Command.run(command, { version: "0.0.0" }).pipe(
296
- Effect.provide(NodeServices.layer),
297
+ Effect.provide([NodeServices.layer, NodeCrypto.layer]),
298
NodeRuntime.runMain,
299
);
scripts/mobile-behavior/scenarios.ts
+4
-2
@@ -4,7 +4,7 @@
4
* scenario and check its metrics, so one flow can serve several issues.
5
*/
6
import type { ThreadId } from "@t3tools/contracts";
7
-import type * as Crypto from "effect/Crypto";
7
+import type * as SecureRandom from "effect/crypto/SecureRandom";
8
import * as Effect from "effect/Effect";
9
import * as Schema from "effect/Schema";
10
@@ -157,7 +157,9 @@ const failure = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
157
new ScenarioFailure({ message: error instanceof Error ? error.message : String(error) }),
158
);
159
160
-type Scenario = (ctx: ScenarioContext) => Effect.Effect<Metrics, ScenarioFailure, Crypto.Crypto>;
160
+type Scenario = (
161
+ ctx: ScenarioContext,
162
+) => Effect.Effect<Metrics, ScenarioFailure, SecureRandom.SecureRandom>;
163
164
export const SCENARIOS = {
165
/** Six upward flings in the long settled thread. */
scripts/mobile-native-client.ts
+6
-5
@@ -1,4 +1,5 @@
1
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
2
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
3
import * as NodeServices from "@effect/platform-node/NodeServices";
4
import * as HostProcess from "@t3tools/shared/HostProcess";
5
import { isCommandAvailable, resolveSpawnCommand } from "@t3tools/shared/shell";
@@ -6,7 +7,7 @@ import * as Clock from "effect/Clock";
7
import * as Console from "effect/Console";
8
import * as Context from "effect/Context";
9
import * as DateTime from "effect/DateTime";
9
-import * as Crypto from "effect/Crypto";
10
+import * as Digest from "effect/crypto/Digest";
11
import * as Effect from "effect/Effect";
12
import * as FileSystem from "effect/FileSystem";
13
import * as Option from "effect/Option";
@@ -83,9 +84,9 @@ export const ensureClient = Effect.fn("ensureClient")(function* <E, R, E2, R2>(o
84
});
85
86
const digest = Effect.fn("nativeClient.digest")(function* (value: string | Uint8Array) {
86
- const crypto = yield* Crypto.Crypto;
87
+ const crypto = yield* Digest.Digest;
88
const bytes = yield* crypto.digest(
88
- "SHA-256",
89
+ Digest.sha256,
90
typeof value === "string" ? new TextEncoder().encode(value) : value,
91
);
92
return Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
@@ -98,7 +99,7 @@ export const hashBundle = Effect.fn("hashBundle")(function* (root: string) {
99
const entries: string[] = [];
100
const visit = Effect.fn("mobile-native-client.visit")(function* (
101
relative: string,
101
- ): Effect.fn.Return<void, FileSystemError, FileSystem.FileSystem | Crypto.Crypto> {
102
+ ): Effect.fn.Return<void, FileSystemError, FileSystem.FileSystem | Digest.Digest> {
103
const names = (yield* fs.readDirectory(path.join(root, relative))).sort((a, b) =>
104
a.localeCompare(b, "en"),
105
);
@@ -1207,7 +1208,7 @@ if (import.meta.main) {
1208
),
1209
}),
1210
Effect.scoped,
1210
- Effect.provide([NodeServices.layer, FetchHttpClient.layer]),
1211
+ Effect.provide([NodeServices.layer, NodeCrypto.layer, FetchHttpClient.layer]),
1212
NodeRuntime.runMain,
1213
);
1214
}