Skip to content

Commit 7b0dda5

Browse files
refactor(provider-opencode): import OpenCode services as namespaces
Service modules (OpenCodeRuntime, OpenCodeServerLedger, the 2.x client, server, adapter, and text generation) get their own package subpaths and are imported as `import * as X`, per the Effect service conventions, instead of being re-exported through the ./server and ./testing barrels. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 5c4ad5a commit 7b0dda5

14 files changed

Lines changed: 48 additions & 29 deletions

‎apps/server/src/orchestration-v2/AcpRegistryOrchestratorV2.live.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
3030
import * as ModelManifest from "../provider/ModelManifest.ts";
3131
import * as ProviderInstanceRegistryHydration from "../provider/ProviderInstanceRegistryHydration.ts";
3232
import * as ProviderEventLoggers from "../provider/ProviderEventLoggers.ts";
33-
import { OpenCodeRuntime } from "@t3tools/provider-opencode/server";
34-
import { OpenCodeServerLedger } from "@t3tools/provider-opencode/server";
33+
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
34+
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
3535
import * as ServerSettings from "../serverSettings.ts";
3636
import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
3737
import * as VcsProcess from "../vcs/VcsProcess.ts";

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import * as HttpClientError from "effect/http/HttpClientError";
2020
import * as HttpClientResponse from "effect/http/HttpClientResponse";
2121
import * as UrlParams from "effect/http/UrlParams";
2222

23-
import { OpenCode2Client } from "@t3tools/provider-opencode/testing";
24-
import { OpenCode2Server } from "@t3tools/provider-opencode/testing";
23+
import * as OpenCode2Client from "@t3tools/provider-opencode/server/v2/OpenCode2Client";
24+
import * as OpenCode2Server from "@t3tools/provider-opencode/server/v2/OpenCode2Server";
2525
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
2626
import * as ProviderAdapterRegistry from "../ProviderAdapterRegistry.ts";
2727
import type { ProviderReplayGate } from "@t3tools/provider-testing/replayGate";
@@ -32,7 +32,7 @@ import {
3232
OpenCodeReplayController,
3333
OpenCodeReplayTranscriptDecodeError,
3434
} from "./OpenCodeAdapterV2.testkit.ts";
35-
import { OpenCode2Adapter as OpenCode2AdapterV2 } from "@t3tools/provider-opencode/testing";
35+
import * as OpenCode2Adapter from "@t3tools/provider-opencode/server/v2/adapter";
3636

