Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
fix(cursor): default binary path to cursor-agent (avoid path conflict w/ grok) (#4094)
BunnyGamezsc7f1cb6103118
diff --git a/apps/server/scripts/cursor-acp-model-mismatch-probe.ts b/apps/server/scripts/cursor-acp-model-mismatch-probe.tsindex b36c2b2d4..7e4e88aeb 100644--- a/apps/server/scripts/cursor-acp-model-mismatch-probe.ts+++ b/apps/server/scripts/cursor-acp-model-mismatch-probe.ts@@ -62,7 +62,7 @@ const promptText = NodeProcess.argv[4] ?? "helo";const targetReasoning = NodeProcess.env.CURSOR_REASONING ?? "";const targetContext = NodeProcess.env.CURSOR_CONTEXT ?? "";const targetFast = NodeProcess.env.CURSOR_FAST ?? "";-const agentBin = NodeProcess.env.CURSOR_AGENT_BIN ?? "agent";+const agentBin = NodeProcess.env.CURSOR_AGENT_BIN ?? "cursor-agent";const promptWaitMs = Number(NodeProcess.env.CURSOR_PROMPT_WAIT_MS ?? "4000");const requestTimeoutMs = Number(NodeProcess.env.CURSOR_REQUEST_TIMEOUT_MS ?? "20000");diff --git a/apps/server/src/provider/Drivers/CursorDriver.ts b/apps/server/src/provider/Drivers/CursorDriver.tsindex c394a7d1b..9451792fc 100644--- a/apps/server/src/provider/Drivers/CursorDriver.ts+++ b/apps/server/src/provider/Drivers/CursorDriver.ts@@ -1,5 +1,5 @@/**- * CursorDriver — `ProviderDriver` for the Cursor Agent (`agent`) runtime.+ * CursorDriver — `ProviderDriver` for the Cursor Agent (`cursor-agent`) runtime.** Cursor exposes an ACP-based CLI. Model catalog and capability refreshes* happen during the managed provider status check via Cursor's@@ -42,7 +42,7 @@ import type { ServerProviderDraft } from "../providerSnapshot.ts";import { mergeProviderInstanceEnvironment } from "../ProviderInstanceEnvironment.ts";import {makeProviderMaintenanceCapabilities,- makeStaticProviderMaintenanceResolver,+ type ProviderMaintenanceCapabilitiesResolver,resolveProviderMaintenanceCapabilitiesEffect,} from "../providerMaintenance.ts";import {@@ -54,15 +54,16 @@ const decodeCursorSettings = Schema.decodeSync(CursorSettings);const DRIVER_KIND = ProviderDriverKind.make("cursor");const SNAPSHOT_REFRESH_INTERVAL = Duration.minutes(5);-const UPDATE = makeStaticProviderMaintenanceResolver(- makeProviderMaintenanceCapabilities({- provider: DRIVER_KIND,- packageName: null,- updateExecutable: "agent",- updateArgs: ["update"],- updateLockKey: "cursor-agent",- }),-);+const UPDATE: ProviderMaintenanceCapabilitiesResolver = {+ resolve: (options) =>+ makeProviderMaintenanceCapabilities({+ provider: DRIVER_KIND,+ packageName: null,+ updateExecutable: options?.binaryPath?.trim() || "cursor-agent",+ updateArgs: ["update"],+ updateLockKey: "cursor-agent",+ }),+};export type CursorDriverEnv =| ChildProcessSpawner.ChildProcessSpawnerdiff --git a/apps/server/src/provider/Layers/CursorProvider.test.ts b/apps/server/src/provider/Layers/CursorProvider.test.tsindex 78f62ac21..3aefdcad1 100644--- a/apps/server/src/provider/Layers/CursorProvider.test.ts+++ b/apps/server/src/provider/Layers/CursorProvider.test.ts@@ -294,7 +294,7 @@ const parameterizedClaudeModelOptionConfigOptions = [const baseCursorSettings: CursorSettings = {enabled: true,- binaryPath: "agent",+ binaryPath: "cursor-agent",apiEndpoint: "",customModels: [],};diff --git a/apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts b/apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.tsindex dbfa7faff..73390450e 100644--- a/apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts+++ b/apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts@@ -76,7 +76,7 @@ const makeClaudeConfig = (overrides: Partial<ClaudeSettings>): ClaudeSettings =>const makeCursorConfig = (overrides: Partial<CursorSettings>): CursorSettings => ({enabled: false,- binaryPath: "agent",+ binaryPath: "cursor-agent",apiEndpoint: "",customModels: [],...overrides,diff --git a/apps/server/src/provider/Layers/ProviderRegistry.test.ts b/apps/server/src/provider/Layers/ProviderRegistry.test.tsindex 05b1db20a..5456a90bd 100644--- a/apps/server/src/provider/Layers/ProviderRegistry.test.ts+++ b/apps/server/src/provider/Layers/ProviderRegistry.test.ts@@ -1396,7 +1396,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), TeLayer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),Layer.provideMerge(mockCommandSpawnerLayer((command, args) => {- if (command === "agent") {+ if (command === "cursor-agent") {cursorSpawned = true;}const joined = args.join(" ");diff --git a/apps/server/src/provider/acp/CursorAcpCliProbe.test.ts b/apps/server/src/provider/acp/CursorAcpCliProbe.test.tsindex eebe5ddd9..6be4faf96 100644--- a/apps/server/src/provider/acp/CursorAcpCliProbe.test.ts+++ b/apps/server/src/provider/acp/CursorAcpCliProbe.test.ts@@ -1,5 +1,5 @@/**- * Optional integration check against a real `agent acp` install.+ * Optional integration check against a real `cursor-agent acp` install.* Enable with: T3_CURSOR_ACP_PROBE=1 bun run test --filter CursorAcpCliProbe*/import * as NodeServices from "@effect/platform-node/NodeServices";@@ -12,7 +12,7 @@ import type * as EffectAcpSchema from "effect-acp/schema";import * as AcpSessionRuntime from "./AcpSessionRuntime.ts";describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe", () => {- it.effect("initialize and authenticate against real agent acp", () =>+ it.effect("initialize and authenticate against real cursor-agent acp", () =>Effect.gen(function* () {const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;const started = yield* runtime.start();@@ -21,7 +21,7 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",Effect.provide(AcpSessionRuntime.layer({spawn: {- command: "agent",+ command: "cursor-agent",args: ["acp"],cwd: process.cwd(),},@@ -77,7 +77,7 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",AcpSessionRuntime.layer({authMethodId: "cursor_login",spawn: {- command: "agent",+ command: "cursor-agent",args: ["acp"],cwd: process.cwd(),},@@ -133,7 +133,7 @@ describe.runIf(process.env.T3_CURSOR_ACP_PROBE === "1")("Cursor ACP CLI probe",AcpSessionRuntime.layer({authMethodId: "cursor_login",spawn: {- command: "agent",+ command: "cursor-agent",args: ["acp"],cwd: process.cwd(),},diff --git a/apps/server/src/provider/acp/CursorAcpSupport.test.ts b/apps/server/src/provider/acp/CursorAcpSupport.test.tsindex 78bc16c9f..a095fdd67 100644--- a/apps/server/src/provider/acp/CursorAcpSupport.test.ts+++ b/apps/server/src/provider/acp/CursorAcpSupport.test.ts@@ -53,7 +53,7 @@ const parameterizedGpt54ConfigOptions: ReadonlyArray<EffectAcpSchema.SessionConfdescribe("buildCursorAcpSpawnInput", () => {it("builds the default Cursor ACP command", () => {expect(buildCursorAcpSpawnInput(undefined, "/tmp/project")).toEqual({- command: "agent",+ command: "cursor-agent",args: ["acp"],cwd: "/tmp/project",});diff --git a/apps/server/src/provider/acp/CursorAcpSupport.ts b/apps/server/src/provider/acp/CursorAcpSupport.tsindex 169d7c620..c5c16b102 100644--- a/apps/server/src/provider/acp/CursorAcpSupport.ts+++ b/apps/server/src/provider/acp/CursorAcpSupport.ts@@ -35,7 +35,7 @@ export function buildCursorAcpSpawnInput(environment?: NodeJS.ProcessEnv,): AcpSessionRuntime.AcpSpawnInput {return {- command: cursorSettings?.binaryPath || "agent",+ command: cursorSettings?.binaryPath || "cursor-agent",args: [...(cursorSettings?.apiEndpoint ? (["-e", cursorSettings.apiEndpoint] as const) : []),"acp",diff --git a/apps/server/src/provider/providerMaintenanceRunner.test.ts b/apps/server/src/provider/providerMaintenanceRunner.test.tsindex f33a9bbce..641c9b52e 100644--- a/apps/server/src/provider/providerMaintenanceRunner.test.ts+++ b/apps/server/src/provider/providerMaintenanceRunner.test.ts@@ -48,7 +48,7 @@ function lifecycleFor(provider: ProviderDriverKind): ProviderMaintenanceCapabilireturn makeProviderMaintenanceCapabilities({provider,packageName: null,- updateExecutable: "agent",+ updateExecutable: "cursor-agent",updateArgs: ["update"],updateLockKey: "cursor-agent",});@@ -226,7 +226,7 @@ describe("providerMaintenanceRunner", () => {const result = yield* updater.updateProvider(CURSOR_DRIVER);assert.deepStrictEqual(calls, [{- command: "agent",+ command: "cursor-agent",args: ["update"],},]);diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.tsindex 773b44818..b05f397bf 100644--- a/packages/contracts/src/settings.ts+++ b/packages/contracts/src/settings.ts@@ -252,11 +252,11 @@ export const CursorSettings = makeProviderSettingsSchema(Schema.withDecodingDefault(Effect.succeed(false)),Schema.annotateKey({ providerSettingsForm: { hidden: true } }),),- binaryPath: makeBinaryPathSetting("agent").pipe(+ binaryPath: makeBinaryPathSetting("cursor-agent").pipe(Schema.annotateKey({title: "Binary path",description: "Path to the Cursor agent binary.",- providerSettingsForm: { placeholder: "agent", clearWhenEmpty: "omit" },+ providerSettingsForm: { placeholder: "cursor-agent", clearWhenEmpty: "omit" },}),),apiEndpoint: TrimmedString.pipe(