@cursorpool-dev/cli 0.5.8 → 0.5.9

package/src/installRecord.ts

@@ -13,7 +13,6 @@ export type InstallRecord = {
   appPath: string;
   cursorVersion: string;
   cursorCommit: string;
-  takeoverPlanId: string;
   targetRelativePath: string;
   originalSha256: string;
   compatSupportStatus: CompatibilityManifestEntry['supportStatus'];
@@ -92,7 +91,6 @@ export function isInstallRecordStale(record: InstallRecord | null, actual: Insta
     'appPath',
     'cursorVersion',
     'cursorCommit',
-    'takeoverPlanId',
     'targetRelativePath',
     'originalSha256',
     'compatSupportStatus',

package/src/patchSet.ts

@@ -144,10 +144,6 @@ export async function patchCursorSet(appPath: string, options: PatchCursorSetOpt
 
 export async function restoreCursorSet(appPath: string, options: RestoreCursorSetOptions = {}) {
   const restoreErrors: unknown[] = [];
-  const before = await readCursorPatchSetState(appPath, {
-    platform: options.platform,
-    workbenchTargetRelativePath: options.workbenchTargetRelativePath,
-  });
   const restore = async (operation: () => Promise<unknown>) => {
     try {
       await operation();
@@ -156,14 +152,12 @@ export async function restoreCursorSet(appPath: string, options: RestoreCursorSe
     }
   };
 
-  if (before.patches.some((patch) => patch.name === 'workbench' && patch.markerPresent)) {
-    await restore(() =>
-      (options.restoreCursorWorkbenchAuthGate ?? restoreCursorWorkbenchAuthGate)(appPath, {
-        backupDir: options.backupDir,
-        targetRelativePath: workbenchRelativePath(options),
-      }),
-    );
-  }
+  await restore(() =>
+    (options.restoreCursorWorkbenchAuthGate ?? restoreCursorWorkbenchAuthGate)(appPath, {
+      backupDir: options.backupDir,
+      targetRelativePath: workbenchRelativePath(options),
+    }),
+  );
   const alwaysLocalPath = resolveCursorAlwaysLocalPath(appPath, alwaysLocalRelativePath(options));
   const shouldRestoreAlwaysLocal =
     Boolean(options.restoreCursorAlwaysLocal) ||

package/src/platform.ts

@@ -82,9 +82,9 @@ function buildDeviceInfo() {
     name: hostname(),
     os: osPlatform(),
     arch: arch(),
-    cliVersion: '0.5.8',
-    serviceVersion: '0.5.8',
-    extensionVersion: '0.5.8',
+    cliVersion: '0.5.9',
+    serviceVersion: '0.5.9',
+    extensionVersion: '0.5.9',
   };
 }
 

package/src/repair.ts

@@ -69,7 +69,7 @@ export type RepairOptions = FindCursorOptions &
     adHocResignApp?: typeof adHocResignApp;
   };
 
-const PACKAGE_VERSION = '0.5.8';
+const PACKAGE_VERSION = '0.5.9';
 
 function normalizeAppPath(path: string) {
   return normalize(path).replace(/\/+$/, '');
@@ -96,10 +96,6 @@ function assertRealRepairInstallRecord(
   return record;
 }
 
-function workbenchTargetRelativePathFromCompat(compat: CompatibilityManifestEntry) {
-  return compat.patchTargets?.find((target) => target.name === 'workbench')?.targetRelativePath;
-}
-
 function resolveRepairCompatEntry({
   cursorVersion,
   cursorCommit,
@@ -227,7 +223,6 @@ export async function repair(options: RepairOptions = {}) {
   if (compat.supportStatus === 'blocked' || compat.supportStatus === 'unknown') {
     throw new Error(`compat: ${compat.supportStatus}`);
   }
-  const workbenchTargetRelativePath = workbenchTargetRelativePathFromCompat(compat);
   const targetPath = join(cursor.appPath, compat.targetRelativePath);
   const runtimeFile = options.runtimeFile ?? installRecord.runtimeFile ?? DEFAULT_RUNTIME_FILE;
   const backupDir = options.backupDir ?? installRecord.backupDir;
@@ -261,6 +256,7 @@ export async function repair(options: RepairOptions = {}) {
       installRecord.originalSha256 && patchState.currentHash === installRecord.originalSha256;
     if (
       !patchState.legacyMarkerPresent &&
+      compat.expectedSha256 !== '*' &&
       patchState.currentHash !== compat.expectedSha256 &&
       !matchesInstallOriginal
     ) {
@@ -328,8 +324,6 @@ export async function repair(options: RepairOptions = {}) {
 
   const patchSetState = await readCursorPatchSetState(cursor.appPath, {
     agentExecTargetRelativePath: compat.targetRelativePath,
-    platform: environment.platform,
-    workbenchTargetRelativePath,
   });
 
   if (patchSetState.allApplied) {
@@ -338,9 +332,7 @@ export async function repair(options: RepairOptions = {}) {
   } else {
     const repairedPatchSet = await patchCursorSet(cursor.appPath, {
       backupDir,
-      platform: environment.platform,
       agentExecTargetRelativePath: compat.targetRelativePath,
-      workbenchTargetRelativePath,
       patchCursorAgentExec: options.patchCursorAgentExec,
       patchCursorWorkbenchAuthGate: options.patchCursorWorkbenchAuthGate,
     });

package/src/restore.ts

@@ -1,5 +1,5 @@
 import { normalize } from 'node:path';
-import { resolveCursorAgentExecPath } from '@cursor-pool/patcher';
+import { restoreCursorAgentExec, resolveCursorAgentExecPath } from '@cursor-pool/patcher';
 import { DEFAULT_RUNTIME_FILE } from '@cursor-pool/shared/runtime';
 import {
   confirmRealOperation,
@@ -14,11 +14,6 @@ import {
   type InstallRecordOptions,
 } from './installRecord';
 import { stopRuntimeService } from './serviceProcess';
-import {
-  formatCursorPatchSetState,
-  readCursorPatchSetState,
-  restoreCursorSet,
-} from './patchSet';
 import { resolveCursorTarget, type CursorTargetOptions } from './target';
 import { assertDisposableCursorAppPath, readTrialRecord, type TrialRecordOptions } from './trial';
 
@@ -137,12 +132,9 @@ export async function restore(options: RestoreOptions = {}) {
     });
   }
 
-  await restoreCursorSet(cursor.appPath, {
+  const result = await restoreCursorAgentExec(cursor.appPath, {
     backupDir,
-    agentExecTargetRelativePath: targetRelativePath,
-  });
-  const patchSetState = await readCursorPatchSetState(cursor.appPath, {
-    agentExecTargetRelativePath: targetRelativePath,
+    targetRelativePath,
   });
   if (target.mode === 'real') {
     await stopRuntimeServiceIfRecorded(runtimeFile);
@@ -153,7 +145,7 @@ export async function restore(options: RestoreOptions = {}) {
     `mode: ${target.mode}`,
     `app: ${cursor.appPath}`,
     'restore: ok',
-    `patch: ${formatCursorPatchSetState(patchSetState)}`,
+    `patch: ${result.markerPresent ? 'applied' : 'missing'}`,
     target.mode === 'real'
       ? `install-record: ${realInstallRecord ? 'recorded' : 'missing'}`
       : `trial: ${trialRecord ? 'recorded' : 'missing'}`,

package/src/status.ts

@@ -49,10 +49,6 @@ type LatestTakeoverResponse = {
   };
 };
 
-function workbenchTargetRelativePathFromCompat(compat: CompatibilityManifestEntry) {
-  return compat.patchTargets?.find((target) => target.name === 'workbench')?.targetRelativePath;
-}
-
 const MAX_CANARY_FIELD_LENGTH = 256;
 
 function isSafeCanaryString(value: unknown): value is string {
@@ -162,7 +158,6 @@ export async function status(options: StatusOptions = {}) {
     fetchManifest: options.fetchCompatManifest,
   });
   const compat = resolveCompatEntry(cursor, environment, { entries: compatEntries });
-  const workbenchTargetRelativePath = workbenchTargetRelativePathFromCompat(compat);
   const installRecord =
     target.mode === 'real'
       ? await readInstallRecord({ installRecordFile: options.installRecordFile })
@@ -194,7 +189,6 @@ export async function status(options: StatusOptions = {}) {
   const patchSetState = await readCursorPatchSetState(cursor.appPath, {
     agentExecTargetRelativePath: compat.targetRelativePath,
     platform: environment.platform,
-    workbenchTargetRelativePath,
   });
   const serviceRunning = await isRuntimeHealthy(runtime);
   const takeoverStatus = await getTakeoverStatus(runtime, serviceRunning);

package/src/trial.ts

@@ -2,7 +2,7 @@ import { createHash } from 'node:crypto';
 import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
 import { realpathSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { dirname, join, normalize } from 'node:path';
+import { dirname, join, normalize, resolve } from 'node:path';
 import { DEFAULT_MACOS_CURSOR_APP_PATH } from './cursor';
 
 export type ExtensionState = 'bundled' | 'linked' | 'manual-step-required' | 'missing';
@@ -12,7 +12,6 @@ export type TrialRecord = {
   appPath: string;
   cursorVersion: string;
   cursorCommit: string;
-  takeoverPlanId: string;
   targetRelativePath: string;
   originalSha256: string;
   compatSupportStatus: 'supported' | 'canary' | 'warning' | 'blocked' | 'unknown';
@@ -40,7 +39,7 @@ function resolveHomePath(path: string) {
 }
 
 function normalizeAppPath(path: string) {
-  return normalize(path).replace(/\/+$/, '');
+  return resolve(normalize(path).replace(/\/+$/, ''));
 }
 
 function isRealCursorAppPath(path: string) {

package/test/compat.test.ts

@@ -15,34 +15,12 @@ import {
 } from '../src/compat';
 
 function remoteRuleFor(cursorVersion: string, cursorCommit: string): CompatibilityManifestEntry {
-  const cursorMajor = cursorVersion.replace(/^(\d+\.\d+).*/, '$1');
-  const planByMajor: Record<string, string> = {
-    '3.5': 'cursor-3.5-mac-agent-f-workbench-p-l0',
-    '3.6': 'cursor-3.6-mac-agent-c-workbench-h-uv',
-    '3.7': 'cursor-3.7-mac-agent-et-workbench-wv',
-  };
   return {
     platform: 'darwin',
     arch: 'arm64',
-    officialSourceUrl: 'https://cursor.com/download',
-    officialDownloadUrl: `https://api2.cursor.sh/updates/download/golden/darwin-arm64/cursor/${cursorVersion.replace(/^(\d+\.\d+).*/, '$1')}`,
-    officialDownloadPlatform: 'darwin-arm64',
-    verifiedCursorVersion: cursorVersion,
-    cursorVersion: cursorMajor,
+    cursorVersion,
     cursorCommit,
     supportStatus: 'supported',
-    adapterVersion: '0.5.8',
-    takeoverPlanId: planByMajor[cursorMajor] ?? `cursor-${cursorMajor}-remote-plan`,
-    structureFamily: 'mac-agent-c-workbench-h-uv',
-    patchTargets: [
-      {
-        name: 'agent-exec',
-        targetRelativePath: CURSOR_AGENT_EXEC_RELATIVE_PATH,
-        expectedSha256: 'remote-sha256',
-        patchStrategy: 'cursor-agent-exec-snippet',
-        verifyMarker: 'cursor-pool',
-      },
-    ],
     targetRelativePath: CURSOR_AGENT_EXEC_RELATIVE_PATH,
     expectedSha256: 'remote-sha256',
     structureSignature: 'remote-structure',
@@ -68,7 +46,7 @@ function signedEnvelope(version: number, rules: CompatibilityManifestEntry[]) {
   };
 }
 
-test('default compatibility manifest supports Cursor 3.6.21 on macOS arm64', () => {
+test('default compatibility manifest supports the Cursor 3.6 macOS arm64 version family', () => {
   const entry = resolveCompatEntry(
     {
       appPath: '/Users/example/Desktop/Cursor-Pool-Agent-Canary.app',
@@ -85,89 +63,57 @@ test('default compatibility manifest supports Cursor 3.6.21 on macOS arm64', ()
   assert.equal(entry.supportStatus, 'supported');
   assert.equal(entry.requiresAdHocResign, true);
   assert.equal(entry.targetRelativePath, CURSOR_AGENT_EXEC_RELATIVE_PATH);
-  assert.equal(
-    entry.expectedSha256,
-    '222512631b78fddcdca3fa76c0dd458a7a86751dde19c998ceb31b3fe1905ebf',
-  );
+  assert.equal(entry.cursorVersion, '3.6');
+  assert.equal(entry.cursorCommit, '*');
+  assert.equal(entry.expectedSha256, '*');
   assert.equal(
     DEFAULT_COMPAT_ENTRIES.some(
       (candidate) =>
+        candidate.platform === 'darwin' &&
+        candidate.arch === 'arm64' &&
         candidate.cursorVersion === '3.6' &&
-        candidate.cursorCommit === 'e7a7e93f4d75f8272503ecf33cedbaae10114a10',
+        candidate.cursorCommit === '*',
     ),
     true,
   );
 });
 
-test('default compatibility entries are keyed by official Cursor major download versions only', () => {
-  assert.deepEqual(
-    Array.from(new Set(DEFAULT_COMPAT_ENTRIES.map((entry) => entry.cursorVersion))).sort(),
-    ['3.4', '3.5', '3.6', '3.7'],
-  );
-  assert.equal(
-    DEFAULT_COMPAT_ENTRIES.every((entry) =>
-      entry.officialDownloadUrl?.startsWith(
-        `https://api2.cursor.sh/updates/download/golden/${entry.officialDownloadPlatform}/cursor/${entry.cursorVersion}`,
-      ),
-    ),
-    true,
-  );
-  assert.equal(
-    DEFAULT_COMPAT_ENTRIES.some((entry) => entry.officialSourceUrl !== 'https://cursor.com/download'),
-    false,
-  );
-  assert.equal(
-    DEFAULT_COMPAT_ENTRIES.some((entry) => entry.platform === 'linux' || entry.platform === 'win32'),
-    false,
-  );
-});
-
-test('default compatibility manifest supports Cursor 3.4.20 on macOS arm64 with the v0.4 adapter', () => {
+test('default compatibility manifest supports the Cursor 3.4 macOS arm64 version family', () => {
   const entry = resolveCompatEntry(
     {
-      appPath: '/Applications/Cursor.app',
-      version: '3.4.20',
-      commit: '0cf8b06883f54e26bb4f0fb8647c9500ccb43310',
+      appPath: '/Users/example/Desktop/Cursor-3.4.0.app',
+      version: '3.4.0',
+      commit: 'cursor-3-4-family-commit',
     },
     {
       platform: 'darwin',
       arch: 'arm64',
       nodeVersion: process.version,
     },
-    { adapterVersion: '0.4.8' },
   );
 
   assert.equal(entry.supportStatus, 'supported');
-  assert.equal(entry.adapterVersion, '0.4.8');
+  assert.equal(entry.requiresAdHocResign, true);
+  assert.equal(entry.targetRelativePath, CURSOR_AGENT_EXEC_RELATIVE_PATH);
   assert.equal(entry.cursorVersion, '3.4');
-  assert.equal(entry.structureFamily, 'mac-agent-D-workbench-U0');
-  assert.equal(entry.patchTargets?.map((target) => target.name).join(','), 'agent-exec,workbench');
-});
-
-test('default compatibility manifest does not match Cursor 3.4.20 from the v0.5 adapter', () => {
-  assert.throws(
-    () =>
-      resolveCompatEntry(
-        {
-          appPath: '/Applications/Cursor.app',
-          version: '3.4.20',
-          commit: '0cf8b06883f54e26bb4f0fb8647c9500ccb43310',
-        },
-        {
-          platform: 'darwin',
-          arch: 'arm64',
-          nodeVersion: process.version,
-        },
-        { adapterVersion: '0.5.8' },
-      ),
-    /No compatibility entry for Cursor 3\.4\.20/,
+  assert.equal(entry.cursorCommit, '*');
+  assert.equal(entry.expectedSha256, '*');
+  assert.equal(
+    DEFAULT_COMPAT_ENTRIES.some(
+      (candidate) =>
+        candidate.platform === 'darwin' &&
+        candidate.arch === 'arm64' &&
+        candidate.cursorVersion === '3.4' &&
+        candidate.cursorCommit === '*',
+    ),
+    true,
   );
 });
 
-test('default compatibility manifest supports Cursor 3.6.31 on macOS arm64 with the v0.5 adapter', () => {
+test('default compatibility manifest accepts later Cursor 3.6 patch versions on macOS arm64', () => {
   const entry = resolveCompatEntry(
     {
-      appPath: '/Applications/Cursor.app',
+      appPath: '/Users/example/Desktop/Cursor-3.6.31.app',
       version: '3.6.31',
       commit: '81fcf2931d7687b4ff3f3017858d0c6dee7e2a60',
     },
@@ -176,20 +122,18 @@ test('default compatibility manifest supports Cursor 3.6.31 on macOS arm64 with
       arch: 'arm64',
       nodeVersion: process.version,
     },
-    { adapterVersion: '0.5.8' },
   );
 
   assert.equal(entry.supportStatus, 'supported');
-  assert.equal(entry.adapterVersion, '0.5.8');
   assert.equal(entry.cursorVersion, '3.6');
-  assert.equal(entry.structureFamily, 'mac-agent-c-workbench-h-uv');
-  assert.equal(entry.patchTargets?.map((target) => target.name).join(','), 'agent-exec,workbench');
+  assert.equal(entry.cursorCommit, '*');
+  assert.equal(entry.expectedSha256, '*');
 });
 
-test('default compatibility manifest supports Cursor 3.7.12 on macOS arm64 with the v0.6 adapter', () => {
+test('default compatibility manifest supports the Cursor 3.7 macOS arm64 version family', () => {
   const entry = resolveCompatEntry(
     {
-      appPath: '/Applications/Cursor.app',
+      appPath: '/Users/example/Desktop/Cursor-3.7.12.app',
       version: '3.7.12',
       commit: 'b887a26c4f70bd8136bfffeda812b24194ec9ce0',
     },
@@ -198,52 +142,38 @@ test('default compatibility manifest supports Cursor 3.7.12 on macOS arm64 with
       arch: 'arm64',
       nodeVersion: process.version,
     },
-    { adapterVersion: '0.6.0' },
   );
 
   assert.equal(entry.supportStatus, 'supported');
-  assert.equal(entry.adapterVersion, '0.6.0');
+  assert.equal(entry.targetRelativePath, CURSOR_AGENT_EXEC_RELATIVE_PATH);
   assert.equal(entry.cursorVersion, '3.7');
-  assert.equal(entry.structureFamily, 'mac-3.7-agent-Et-workbench-wv');
-  assert.equal(entry.patchTargets?.map((target) => target.name).join(','), 'agent-exec,workbench');
+  assert.equal(entry.cursorCommit, '*');
+  assert.equal(entry.expectedSha256, '*');
 });
 
-test('default compatibility manifest does not match Cursor 3.7.12 from the v0.5 adapter', () => {
-  assert.throws(
-    () =>
-      resolveCompatEntry(
-        {
-          appPath: '/Applications/Cursor.app',
-          version: '3.7.12',
-          commit: 'b887a26c4f70bd8136bfffeda812b24194ec9ce0',
-        },
-        {
-          platform: 'darwin',
-          arch: 'arm64',
-          nodeVersion: process.version,
-        },
-        { adapterVersion: '0.5.8' },
-      ),
-    /No compatibility entry for Cursor 3\.7\.12/,
+test('default compatibility manifest supports Cursor 3.6.31 Linux x64 AppImage', () => {
+  const entry = resolveCompatEntry(
+    {
+      appPath: '/home/xubuntu/.cursor-pool/appimages/Cursor-89aa899ccc46fb58/squashfs-root',
+      version: '3.6.31',
+      commit: '81fcf2931d7687b4ff3f3017858d0c6dee7e2a60',
+    },
+    {
+      platform: 'linux',
+      arch: 'x64',
+      nodeVersion: process.version,
+    },
   );
-});
 
-test('default compatibility manifest does not claim unverified Linux Cursor packages as supported', () => {
-  assert.throws(
-    () =>
-      resolveCompatEntry(
-        {
-          appPath: '/home/xubuntu/.cursor-pool/appimages/Cursor-89aa899ccc46fb58/squashfs-root',
-          version: '3.6.31',
-          commit: '81fcf2931d7687b4ff3f3017858d0c6dee7e2a60',
-        },
-        {
-          platform: 'linux',
-          arch: 'x64',
-          nodeVersion: process.version,
-        },
-      ),
-    /No compatibility entry for Cursor 3\.6\.31/,
+  assert.equal(entry.supportStatus, 'supported');
+  assert.equal(entry.requiresAdHocResign, false);
+  assert.equal(
+    entry.targetRelativePath,
+    'usr/share/cursor/resources/app/extensions/cursor-agent-exec/dist/main.js',
+  );
+  assert.equal(
+    entry.expectedSha256,
+    '05bfa29eacb8271c378765ead4bf881f806b97549dd13367183aa7a9331c1131',
   );
 });
 
@@ -263,12 +193,10 @@ test('default compatibility manifest supports Cursor 3.5.38 on macOS x64 for Ros
 
   assert.equal(entry.supportStatus, 'supported');
   assert.equal(entry.requiresAdHocResign, true);
-  assert.equal(entry.cursorVersion, '3.5');
   assert.equal(entry.targetRelativePath, CURSOR_AGENT_EXEC_RELATIVE_PATH);
-  assert.equal(
-    entry.expectedSha256,
-    'cb18f0237278884a39e2ce2b8664255e12689ad0803c20096c38e86c36acc51f',
-  );
+  assert.equal(entry.cursorVersion, '3.5');
+  assert.equal(entry.cursorCommit, '*');
+  assert.equal(entry.expectedSha256, '*');
 });
 
 test('verifies a remote compatibility manifest envelope with the development signature', () => {
@@ -317,8 +245,7 @@ test('loads remote compatibility entries from api base url when signature is val
     },
   });
 
-  assert.equal(entries[0]?.cursorVersion, '3.7');
-  assert.equal(entries[0]?.verifiedCursorVersion, '3.7.0');
+  assert.equal(entries[0]?.cursorVersion, '3.7.0');
 });
 
 test('loads compatibility entries from a local file URL for disposable client validation', async () => {
@@ -362,66 +289,3 @@ test('falls back to injected compatibility entries before fetching remote manife
 
   assert.equal(entries, injected);
 });
-
-test('resolveCompatEntry only matches the current adapter version when provided', () => {
-  const cursor = {
-    appPath: '/Applications/Cursor.app',
-    version: '3.7.12',
-    commit: 'b887a26c4f70bd8136bfffeda812b24194ec9ce0',
-  };
-  const environment = {
-    platform: 'darwin' as const,
-    arch: 'arm64',
-    nodeVersion: process.version,
-  };
-  const matchingRule = remoteRuleFor(cursor.version, cursor.commit);
-  const otherAdapterRule = {
-    ...matchingRule,
-    adapterVersion: '0.6.0',
-    userMessage: 'Cursor 3.7.12 needs the 0.6 adapter.',
-  };
-
-  assert.throws(
-    () =>
-      resolveCompatEntry(cursor, environment, {
-        entries: [otherAdapterRule],
-        adapterVersion: '0.5.8',
-      }),
-    /No compatibility entry for Cursor 3\.7\.12/,
-  );
-
-  const resolved = resolveCompatEntry(cursor, environment, {
-    entries: [otherAdapterRule],
-    adapterVersion: '0.6.0',
-  });
-  assert.equal(resolved.adapterVersion, '0.6.0');
-});
-
-test('resolveCompatEntry rejects legacy rules without adapterVersion when current adapter is known', () => {
-  const cursor = {
-    appPath: '/Applications/Cursor.app',
-    version: '3.6.21',
-    commit: 'e7a7e93f4d75f8272503ecf33cedbaae10114a10',
-  };
-  const environment = {
-    platform: 'darwin' as const,
-    arch: 'arm64',
-    nodeVersion: process.version,
-  };
-  const { adapterVersion: _adapterVersion, ...legacyRule } = remoteRuleFor(cursor.version, cursor.commit);
-
-  assert.throws(
-    () =>
-      resolveCompatEntry(cursor, environment, {
-        entries: [legacyRule],
-        adapterVersion: '0.5.8',
-      }),
-    /No compatibility entry for Cursor 3\.6\.21/,
-  );
-
-  const resolved = resolveCompatEntry(cursor, environment, {
-    entries: [legacyRule],
-  });
-  assert.equal(resolved.cursorVersion, '3.6');
-  assert.equal(resolved.verifiedCursorVersion, '3.6.21');
-});

package/test/e2e-install.test.ts

@@ -13,16 +13,6 @@ import {
   CURSOR_POOL_PATCH_MARKER,
 } from '../../patcher/src/marker';
 import { backupPathForCursorAgentExec } from '../../patcher/src/patchCursorAgentExec';
-import { CURSOR_WORKBENCH_RELATIVE_PATH } from '../../patcher/src/patchCursorWorkbenchAuthGate';
-import {
-  CURSOR_WORKBENCH_AGENT_CLIENT_RUN_LOCAL_MODE_ANCHOR,
-  CURSOR_WORKBENCH_AGENT_EDITOR_SEND_BUTTON_AUTH_GATE_ANCHOR,
-  CURSOR_WORKBENCH_AGENT_EDITOR_SEND_BUTTON_LOGIN_ANCHOR,
-  CURSOR_WORKBENCH_AGENT_LOOP_RUN_ANCHOR,
-  CURSOR_WORKBENCH_BUILD_FLAGS_LOCAL_MODE_ANCHOR,
-  CURSOR_WORKBENCH_COMPOSER_AUTH_GATE_ANCHOR,
-  CURSOR_WORKBENCH_COMPOSER_SUBMIT_AUTH_GATE_ANCHOR,
-} from '../../patcher/src/workbenchAuthGateMarker';
 import type { CompatibilityManifestEntry } from '../../shared/src/manifest';
 import { getExtensionState } from '../src/extensionBundle';
 import { getLinkedExtensionState, linkedExtensionPathForDir } from '../src/extensionLink';
@@ -45,70 +35,30 @@ const targetRelativePath =
 const repoRoot = resolve(dirname(fileURLToPath(import.meta.url)), '../../..');
 const serviceServerPath = resolve(repoRoot, 'packages/service/src/server.ts');
 
-function workbenchFixtureContent() {
-  const localProviderConfigAnchor =
-    'async getLocalAgentProviderConfig(e){const t="[AgentClientService][getLocalAgentProviderConfig]",i=L0.localMode?await this.shellEnvironmentService.getShellEnv():{},r=e?.credentials,s=r?.case==="apiKeyCredentials"?r.value:void 0,o=this.reactiveStorageService.applicationUserPersistentStorage,a=o.useOpenAIKey===!0?this.cursorAuthenticationService.openAIKey()??void 0:void 0,u=xgS({apiKeyCandidates:[{value:s?.apiKey,source:"modelDetails.apiKeyCredentials.apiKey"},{value:a,source:"storage.openAIKey"}],baseUrlCandidates:[{value:s?.baseUrl,source:"modelDetails.apiKeyCredentials.baseUrl"},{value:o.openAIBaseUrl,source:"storage.openAIBaseUrl"}]});return{baseUrl:u.baseUrl,apiKey:u.apiKey}}createDefaultLocalModel(e){return "default"}';
-  return [
-    `function composer(){return he(Mt,{${CURSOR_WORKBENCH_COMPOSER_AUTH_GATE_ANCHOR},get children(){return "controls"}})}`,
-    `async function submit(){${CURSOR_WORKBENCH_COMPOSER_SUBMIT_AUTH_GATE_ANCHOR};return "submitted";}`,
-    `function agentEditorControls(){const T=()=>{${CURSOR_WORKBENCH_AGENT_EDITOR_SEND_BUTTON_LOGIN_ANCHOR};return n.handleSubmit()};return he(Mt,{${CURSOR_WORKBENCH_AGENT_EDITOR_SEND_BUTTON_AUTH_GATE_ANCHOR}"controls"}})}`,
-    `const flags={${CURSOR_WORKBENCH_BUILD_FLAGS_LOCAL_MODE_ANCHOR}}`,
-    localProviderConfigAnchor,
-    `async function runAgentLoop(){${CURSOR_WORKBENCH_AGENT_LOOP_RUN_ANCHOR}}`,
-    `async function agentClientRun(){const g={...p,isRunningInTest:p.isRunningInTest??this.environmentService.enableSmokeTestDriver===!0,clientSupportsInlineImages:!0};${CURSOR_WORKBENCH_AGENT_CLIENT_RUN_LOCAL_MODE_ANCHOR}}`,
-  ].join(';');
-}
-
 async function createFixtureApp(prefix: string) {
   const tempDir = await mkdtemp(join(tmpdir(), prefix));
   const appPath = join(tempDir, 'Cursor.app');
   const targetPath = join(appPath, targetRelativePath);
   const targetContent = `function main() { return "agent"; }\n${CURSOR_POOL_AGENT_EXEC_PROVIDER_REGISTER_ANCHOR}\nmain();\n`;
-  const workbenchPath = join(appPath, CURSOR_WORKBENCH_RELATIVE_PATH);
-  const workbenchContent = workbenchFixtureContent();
   await mkdir(join(appPath, 'Contents/Resources/app/extensions/cursor-agent-exec/dist'), {
     recursive: true,
   });
-  await mkdir(join(appPath, 'Contents/Resources/app/out/vs/workbench'), {
-    recursive: true,
-  });
   await writeFile(
     join(appPath, 'Contents/Resources/app/product.json'),
     JSON.stringify({ version: cursorVersion, commit: cursorCommit }),
     'utf8',
   );
   await writeFile(targetPath, targetContent, 'utf8');
-  await writeFile(workbenchPath, workbenchContent, 'utf8');
 
   const originalHash = createHash('sha256').update(targetContent).digest('hex');
-  const workbenchOriginalHash = createHash('sha256').update(workbenchContent).digest('hex');
   const compatEntry: CompatibilityManifestEntry = {
     platform: process.platform,
     arch: process.arch,
     cursorVersion,
     cursorCommit,
     supportStatus: 'supported',
-    takeoverPlanId: 'cursor-3.6-mac-agent-c-workbench-h-uv',
     targetRelativePath,
     expectedSha256: originalHash,
-    adapterVersion: '0.5.8',
-    structureFamily: 'fixture-agent-exec-workbench',
-    patchTargets: [
-      {
-        name: 'agent-exec',
-        targetRelativePath,
-        expectedSha256: originalHash,
-        patchStrategy: 'cursor-agent-exec-snippet',
-        verifyMarker: 'cursor-pool',
-      },
-      {
-        name: 'workbench',
-        targetRelativePath: CURSOR_WORKBENCH_RELATIVE_PATH,
-        expectedSha256: workbenchOriginalHash,
-        patchStrategy: 'cursor-workbench-auth-gate',
-        verifyMarker: 'cursor-pool-workbench',
-      },
-    ],
     structureSignature: 'fixture',
     patchStrategy: 'cursor-agent-exec-snippet',
     verifyMarker: 'cursor-pool',
@@ -127,9 +77,6 @@ async function createFixtureApp(prefix: string) {
     targetPath,
     targetContent,
     originalHash,
-    workbenchPath,
-    workbenchContent,
-    workbenchOriginalHash,
     runtimeFile: join(tempDir, 'runtime.json'),
     backupDir: join(tempDir, 'backups'),
     compatEntry,