Skip to content

Commit b5e4f1e

Browse files
refactor(provider-cursor): move Cursor into its own provider package (pingdotgg#17349)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent e62161b commit b5e4f1e

64 files changed

Lines changed: 429 additions & 357 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-cursor": "workspace:*",
7374
"@t3tools/provider-muse": "workspace:*",
7475
"@t3tools/provider-opencode": "workspace:*",
7576
"@t3tools/provider-pi": "workspace:*",

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,6 @@ export function ProviderIcon(props: ProviderIconProps) {
109109
);
110110
}
111111

112-
if (props.provider === "cursor") {
113-
return (
114-
<Svg width={size} height={size} viewBox="0 0 466.73 532.09" fill="none">
115-
<Path
116-
fill={isDarkMode ? "#EDECEC" : "#26251E"}
117-
d="M457.43,125.94L244.42,2.96c-6.84-3.95-15.28-3.95-22.12,0L9.3,125.94c-5.75,3.32-9.3,9.46-9.3,16.11v247.99c0,6.65,3.55,12.79,9.3,16.11l213.01,122.98c6.84,3.95,15.28,3.95,22.12,0l213.01-122.98c5.75-3.32,9.3-9.46,9.3-16.11v-247.99c0-6.65-3.55-12.79-9.3-16.11h-.01ZM444.05,151.99l-205.63,356.16c-1.39,2.4-5.06,1.42-5.06-1.36v-233.21c0-4.66-2.49-8.97-6.53-11.31L24.87,145.67c-2.4-1.39-1.42-5.06,1.36-5.06h411.26c5.84,0,9.49,6.33,6.57,11.39h-.01Z"
118-
/>
119-
</Svg>
120-
);
121-
}
122-
123112
const packageIcon = getProviderClient(props.provider)?.icon;
124113
if (packageIcon) {
125114
const themeFill = (fill: { readonly light: string; readonly dark: string }) =>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
import { isProviderDriverKind } from "@t3tools/contracts";
22
import { makeProviderClientRegistry } from "@t3tools/provider-core/client";
3+
import { cursorClient } from "@t3tools/provider-cursor/client";
34
import { museClient } from "@t3tools/provider-muse/client";
45
import { openCodeClient } from "@t3tools/provider-opencode/client";
56
import { piClient } from "@t3tools/provider-pi/client";
67

78
/** The provider client definitions this mobile build ships. */
8-
const providerClients = makeProviderClientRegistry([museClient, openCodeClient, piClient]);
9+
const providerClients = makeProviderClientRegistry([
10+
cursorClient,
11+
museClient,
12+
openCodeClient,
13+
piClient,
14+
]);
915

1016
/** The client definition for a driver kind, or `undefined` for drivers drawn by hand. */
1117
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
@@ -39,6 +39,7 @@
3939
"@noble/hashes": "catalog:",
4040
"@opencode-ai/sdk": "^1.3.15",
4141
"@t3tools/provider-core": "workspace:*",
42+
"@t3tools/provider-cursor": "workspace:*",
4243
"@t3tools/provider-muse": "workspace:*",
4344
"@t3tools/provider-opencode": "workspace:*",
4445
"@t3tools/provider-pi": "workspace:*",

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

Lines changed: 5 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import { HostProcessEnvironment } from "@t3tools/shared/hostProcess";
2-
import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
3-
import { DEFAULT_SIGNAL_EXPORT } from "@t3tools/shared/observability";
42
import type { InteractionUpdate, RunResult } from "@cursor/sdk";
53
import * as NodeServices from "@effect/platform-node/NodeServices";
64
import {
@@ -15,23 +13,21 @@ import * as Effect from "effect/Effect";
1513
import * as Fiber from "effect/Fiber";
1614
import * as FileSystem from "effect/FileSystem";
1715
import * as Layer from "effect/Layer";
18-
import * as Path from "effect/Path";
19-
import * as PlatformError from "effect/PlatformError";
2016
import * as Schema from "effect/Schema";
2117

22-
import * as ServerConfig from "../../config.ts";
18+
import { layerTestProviderHost } from "@t3tools/provider-testing/host";
2319
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
2420
import { ProviderAdapterDriverCreateError } from "@t3tools/provider-core/server/adapterDriver";
2521
import * as ProviderAdapterRegistry from "../ProviderAdapterRegistry.ts";
2622
import type { OrchestratorV2ProviderReplayHarness } from "../testkit/ProviderReplayHarness.ts";
27-
import * as CursorAgentSdk from "./CursorAgentSdk.ts";
23+
import { CursorAdapterV2Driver } from "@t3tools/provider-cursor/server";
24+
import * as CursorAgentSdk from "@t3tools/provider-cursor/server/CursorAgentSdk";
2825
import {
2926
CURSOR_DEFAULT_INSTANCE_ID,
3027
CURSOR_DRIVER_KIND,
31-
CursorAdapterV2Driver,
3228
cursorSdkModelSelection,
3329
makeCursorAgentOptions,
34-
} from "./CursorAdapterV2.ts";
30+
} from "@t3tools/provider-cursor/testing";
3531
import type { ProviderAdapterV2RuntimePolicy } from "@t3tools/provider-core/server/ProviderAdapter";
3632
import type { RuntimePolicyV2Override } from "../RuntimePolicy.ts";
3733

@@ -513,102 +509,13 @@ function layerCursorAgentSdkReplay(
513509
);
514510
}
515511

