Skip to content

Commit 5b78b34

Browse files
refactor(provider-muse): move Muse Code into its own provider package (#17331)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent e0c80c1 commit 5b78b34

44 files changed

Lines changed: 324 additions & 194 deletions

Some content is hidden

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

‎apps/mobile/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"@t3tools/mobile-review-diff-native": "file:./modules/t3-review-diff",
7171
"@t3tools/mobile-terminal-native": "file:./modules/t3-terminal",
7272
"@t3tools/provider-core": "workspace:*",
73+
"@t3tools/provider-muse": "workspace:*",
7374
"@t3tools/provider-pi": "workspace:*",
7475
"@t3tools/shared": "workspace:*",
7576
"@tabler/icons-react-native": "^3.44.0",

‎apps/mobile/src/components/ProviderIcon.tsx‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,6 @@ export function ProviderIcon(props: ProviderIconProps) {
120120
);
121121
}
122122

123-
if (props.provider === "muse") {
124-
return (
125-
<Svg width={size} height={size} viewBox="0 0 150.4828 100" fill="none">
126-
<Path
127-
fill={mono}
128-
fillRule="evenodd"
129-
d="M107.9999847,0.0000013c-12.3391113,0-21.984787,9.2935991-30.7164001,21.0993118 C65.2847366,5.821527,55.2499847,0,43.2413788,0C18.7586193,0,0,31.8620682,0,65.5862122 C0,86.6896515,10.2095623,100,27.3103466,100c12.3080502,0,21.1600361-5.8025894,36.8965454-33.3103409 c0,0,6.5597382-11.5841255,11.0725021-19.563858c1.5813522,2.5531845,3.2431107,5.3001404,4.9964676,8.2535095 l7.379303,12.4137955C102.0298843,91.8478851,110.039032,100,124.5517273,100 c16.6595764,0,25.9310303-13.4923325,25.9310303-35.0344849 C150.4827576,29.6551723,131.301178,0.0000013,107.9999847,0.0000013z M52.2068977,59.2413788 c-12.7586212,20-17.1724167,24.4827576-24.2758656,24.4827576c-7.3103428,0-11.6551704-6.4178314-11.6551704-17.8620682 c0-24.4827576,12.2068977-49.5172424,26.7586231-49.5172424c7.880127,0,14.4653816,4.5510426,24.5522308,18.9913158 C58.0087967,50.0272293,52.2068977,59.2413788,52.2068977,59.2413788z M100.3597336,56.7235756L91.5367355,42.00877 c-2.3876724-3.8832092-4.6757278-7.451458-6.8838348-10.7230263 c7.951973-12.273531,14.5113449-18.3891907,22.3126144-18.3891907c16.2069016,0,29.1724243,23.8620682,29.1724243,53.1724091 c0,11.1724167-3.6593475,17.6551743-11.2413864,17.6551743 C117.6294937,83.7241364,114.1578674,78.924736,100.3597336,56.7235756z"
130-
/>
131-
</Svg>
132-
);
133-
}
134-
135123
const packageIcon = getProviderClient(props.provider)?.icon;
136124
if (packageIcon) {
137125
const themeFill = (fill: { readonly light: string; readonly dark: string }) =>

‎apps/mobile/src/lib/providerClients.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { isProviderDriverKind } from "@t3tools/contracts";
22
import { makeProviderClientRegistry } from "@t3tools/provider-core/client";
3+
import { museClient } from "@t3tools/provider-muse/client";
34
import { piClient } from "@t3tools/provider-pi/client";
45

56
/** The provider client definitions this mobile build ships. */
6-
const providerClients = makeProviderClientRegistry([piClient]);
7+
const providerClients = makeProviderClientRegistry([museClient, piClient]);
78

89
/** The client definition for a driver kind, or `undefined` for drivers drawn by hand. */
910
export function getProviderClient(driver: string | null | undefined) {

‎apps/server/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"@opencode/protocol": "2.0.23",
4343
"@opencode/schema": "2.0.23",
4444
"@t3tools/provider-core": "workspace:*",
45+
"@t3tools/provider-muse": "workspace:*",
4546
"@t3tools/provider-pi": "workspace:*",
4647
"diff": "8.0.3",
4748
"effect": "catalog:",

‎apps/server/scripts/record-muse-msp-replay-fixture.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ import {
3333
MuseOrchestratorReplayHarness,
3434
} from "../src/orchestration-v2/Adapters/MuseAdapterV2.testkit.ts";
3535
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
36-
import { parseMuseVersion } from "../src/provider/museMaintenance.ts";
37-
import { makeMuseEnvironment, museServeArgs } from "../src/provider/museSdk.ts";
36+
import {
37+
makeMuseEnvironment,
38+
museServeArgs,
39+
parseMuseVersion,
40+
} from "@t3tools/provider-muse/testing";
3841
import { provideDeterministicTestRuntime } from "../src/orchestration-v2/testkit/DeterministicRuntime.ts";
3942
import { ORCHESTRATOR_REPLAY_FIXTURES } from "../src/orchestration-v2/testkit/fixtures/index.ts";
4043
import { materializeFixtureInput } from "../src/orchestration-v2/testkit/fixtures/shared.ts";

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,31 @@
1616
import * as NodeServices from "@effect/platform-node/NodeServices";
1717
import { Connection, type DuplexTransport } from "@muse-code/sdk";
1818
import {
19-
MuseSettings,
2019
ProviderDriverKind,
2120
ProviderInstanceId,
2221
ProviderReplayEntry,
2322
type ProviderReplayEntry as ProviderReplayEntryType,
2423
type ProviderReplayTranscript,
2524
} from "@t3tools/contracts";
25+
import { MuseSettings } from "@t3tools/provider-muse/settings";
2626
import * as Effect from "effect/Effect";
2727
import * as FileSystem from "effect/FileSystem";
2828
import * as Layer from "effect/Layer";
2929
import * as Schema from "effect/Schema";
3030

31-
import * as ServerConfig from "../../config.ts";
31+
import { ProviderHost } from "@t3tools/provider-core/server/ProviderHost";
32+
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
3233
import {
3334
museInitializeParams,
3435
museServeArgs,
3536
type MuseSdkHost,
3637
type MuseSdkHostOptions,
37-
} from "../../provider/museSdk.ts";
38+
} from "@t3tools/provider-muse/testing";
3839
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
3940
import * as ProviderAdapterRegistry from "../ProviderAdapterRegistry.ts";
4041
import * as ProviderContinuationRequests from "@t3tools/provider-core/server/continuationRequests";
41-
import {
42-
makeReplayServerConfig,
43-
type OrchestratorV2ProviderReplayHarness,
44-
} from "../testkit/ProviderReplayHarness.ts";
45-
import { makeMuseAdapterV2 } from "./MuseAdapterV2.ts";
42+
import type { OrchestratorV2ProviderReplayHarness } from "../testkit/ProviderReplayHarness.ts";
43+
import { makeMuseAdapterV2 } from "@t3tools/provider-muse/server";
4644

4745
export const MUSE_PROVIDER_KIND = "muse";
4846
export const MUSE_MSP_REPLAY_PROTOCOL = "muse.msp-jsonl";
@@ -448,10 +446,6 @@ export function layer(input: {
448446
/** Replay needs none; a live recording passes the host environment. */
449447
readonly environment?: NodeJS.ProcessEnv;
450448
}) {
451-
const layerServerConfig = Layer.effect(
452-
ServerConfig.ServerConfig,
453-
makeReplayServerConfig(`muse-${input.scenario}`).pipe(Effect.orDie),
454-
).pipe(Layer.provide(NodeServices.layer));
455449
return ProviderAdapterRegistry.layerFromAdaptersEffect(
456450
Effect.gen(function* () {
457451
return [
@@ -460,15 +454,23 @@ export function layer(input: {
460454
settings: DEFAULT_MUSE_SETTINGS,
461455
environment: input.environment ?? {},
462456
idAllocator: yield* IdAllocator.IdAllocatorV2,
463-
serverConfig: yield* ServerConfig.ServerConfig,
457+
host: yield* ProviderHost,
464458
fileSystem: yield* FileSystem.FileSystem,
465459
createHost: input.createHost,
466460
// Same queue the continuation worker drains when the fixture runs it.
467461
continuationRequests: yield* ProviderContinuationRequests.ProviderContinuationRequests,
468462
}),
469463
];
470464
}),
471-
).pipe(Layer.provide(Layer.mergeAll(layerServerConfig, NodeServices.layer, IdAllocator.layer)));
465+
).pipe(
466+
Layer.provide(
467+
Layer.mergeAll(
468+
layerTestProviderHost().pipe(Layer.provide(NodeServices.layer)),
469+
NodeServices.layer,
470+
IdAllocator.layer,
471+
),
472+
),
473+
);
472474
}
473475

