Skip to content

Commit b707eeb

Browse files
refactor(provider-grok): move Grok into its own provider package (#17357)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 664bd5e commit b707eeb

45 files changed

Lines changed: 287 additions & 149 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
@@ -71,6 +71,7 @@
7171
"@t3tools/mobile-terminal-native": "file:./modules/t3-terminal",
7272
"@t3tools/provider-core": "workspace:*",
7373
"@t3tools/provider-cursor": "workspace:*",
74+
"@t3tools/provider-grok": "workspace:*",
7475
"@t3tools/provider-muse": "workspace:*",
7576
"@t3tools/provider-opencode": "workspace:*",
7677
"@t3tools/provider-pi": "workspace:*",

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -93,22 +93,6 @@ export function ProviderIcon(props: ProviderIconProps) {
9393
);
9494
}
9595

96-
if (props.provider === "grok") {
97-
const fill = isDarkMode ? "#F5F5F5" : "#0F0F0F";
98-
return (
99-
<Svg width={size} height={size} viewBox="0 0 24 24" fill="none">
100-
<Path
101-
fill={fill}
102-
d="M9.26905 15.284L17.2479 9.36086C17.6391 9.07047 18.1981 9.18374 18.3845 9.63478C19.3655 12.0135 18.9272 14.8721 16.9755 16.8349C15.0238 18.7976 12.3082 19.228 9.8261 18.2477L7.1146 19.5102C11.0037 22.1834 15.7263 21.5223 18.6774 18.5525C21.0182 16.1985 21.7432 12.9897 21.0653 10.0961L21.0714 10.1023C20.0884 5.85143 21.3131 4.15233 23.8218 0.677913C23.8812 0.595532 23.9406 0.513151 24 0.428711L20.6987 3.74866V3.73836L9.267 15.2861"
103-
/>
104-
<Path
105-
fill={fill}
106-
d="M7.62249 16.7237C4.83113 14.0422 5.3124 9.89222 7.69417 7.49905C9.45541 5.72786 12.341 5.00497 14.86 6.06768L17.5653 4.81138C17.0779 4.45714 16.4533 4.07613 15.7365 3.80839C12.4966 2.46764 8.6178 3.13492 5.98413 5.78141C3.45081 8.32904 2.65415 12.2463 4.02219 15.5889C5.04412 18.0871 3.36889 19.8541 1.68137 21.6377C1.08337 22.2699 0.483318 22.9022 0 23.5716L7.62045 16.7257"
107-
/>
108-
</Svg>
109-
);
110-
}
111-
11296
const packageIcon = getProviderClient(props.provider)?.icon;
11397
if (packageIcon) {
11498
const themeFill = (fill: { readonly light: string; readonly dark: string }) =>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import { isProviderDriverKind } from "@t3tools/contracts";
22
import { makeProviderClientRegistry } from "@t3tools/provider-core/client";
33
import { cursorClient } from "@t3tools/provider-cursor/client";
4+
import { grokClient } from "@t3tools/provider-grok/client";
45
import { museClient } from "@t3tools/provider-muse/client";
56
import { openCodeClient } from "@t3tools/provider-opencode/client";
67
import { piClient } from "@t3tools/provider-pi/client";
78

89
/** The provider client definitions this mobile build ships. */
910
const providerClients = makeProviderClientRegistry([
1011
cursorClient,
12+
grokClient,
1113
museClient,
1214
openCodeClient,
1315
piClient,

‎apps/server/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"@t3tools/provider-acp": "workspace:*",
4242
"@t3tools/provider-core": "workspace:*",
4343
"@t3tools/provider-cursor": "workspace:*",
44+
"@t3tools/provider-grok": "workspace:*",
4445
"@t3tools/provider-muse": "workspace:*",
4546
"@t3tools/provider-opencode": "workspace:*",
4647
"@t3tools/provider-pi": "workspace:*",

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
* node scripts/record-grok-acp-replay-fixture.ts --scenario simple
1111
*/
1212
import * as NodeServices from "@effect/platform-node/NodeServices";
13-
import { GrokSettings, type ProviderReplayEntry } from "@t3tools/contracts";
13+
import { type ProviderReplayEntry } from "@t3tools/contracts";
14+
import { GrokSettings } from "@t3tools/provider-grok/settings";
1415
import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess";
1516
import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime";
1617
import * as Clock from "effect/Clock";
@@ -31,7 +32,7 @@ import {
3132
GROK_PROVIDER,
3233
grokLaunchRuntimeMode,
3334
makeGrokAdapterV2,
34-
} from "../src/orchestration-v2/Adapters/GrokAdapterV2.ts";
35+
} from "@t3tools/provider-grok/testing";
3536
import { ACP_PROTOCOL } from "@t3tools/provider-acp/server/adapter";
3637
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
3738
import type { ProviderAdapterV2SessionRuntime } from "@t3tools/provider-core/server/ProviderAdapter";
@@ -43,7 +44,7 @@ import { materializeFixtureInput } from "../src/orchestration-v2/testkit/fixture
4344
import { runOrchestratorV2Scenario } from "../src/orchestration-v2/testkit/OrchestratorScenario.ts";
4445
import * as ProviderReplayHarness from "../src/orchestration-v2/testkit/ProviderReplayHarness.ts";
4546
import { checkpointWorkspace } from "@t3tools/provider-testing/replayWorkspace";
46-
import { makeGrokAcpRuntime } from "../src/provider/acp/GrokAcpSupport.ts";
47+
import { makeGrokAcpRuntime } from "@t3tools/provider-grok/testing";
4748
import { buildRuntimeInstructions } from "@t3tools/provider-core/server/runtimeInstructions";
4849

4950
const wallClock = Clock.Clock.defaultValue();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
1212
import { assert, describe, it } from "@effect/vitest";
1313
import {
1414
CheckpointId,
15-
GrokSettings,
1615
EnvironmentId,
1716
MessageId,
1817
type ModelSelection,
@@ -27,6 +26,7 @@ import {
2726
ThreadId,
2827
type OrchestrationV2ProviderThread,
2928
} from "@t3tools/contracts";
29+
import { GrokSettings } from "@t3tools/provider-grok/settings";
3030
import { HostProcessIsExecutable, HostProcessPlatform } from "@t3tools/shared/hostProcess";
3131
import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime";
3232
import * as DateTime from "effect/DateTime";
@@ -64,7 +64,7 @@ import {
6464
makeXAiPromptCompletionRuntime,
6565
normalizeXAiAcpToolCallState,
6666
registerXAiBackgroundTaskTracking,
67-
} from "../../provider/acp/XAiAcpExtension.ts";
67+
} from "@t3tools/provider-grok/testing";
6868
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
6969
import {
7070
ProviderAdapterProtocolError,
@@ -93,7 +93,7 @@ import {
9393
type AcpAdapterV2SubagentUpdate,
9494
} from "@t3tools/provider-acp/server/adapter";
9595

96-
import { makeGrokAdapterV2 } from "./GrokAdapterV2.ts";
96+
import { makeGrokAdapterV2 } from "@t3tools/provider-grok/testing";
9797
import {
9898
acpRegistryPromptFailure,
9999
registerMistralVibeAcpExtensions,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import * as NodeServices from "@effect/platform-node/NodeServices";
22
import {
3-
GrokSettings,
43
ProjectId,
54
ProviderInstanceId,
65
ProviderSessionId,
76
type RuntimeMode,
87
ThreadId,
98
} from "@t3tools/contracts";
9+
import { GrokSettings } from "@t3tools/provider-grok/settings";
1010
import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
1111
import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime";
1212
import * as EffectAcpErrors from "effect-acp/errors";
13-
import { xAiRateLimitedErrorCode } from "../../provider/acp/XAiAcpExtension.ts";
13+
import { xAiRateLimitedErrorCode } from "@t3tools/provider-grok/testing";
1414
import { assert, describe, it } from "@effect/vitest";
1515
import * as Crypto from "effect/Crypto";
1616
import * as DateTime from "effect/DateTime";
@@ -25,7 +25,7 @@ import type * as EffectAcpSchema from "effect-acp/compat";
2525
import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
2626
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
2727
import * as ProjectStore from "../ProjectStore.ts";
28-
import { buildInitialGrokProviderSnapshot } from "../../provider/GrokProvider.ts";
28+
import { buildInitialGrokProviderSnapshot } from "@t3tools/provider-grok/testing";
2929
import type { ProviderInstance } from "@t3tools/provider-core/server/driver";
3030
import * as ProviderInstanceRegistry from "../../provider/ProviderInstanceRegistry.ts";
3131
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
@@ -43,7 +43,7 @@ import {
4343
makeGrokAdapterV2,
4444
GrokProviderCapabilitiesV2,
4545
type GrokAdapterV2Options,
46-
} from "./GrokAdapterV2.ts";
46+
} from "@t3tools/provider-grok/testing";
4747

4848
const LAUNCH_TEST_GROK_SETTINGS = Schema.decodeSync(GrokSettings)({
4949
binaryPath: "grok-launch-test",

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as NodeServices from "@effect/platform-node/NodeServices";
2-
import { GrokSettings } from "@t3tools/contracts";
2+
import { GrokSettings } from "@t3tools/provider-grok/settings";
33
import * as Effect from "effect/Effect";
44
import * as Crypto from "effect/Crypto";
55
import * as FileSystem from "effect/FileSystem";
@@ -12,11 +12,8 @@ import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime";
1212

1313
import * as ProviderHost from "@t3tools/provider-core/server/ProviderHost";
1414
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
15-
import {
16-
GROK_ACP_CANCEL_META,
17-
GROK_ACP_INITIALIZE_META,
18-
} from "../../provider/acp/GrokAcpSupport.ts";
19-
import { makeXAiPromptCompletionRuntime } from "../../provider/acp/XAiAcpExtension.ts";
15+
import { GROK_ACP_CANCEL_META, GROK_ACP_INITIALIZE_META } from "@t3tools/provider-grok/testing";
16+
import { makeXAiPromptCompletionRuntime } from "@t3tools/provider-grok/testing";
2017
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
2118
import * as ProviderContinuationRequests from "@t3tools/provider-core/server/continuationRequests";
2219
import * as ProviderAdapterRegistry from "../ProviderAdapterRegistry.ts";
@@ -29,7 +26,11 @@ import {
2926
makeAcpReplayCompletenessAssertion,
3027
makeAcpReplayRuntime,
3128
} from "./AcpAdapterV2.testkit.ts";
32-
import { GROK_DEFAULT_INSTANCE_ID, GROK_PROVIDER, makeGrokAdapterV2 } from "./GrokAdapterV2.ts";
29+
import {
30+
GROK_DEFAULT_INSTANCE_ID,
31+
GROK_PROVIDER,
32+
makeGrokAdapterV2,
33+
} from "@t3tools/provider-grok/testing";
3334

3435
const DEFAULT_GROK_SETTINGS = Schema.decodeUnknownSync(GrokSettings)({});
3536

‎apps/server/src/orchestration-v2/CommandPolicy.test.ts‎

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

1414
import { CodexProviderCapabilitiesV2 } from "./Adapters/CodexAdapterV2.ts";
1515
import { CursorProviderCapabilitiesV2 } from "@t3tools/provider-cursor/testing";
16-
import { GrokProviderCapabilitiesV2 } from "./Adapters/GrokAdapterV2.ts";
16+
import { GrokProviderCapabilitiesV2 } from "@t3tools/provider-grok/testing";
1717
import * as CommandPolicy from "./CommandPolicy.ts";
1818

1919
const commandId = CommandId.make("command-policy-test");

‎apps/server/src/orchestration-v2/builtInProviderAdapterDrivers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
CursorAdapterV2Driver,
1414
type CursorAdapterV2DriverEnv,
1515
} from "@t3tools/provider-cursor/server";
16-
import { GrokAdapterV2Driver, type GrokAdapterV2DriverEnv } from "./Adapters/GrokAdapterV2.ts";
16+
import { GrokAdapterV2Driver, type GrokAdapterV2DriverEnv } from "@t3tools/provider-grok/server";
1717
import {
1818
OpenCodeAdapterV2Driver,
1919
type OpenCodeAdapterV2DriverEnv,

0 commit comments

Comments
 (0)