516-
function makeReplayServerConfig(
517-
scenario: string,
518-
): Effect.Effect<
519-
ServerConfig.ServerConfig["Service"],
520-
PlatformError.PlatformError,
521-
FileSystem.FileSystem | Path.Path
522-
> {
523-
return Effect.gen(function* () {
524-
const fs = yield* FileSystem.FileSystem;
525-
const path = yield* Path.Path;
526-
const baseDir = yield* fs.makeTempDirectory({
527-
prefix: `t3-orchestration-v2-cursor-${scenario}-`,
528-
});
529-
const stateDir = path.join(baseDir, "userdata");
530-
const logsDir = path.join(stateDir, "logs");
531-
const providerLogsDir = path.join(logsDir, "provider");
532-
const terminalLogsDir = path.join(logsDir, "terminals");
533-
const attachmentsDir = path.join(stateDir, "attachments");
534-
const environmentThemesDir = path.join(stateDir, "themes");
535-
const worktreesDir = path.join(baseDir, "worktrees");
536-
const providerStatusCacheDir = path.join(baseDir, "caches");
537-
for (const directory of [
538-
stateDir,
539-
logsDir,
540-
providerLogsDir,
541-
terminalLogsDir,
542-
attachmentsDir,
543-
environmentThemesDir,
544-
worktreesDir,
545-
providerStatusCacheDir,
546-
]) {
547-
yield* fs.makeDirectory(directory, { recursive: true });
548-
}
549-
return {
550-
logLevel: "Error",
551-
traceMinLevel: "Info",
552-
traceTimingEnabled: true,
553-
traceBatchWindowMs: 200,
554-
traceMaxBytes: 10 * 1024 * 1024,
555-
traceMaxFiles: 10,
556-
otelEnvironment: OtelEnvironment.none,
557-
otlpTracesUrl: undefined,
558-
otlpMetricsUrl: undefined,
559-
otlpLogsUrl: undefined,
560-
otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
561-
otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
562-
otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
563-
mode: "web",
564-
port: 0,
565-
host: undefined,
566-
cwd: process.cwd(),
567-
baseDir,
568-
staticDir: undefined,
569-
devUrl: undefined,
570-
devAllowedOrigins: [],
571-
noBrowser: false,
572-
startupPresentation: "browser",
573-
tailscaleServeEnabled: false,
574-
tailscaleServePort: 443,
575-
desktopBootstrapToken: undefined,
576-
autoBootstrapProjectFromCwd: false,
577-
logWebSocketEvents: false,
578-
stateDir,
579-
dbPath: path.join(stateDir, "state.sqlite"),
580-
keybindingsConfigPath: path.join(stateDir, "keybindings.json"),
581-
settingsPath: path.join(stateDir, "settings.json"),
582-
providerStatusCacheDir,
583-
worktreesDir,
584-
attachmentsDir,
585-
browserArtifactsDir: path.join(stateDir, "browser-artifacts"),
586-
environmentThemesDir,
587-
logsDir,
588-
serverLogPath: path.join(logsDir, "server.log"),
589-
serverTracePath: path.join(logsDir, "server.trace.ndjson"),
590-
providerLogsDir,
591-
providerEventLogPath: path.join(providerLogsDir, "events.log"),
592-
terminalLogsDir,
593-
anonymousIdPath: path.join(stateDir, "anonymous-id"),
594-
environmentIdPath: path.join(stateDir, "environment-id"),
595-
serverRuntimeStatePath: path.join(stateDir, "server-runtime.json"),
596-
secretsDir: path.join(stateDir, "secrets"),
597-
};
598-
});
599-
}
600-
601512
export function layer(
602513
transcript: CursorAgentSdkReplayTranscript,
603514
options?: {
604515
readonly runner?: CursorAgentSdk.CursorAgentSdkRunnerShape;
605516
readonly assertCompleteOnFinalize?: boolean;
606517
},
607518
) {
608-
const layerServerConfig = Layer.effect(
609-
ServerConfig.ServerConfig,
610-
makeReplayServerConfig(transcript.scenario).pipe(Effect.orDie),
611-
).pipe(Layer.provide(NodeServices.layer));
612519
// Skill discovery also scans user roots under HOME; an empty HOME keeps
613520
// replays from picking up the host's own skills.
614521
const layerHostEnvironment = Layer.effect(
@@ -630,7 +537,7 @@ export function layer(
630537
Layer.provide(
631538
Layer.mergeAll(
632539
layerCursorAgentSdkReplay(transcript, options),
633-
layerServerConfig,
540+
layerTestProviderHost().pipe(Layer.provide(NodeServices.layer)),
634541
layerHostEnvironment,
635542
NodeServices.layer,
636543
IdAllocator.layer,

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

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { CodexAdapterV2Driver, type CodexAdapterV2DriverEnv } from "./Adapters/C
1212
import {
1313
CursorAdapterV2Driver,
1414
type CursorAdapterV2DriverEnv,
15-
} from "./Adapters/CursorAdapterV2.ts";
15+
} from "@t3tools/provider-cursor/server";
1616
import { GrokAdapterV2Driver, type GrokAdapterV2DriverEnv } from "./Adapters/GrokAdapterV2.ts";
1717
import {
1818
OpenCodeAdapterV2Driver,

‎apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import {
4343
canReuseCodexContextUsage,
4444
} from "../Adapters/CodexAdapterV2.ts";
4545
import { AcpProviderCapabilitiesV2 } from "../Adapters/AcpAdapterV2.ts";
46-
import { CursorProviderCapabilitiesV2 } from "../Adapters/CursorAdapterV2.ts";
46+
import { CursorProviderCapabilitiesV2 } from "@t3tools/provider-cursor/testing";
4747
import * as EventSink from "../EventSink.ts";
4848
import * as EventStore from "../EventStore.ts";
4949
import * as LegacyV1ThreadImporter from "../legacy/LegacyV1ThreadImporter.ts";

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import * as BackgroundPolicy from "../background/BackgroundPolicy.ts";
2222
import * as ServerConfig from "../config.ts";
2323
import * as ServerSettings from "../serverSettings.ts";
2424
import * as ProviderHostLive from "./ProviderHostLive.ts";
25+
import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
2526
import type { AcpSessionRuntimeStartResult } from "./acp/AcpSessionRuntime.ts";
2627
import {
2728
buildAntigravityModelsFromSession,
@@ -116,9 +117,10 @@ const layerTest = ProviderHostLive.layer.pipe(
116117
}),
117118
),
118119
Layer.provideMerge(ServerSettings.layerTest()),
120+
Layer.provideMerge(ServerSecretStore.layer),
119121
Layer.provide(
120122
ServerConfig.layerTest(process.cwd(), { prefix: "t3-antigravity-provider-test-" }).pipe(
121-
Layer.provide(NodeServices.layer),
123+
Layer.provideMerge(NodeServices.layer),
122124
),
123125
),
124126
);

‎apps/server/src/provider/Drivers/AntigravityDriver.test.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import * as ModelManifest from "../ModelManifest.ts";
3434
import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
3535
import { AntigravityDriver } from "./AntigravityDriver.ts";
3636
import * as ProviderHostLive from "../ProviderHostLive.ts";
37+
import * as ServerSecretStore from "../../auth/ServerSecretStore.ts";
3738

3839
const hostPlatform = HostProcessPlatform.defaultValue();
3940
const windowsHost = hostPlatform === "win32";
@@ -264,7 +265,10 @@ const layerDeps = ServerConfig.layerTest(process.cwd(), {
264265
Layer.provideMerge(ModelManifest.layerTest),
265266
Layer.provideMerge(IdAllocator.layer),
266267
);
267-
const layerTest = ProviderHostLive.layer.pipe(Layer.provideMerge(layerDeps));
268+
const layerTest = ProviderHostLive.layer.pipe(
269+
Layer.provideMerge(ServerSecretStore.layer),
270+
Layer.provideMerge(layerDeps),
271+
);
268272

269273
it.layer(layerTest)("AntigravityDriver", (it) => {
270274
it.effect.skipIf(windowsHost)(

0 commit comments

Comments
 (0)