474476
export const MuseOrchestratorReplayHarness: OrchestratorV2ProviderReplayHarness<

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
grokSlashCommandsFromInitialize,
1919
parseGrokModelsCliOutput,
2020
} from "./GrokProvider.ts";
21-
import { execScriptSource, writeFakeCli } from "../testUtils/fakeCli.ts";
21+
import { execScriptSource, writeFakeCli } from "@t3tools/provider-testing/fakeCli";
2222
import { grokUsageResponseToLimits, readGrokAccount } from "./grokUsageLimits.ts";
2323

2424
const decodeGrokSettings = Schema.decodeSync(GrokSettings);

‎apps/server/src/provider/builtInDrivers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { CodexDriver, type CodexDriverEnv } from "./Drivers/CodexDriver.ts";
2727
import { CursorDriver, type CursorDriverEnv } from "./Drivers/CursorDriver.ts";
2828
import { GrokDriver, type GrokDriverEnv } from "./Drivers/GrokDriver.ts";
2929
import { OpenCodeDriver, type OpenCodeDriverEnv } from "./Drivers/OpenCodeDriver.ts";
30-
import { MuseDriver, type MuseDriverEnv } from "./Drivers/MuseDriver.ts";
30+
import { MuseDriver, type MuseDriverEnv } from "@t3tools/provider-muse/server";
3131
import { PiDriver, type PiDriverEnv } from "@t3tools/provider-pi/server";
3232
import type { AnyProviderDriver } from "@t3tools/provider-core/server/driver";
3333

