Skip to content

Commit 31b04e2

Browse files
refactor(provider): bring opencode, muse, pi, core and testing in line with Effect conventions (#17542)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 784b562 commit 31b04e2

76 files changed

Lines changed: 309 additions & 293 deletions

File tree

Some content is hidden

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

‎apps/server/scripts/record-grok-acp-replay-fixture.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import * as Schema from "effect/Schema";
2424
import { ChildProcessSpawner } from "effect/process";
2525
import type * as EffectAcpProtocol from "effect-acp/protocol";
2626

27-
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
27+
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
2828
import {
2929
GROK_DEFAULT_INSTANCE_ID,
3030
GROK_PROVIDER,
@@ -490,7 +490,7 @@ const recordScenario = Effect.fn("recordGrokScenario")(function* (fixtureName: s
490490
).pipe(
491491
Layer.provide(
492492
Layer.mergeAll(
493-
layerTestProviderHost().pipe(Layer.provide(NodeServices.layer)),
493+
TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
494494
NodeServices.layer,
495495
IdAllocator.layer,
496496
),

‎apps/server/src/assets/AssetAccess.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
5353
import { parseAttachmentFileExtension, resolveAttachmentPathById } from "../attachmentStore.ts";
5454
import * as ServerConfig from "../config.ts";
5555
import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
56-
import { expandHomePathWith } from "@t3tools/provider-core/server/pathExpansion";
56+
import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
5757
import * as ProjectFaviconResolver from "../project/ProjectFaviconResolver.ts";
5858
import * as WorkspacePaths from "../workspace/WorkspacePaths.ts";
5959
import * as NativeAppIconResolver from "./NativeAppIconResolver.ts";
@@ -469,7 +469,7 @@ export const issueAssetUrl = Effect.fn("AssetAccess.issueAssetUrl")(function* (i
469469

470470
switch (input.resource._tag) {
471471
case "media-file": {
472-
let requestedPath = expandHomePathWith(input.resource.path, path);
472+
let requestedPath = expandHomePath(input.resource.path);
473473
if (!path.isAbsolute(requestedPath)) {
474474
if (!input.workspaceRoot) {
475475
return yield* new AssetWorkspaceContextNotFoundError({ resource: input.resource });

‎apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import * as EffectAcpErrors from "effect-acp/errors";
5353
import type * as EffectAcpProtocol from "effect-acp/protocol";
5454
import type * as EffectAcpSchema from "effect-acp/compat";
5555

56-
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
56+
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
5757
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
5858
import * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime";
5959
import {
@@ -94,7 +94,7 @@ import {
9494

9595
const DEFAULT_GROK_SETTINGS = Schema.decodeSync(GrokSettings)({});
9696

97-
const layerHost = layerTestProviderHost().pipe(Layer.provide(NodeServices.layer));
97+
const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
9898

9999
const layerTest = Layer.mergeAll(
100100
NodeServices.layer,

‎apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import * as EffectAcpErrors from "effect-acp/errors";
1515

1616
import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
1717
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
18-
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
18+
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
1919
import * as ServerSettings from "../../serverSettings.ts";
2020
import type {
2121
AcpRegistryAvailableCommands,
@@ -44,7 +44,7 @@ const decodeAcpRegistryAdapterSettings = Schema.decodeUnknownEffect(
4444
AcpRegistryAdapterV2Driver.configSchema,
4545
);
4646

47-
const layerHost = layerTestProviderHost().pipe(Layer.provide(NodeServices.layer));
47+
const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
4848

4949
const layerRegistry = Layer.succeed(
5050
HttpClient.HttpClient,

‎apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.testkit.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as Path from "effect/Path";
88
import * as Schema from "effect/Schema";
99
import { ChildProcessSpawner } from "effect/process";
1010

11-
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
11+
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
1212
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
1313
import * as ProviderAdapterRegistry from "../ProviderAdapterRegistry.ts";
1414
import type { ProviderReplayGate } from "@t3tools/provider-testing/replayGate";
@@ -35,7 +35,7 @@ function layerAcpRegistryProviderAdapterRegistryReplay(
3535
transcript: AcpReplayTranscript,
3636
options: { readonly replayGate?: ProviderReplayGate } = {},
3737
) {
38-
const layerHost = layerTestProviderHost().pipe(Layer.provide(NodeServices.layer));
38+
const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
3939

4040
return ProviderAdapterRegistry.layerFromAdaptersEffect(
4141
Effect.gen(function* () {

‎apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import type * as EffectAcpSchema from "effect-acp/compat";
2424

2525
import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
2626
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
27-
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
27+
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
2828
import type * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime";
2929
import { makeAntigravityAcpRuntime } from "../../provider/acp/AntigravityAcpSupport.ts";
3030
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
@@ -131,7 +131,7 @@ const layerSession = Layer.mergeAll(
131131
NodeServices.layer,
132132
IdAllocator.layer,
133133
McpProviderSessions.layer,
134-
layerTestProviderHost().pipe(Layer.provide(NodeServices.layer)),
134+
TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
135135
);
136136

137137
describe("AntigravityAdapterV2 client file system", () => {

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ import {
108108
claudeRateLimitEventToUpdate,
109109
type ClaudeScopedLimitNames,
110110
} from "../../provider/claudeUsageLimits.ts";
111-
import type { ServerProviderShape } from "@t3tools/provider-core/server/snapshot";
111+
import type { ManagedServerProvider } from "@t3tools/provider-core/server/snapshot";
112112
import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
113113
import { T3_CODE_ORCHESTRATION_INSTRUCTIONS } from "@t3tools/provider-core/server/orchestrationInstructions";
114114
import { buildRuntimeInstructions } from "@t3tools/provider-core/server/runtimeInstructions";
@@ -3018,7 +3018,7 @@ export interface ClaudeAdapterV2Options {
30183018
readonly idAllocator: IdAllocator.IdAllocatorV2["Service"];
30193019
readonly queryRunner: ClaudeAgentSdkQueryRunnerShape;
30203020
readonly scopedLimitNames?: Ref.Ref<ClaudeScopedLimitNames>;
3021-
readonly onUsageLimits?: ServerProviderShape["applyUsageLimits"];
3021+
readonly onUsageLimits?: ManagedServerProvider["applyUsageLimits"];
30223022
/** Sink for wake-turn continuation requests; defaults to dropping them. */
30233023
readonly continuationRequests?: {
30243024
readonly offer: (

‎apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
completeCodexTurnTokenUsage,
1313
type CodexTurnTokenUsageState,
1414
} from "../../provider/CodexTurnTokenUsage.ts";
15-
import type { ServerProviderShape } from "@t3tools/provider-core/server/snapshot";
15+
import type { ManagedServerProvider } from "@t3tools/provider-core/server/snapshot";
1616
import type { CodexEffectiveRuntime } from "../../provider/CodexManagedRuntime.ts";
1717
import { buildCodexInitializeParams } from "../../provider/CodexProvider.ts";
1818
import {
@@ -1646,7 +1646,7 @@ export interface CodexAdapterV2Options {
16461646
readonly settings: CodexSettings;
16471647
readonly environment: NodeJS.ProcessEnv;
16481648
readonly clientFactory: CodexAppServerClientFactoryShape;
1649-
readonly onUsageLimits?: ServerProviderShape["applyUsageLimits"];
1649+
readonly onUsageLimits?: ManagedServerProvider["applyUsageLimits"];
16501650
/**
16511651
* Resolves launch settings when each session opens, replacing `settings` and
16521652
* `environment`. Managed ChatGPT sign-in uses it to launch the T3-installed

‎apps/server/src/orchestration-v2/Adapters/CursorAdapterV2.testkit.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import * as FileSystem from "effect/FileSystem";
1515
import * as Layer from "effect/Layer";
1616
import * as Schema from "effect/Schema";
1717

18-
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
18+
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
1919
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
2020
import { ProviderAdapterDriverCreateError } from "@t3tools/provider-core/server/adapterDriver";
2121
import * as ProviderAdapterRegistry from "../ProviderAdapterRegistry.ts";
@@ -537,7 +537,7 @@ export function layer(
537537
Layer.provide(
538538
Layer.mergeAll(
539539
layerCursorAgentSdkReplay(transcript, options),
540-
layerTestProviderHost().pipe(Layer.provide(NodeServices.layer)),
540+
TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer)),
541541
layerHostEnvironment,
542542
NodeServices.layer,
543543
IdAllocator.layer,

‎apps/server/src/orchestration-v2/Adapters/GrokAdapterV2.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import * as Schema from "effect/Schema";
2020
import { ChildProcessSpawner } from "effect/process";
2121
import type * as EffectAcpSchema from "effect-acp/compat";
2222

23-
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
23+
import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
2424
import * as ProjectStore from "../ProjectStore.ts";
2525
import { buildInitialGrokProviderSnapshot } from "@t3tools/provider-grok/testing";
2626
import type { ProviderInstance } from "@t3tools/provider-core/server/driver";
@@ -309,7 +309,7 @@ describe("Grok permission prompts", () => {
309309
});
310310

311311
describe("Grok launch permission mode", () => {
312-
const layerHost = layerTestProviderHost().pipe(Layer.provide(NodeServices.layer));
312+
const layerHost = TestProviderHost.layer().pipe(Layer.provide(NodeServices.layer));
313313
const layerTest = Layer.mergeAll(
314314
NodeServices.layer,
315315
IdAllocator.layer,

0 commit comments

Comments
 (0)