3737
export const OPENCODE2_HTTP_PROTOCOL = "opencode2-http.sse" as const;
3838
const BASE_URL = "http://opencode2.replay";
@@ -262,7 +262,7 @@ const makeReplayAdapter = (
262262
) =>
263263
Effect.gen(function* () {
264264
const server = yield* replayServer(transcript, options);
265-
return yield* OpenCode2AdapterV2.make(ProviderInstanceId.make("opencode")).pipe(
265+
return yield* OpenCode2Adapter.make(ProviderInstanceId.make("opencode")).pipe(
266266
Effect.provideService(OpenCode2Server.OpenCode2Server, server),
267267
);
268268
});

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import * as Duration from "effect/Duration";
66
import * as Layer from "effect/Layer";
77
import * as Schema from "effect/Schema";
88

9-
import { OpenCodeAdapterV2Driver, OpenCodeRuntime } from "@t3tools/provider-opencode/server";
9+
import { OpenCodeAdapterV2Driver } from "@t3tools/provider-opencode/server";
10+
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
1011
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
1112
import * as ProviderEventLoggers from "../../provider/ProviderEventLoggers.ts";
1213
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";

‎apps/server/src/orchestration-v2/CursorOrchestratorV2.live.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
3030
import * as ModelManifest from "../provider/ModelManifest.ts";
3131
import * as ProviderInstanceRegistryHydration from "../provider/ProviderInstanceRegistryHydration.ts";
3232
import * as ProviderEventLoggers from "../provider/ProviderEventLoggers.ts";
33-
import { OpenCodeRuntime } from "@t3tools/provider-opencode/server";
34-
import { OpenCodeServerLedger } from "@t3tools/provider-opencode/server";
33+
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
34+
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
3535
import * as ServerSettings from "../serverSettings.ts";
3636
import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
3737
import * as VcsProcess from "../vcs/VcsProcess.ts";

‎apps/server/src/orchestration-v2/GrokOrchestratorV2.live.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
3030
import * as ModelManifest from "../provider/ModelManifest.ts";
3131
import * as ProviderInstanceRegistryHydration from "../provider/ProviderInstanceRegistryHydration.ts";
3232
import * as ProviderEventLoggers from "../provider/ProviderEventLoggers.ts";
33-
import { OpenCodeRuntime } from "@t3tools/provider-opencode/server";
34-
import { OpenCodeServerLedger } from "@t3tools/provider-opencode/server";
33+
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
34+
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
3535
import * as ServerSettings from "../serverSettings.ts";
3636
import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
3737
import * as VcsProcess from "../vcs/VcsProcess.ts";

‎apps/server/src/orchestration-v2/OpenCode2OrchestratorV2.live.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
5555
import * as ModelManifest from "../provider/ModelManifest.ts";
5656
import * as ProviderInstanceRegistryHydration from "../provider/ProviderInstanceRegistryHydration.ts";
5757
import * as ProviderEventLoggers from "../provider/ProviderEventLoggers.ts";
58-
import { OpenCode2Client } from "@t3tools/provider-opencode/testing";
59-
import { OpenCodeRuntime } from "@t3tools/provider-opencode/server";
60-
import { OpenCodeServerLedger } from "@t3tools/provider-opencode/server";
58+
import * as OpenCode2Client from "@t3tools/provider-opencode/server/v2/OpenCode2Client";
59+
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
60+
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
6161
import * as ServerSettings from "../serverSettings.ts";
6262
import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
6363
import * as VcsProcess from "../vcs/VcsProcess.ts";

‎apps/server/src/provider/OpenCode2Client.events.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { TestClock } from "effect/testing";
1010
import { HttpClient, HttpClientResponse } from "effect/http";
1111
import { describe } from "vite-plus/test";
1212

13-
import { OpenCode2Client } from "@t3tools/provider-opencode/testing";
13+
import * as OpenCode2Client from "@t3tools/provider-opencode/server/v2/OpenCode2Client";
1414

1515
const RECORDING = new URL(
1616
"../orchestration-v2/testkit/fixtures/opencode2_simple/opencode_transcript.ndjson",

‎apps/server/src/provider/ProviderInstanceRegistry.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ import { GrokDriver, type GrokDriverEnv } from "./Drivers/GrokDriver.ts";
5858
import { OpenCodeDriver, type OpenCodeDriverEnv } from "@t3tools/provider-opencode/server";
5959
import type { OpenCodeSettings } from "@t3tools/provider-opencode/settings";
6060
import * as ModelManifest from "./ModelManifest.ts";
61-
import { OpenCodeRuntime } from "@t3tools/provider-opencode/server";
62-
import { OpenCodeServerLedger } from "@t3tools/provider-opencode/server";
61+
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
62+
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
6363
import * as ResetCreditCoordinator from "./resetCreditCoordinator.ts";
6464
import * as ProviderEventLoggers from "./ProviderEventLoggers.ts";
6565
import { makeProviderInstanceRegistry } from "./ProviderInstanceRegistry.ts";

‎apps/server/src/provider/ProviderRegistry.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ import * as AntigravityInstallation from "./AntigravityInstallation.ts";
4545
import * as ModelManifest from "./ModelManifest.ts";
4646
import { applyProviderCompatibility } from "./providerCompatibility.ts";
4747
import * as ResetCreditCoordinator from "./resetCreditCoordinator.ts";
48-
import { OpenCodeRuntime } from "@t3tools/provider-opencode/server";
49-
import { OpenCodeServerLedger } from "@t3tools/provider-opencode/server";
48+
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
49+
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
5050
import * as ProviderEventLoggers from "./ProviderEventLoggers.ts";
5151
import * as ProviderInstanceRegistryHydration from "./ProviderInstanceRegistryHydration.ts";
5252
import * as ServerConfig from "../config.ts";

‎apps/server/src/server.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ import * as ProviderEventIngestor from "./orchestration-v2/ProviderEventIngestor
4343
import * as ModelManifest from "./provider/ModelManifest.ts";
4444
import * as ResetCreditCoordinator from "./provider/resetCreditCoordinator.ts";
4545
import * as ProviderEventLoggers from "./provider/ProviderEventLoggers.ts";
46-
import { OpenCodeRuntime } from "@t3tools/provider-opencode/server";
47-
import { OpenCodeServerLedger } from "@t3tools/provider-opencode/server";
46+
import * as OpenCodeRuntime from "@t3tools/provider-opencode/server/OpenCodeRuntime";
47+
import * as OpenCodeServerLedger from "@t3tools/provider-opencode/server/OpenCodeServerLedger";
4848
import * as AcpRegistryCatalog from "./provider/AcpRegistryCatalog.ts";
4949
import * as CheckpointDiffQuery from "./checkpointing/CheckpointDiffQuery.ts";
5050
import * as CheckpointStore from "./checkpointing/CheckpointStore.ts";

0 commit comments

Comments
 (0)