‎apps/server/src/textGeneration/ClaudeTextGeneration.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
import * as TextGeneration from "./TextGeneration.ts";
2222
import { sanitizeThreadTitle } from "@t3tools/provider-core/server/textGenerationUtils";
2323
import { makeClaudeTextGeneration } from "./ClaudeTextGeneration.ts";
24-
import { writeFakeCli } from "../testUtils/fakeCli.ts";
24+
import { writeFakeCli } from "@t3tools/provider-testing/fakeCli";
2525
const decodeClaudeSettings = Schema.decodeSync(ClaudeSettings);
2626

2727
const layerClaudeTextGenerationTest = ServerConfig.ServerConfig.layerTest(process.cwd(), {

‎apps/server/src/textGeneration/CodexTextGeneration.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { CodexSettings, ProviderInstanceId, TextGenerationError } from "@t3tools
1616
import * as ServerConfig from "../config.ts";
1717
import * as TextGeneration from "./TextGeneration.ts";
1818
import { makeCodexTextGeneration } from "./CodexTextGeneration.ts";
19-
import { writeFakeCli } from "../testUtils/fakeCli.ts";
19+
import { writeFakeCli } from "@t3tools/provider-testing/fakeCli";
2020
const decodeCodexSettings = Schema.decodeSync(CodexSettings);
2121

2222
const DEFAULT_TEST_MODEL_SELECTION = createModelSelection(

0 commit comments

Comments
 (0)