@cursorpool-dev/cli 0.5.8 → 0.5.10

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,166 +63,208 @@ 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'],
+test('default compatibility manifest supports the Cursor 3.4 macOS arm64 version family', () => {
+  const entry = resolveCompatEntry(
+    {
+      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,
+    },
   );
+
+  assert.equal(entry.supportStatus, 'supported');
+  assert.equal(entry.requiresAdHocResign, true);
+  assert.equal(entry.targetRelativePath, CURSOR_AGENT_EXEC_RELATIVE_PATH);
+  assert.equal(entry.cursorVersion, '3.4');
+  assert.equal(entry.cursorCommit, '*');
+  assert.equal(entry.expectedSha256, '*');
   assert.equal(
-    DEFAULT_COMPAT_ENTRIES.every((entry) =>
-      entry.officialDownloadUrl?.startsWith(
-        `https://api2.cursor.sh/updates/download/golden/${entry.officialDownloadPlatform}/cursor/${entry.cursorVersion}`,
-      ),
+    DEFAULT_COMPAT_ENTRIES.some(
+      (candidate) =>
+        candidate.platform === 'darwin' &&
+        candidate.arch === 'arm64' &&
+        candidate.cursorVersion === '3.4' &&
+        candidate.cursorCommit === '*',
     ),
     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 accepts later Cursor 3.6 patch versions on macOS arm64', () => {
   const entry = resolveCompatEntry(
     {
-      appPath: '/Applications/Cursor.app',
-      version: '3.4.20',
-      commit: '0cf8b06883f54e26bb4f0fb8647c9500ccb43310',
+      appPath: '/Users/example/Desktop/Cursor-3.6.31.app',
+      version: '3.6.31',
+      commit: '81fcf2931d7687b4ff3f3017858d0c6dee7e2a60',
     },
     {
       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.cursorVersion, '3.4');
-  assert.equal(entry.structureFamily, 'mac-agent-D-workbench-U0');
-  assert.equal(entry.patchTargets?.map((target) => target.name).join(','), 'agent-exec,workbench');
+  assert.equal(entry.cursorVersion, '3.6');
+  assert.equal(entry.cursorCommit, '*');
+  assert.equal(entry.expectedSha256, '*');
 });
 
-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/,
+test('default compatibility manifest supports the Cursor 3.7 macOS arm64 version family', () => {
+  const entry = resolveCompatEntry(
+    {
+      appPath: '/Users/example/Desktop/Cursor-3.7.12.app',
+      version: '3.7.12',
+      commit: 'b887a26c4f70bd8136bfffeda812b24194ec9ce0',
+    },
+    {
+      platform: 'darwin',
+      arch: 'arm64',
+      nodeVersion: process.version,
+    },
   );
+
+  assert.equal(entry.supportStatus, 'supported');
+  assert.equal(entry.targetRelativePath, CURSOR_AGENT_EXEC_RELATIVE_PATH);
+  assert.equal(entry.cursorVersion, '3.7');
+  assert.equal(entry.cursorCommit, '*');
+  assert.equal(entry.expectedSha256, '*');
 });
 
-test('default compatibility manifest supports Cursor 3.6.31 on macOS arm64 with the v0.5 adapter', () => {
+test('default compatibility manifest supports Cursor 3.6.31 Linux x64 AppImage', () => {
   const entry = resolveCompatEntry(
     {
-      appPath: '/Applications/Cursor.app',
+      appPath: '/home/xubuntu/.cursor-pool/appimages/Cursor-89aa899ccc46fb58/squashfs-root',
       version: '3.6.31',
       commit: '81fcf2931d7687b4ff3f3017858d0c6dee7e2a60',
     },
     {
-      platform: 'darwin',
-      arch: 'arm64',
+      platform: 'linux',
+      arch: 'x64',
       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.requiresAdHocResign, false);
+  assert.equal(
+    entry.targetRelativePath,
+    'usr/share/cursor/resources/app/extensions/cursor-agent-exec/dist/main.js',
+  );
+  assert.equal(
+    entry.expectedSha256,
+    '05bfa29eacb8271c378765ead4bf881f806b97549dd13367183aa7a9331c1131',
+  );
 });
 
-test('default compatibility manifest supports Cursor 3.7.12 on macOS arm64 with the v0.6 adapter', () => {
+test('default compatibility manifest supports Cursor 3.7.12 Linux arm64 deb installs', () => {
   const entry = resolveCompatEntry(
     {
-      appPath: '/Applications/Cursor.app',
+      appPath: '/usr/share/cursor',
       version: '3.7.12',
       commit: 'b887a26c4f70bd8136bfffeda812b24194ec9ce0',
     },
     {
-      platform: 'darwin',
+      platform: 'linux',
       arch: 'arm64',
       nodeVersion: process.version,
     },
-    { adapterVersion: '0.6.0' },
   );
 
   assert.equal(entry.supportStatus, 'supported');
-  assert.equal(entry.adapterVersion, '0.6.0');
-  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.requiresAdHocResign, false);
+  assert.equal(
+    entry.targetRelativePath,
+    'resources/app/extensions/cursor-agent-exec/dist/main.js',
+  );
+  assert.equal(
+    entry.expectedSha256,
+    '9ce7a2f40a98a27eb1b609a79e0e1707bad5fbb02493693f6f18945a7640dde4',
+  );
 });
 
-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 verified Cursor 3.4 Linux arm64 deb installs', () => {
+  const entry = resolveCompatEntry(
+    {
+      appPath: '/usr/share/cursor',
+      version: '3.4.20',
+      commit: '0cf8b06883f54e26bb4f0fb8647c9500ccb43310',
+    },
+    {
+      platform: 'linux',
+      arch: 'arm64',
+      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,
+    'resources/app/extensions/cursor-agent-exec/dist/main.js',
   );
+  assert.equal(
+    entry.expectedSha256,
+    '4ccb7526e5ece8f6a98a99724a048977698cbf52cb2033ec06f2b5a0a085fe71',
+  );
+});
+
+test('default compatibility manifest supports verified Cursor 3.5 and 3.6 Linux arm64 deb installs', () => {
+  const cases = [
+    {
+      version: '3.5.38',
+      commit: '009bb5a3600dd98fe1c1f25798f767f686e14750',
+      expectedSha256: 'cb18f0237278884a39e2ce2b8664255e12689ad0803c20096c38e86c36acc51f',
+    },
+    {
+      version: '3.6.31',
+      commit: '81fcf2931d7687b4ff3f3017858d0c6dee7e2a60',
+      expectedSha256: '05bfa29eacb8271c378765ead4bf881f806b97549dd13367183aa7a9331c1131',
+    },
+  ];
+
+  for (const fixture of cases) {
+    const entry = resolveCompatEntry(
+      {
+        appPath: '/usr/share/cursor',
+        version: fixture.version,
+        commit: fixture.commit,
+      },
+      {
+        platform: 'linux',
+        arch: 'arm64',
+        nodeVersion: process.version,
+      },
+    );
+
+    assert.equal(entry.supportStatus, 'supported');
+    assert.equal(entry.requiresAdHocResign, false);
+    assert.equal(
+      entry.targetRelativePath,
+      'resources/app/extensions/cursor-agent-exec/dist/main.js',
+    );
+    assert.equal(entry.expectedSha256, fixture.expectedSha256);
+  }
 });
 
 test('default compatibility manifest supports Cursor 3.5.38 on macOS x64 for Rosetta-launched installers', () => {
@@ -263,12 +283,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 +335,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 +379,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/cursor.test.ts

@@ -22,6 +22,60 @@ test('defaultCursorAppPath gives a helpful Windows error when LOCALAPPDATA is un
   );
 });
 
+test('defaultCursorAppPath auto-detects Linux deb installs from the cursor launcher on PATH', () => {
+  assert.equal(
+    defaultCursorAppPath({
+      platform: 'linux',
+      execFileSync: (command, args) => {
+        if (command === 'which' && args[0] === 'cursor') {
+          return '/usr/bin/cursor\n';
+        }
+        if (command === 'readlink' && args.join(' ') === '-f /usr/bin/cursor') {
+          return '/usr/share/cursor/bin/cursor\n';
+        }
+        throw new Error(`unexpected command: ${command} ${args.join(' ')}`);
+      },
+    }),
+    '/usr/share/cursor',
+  );
+});
+
+test('findCursor auto-detects Linux deb installs from the cursor launcher on PATH', async () => {
+  const tempDir = await mkdtemp(join(tmpdir(), 'cursor-pool-linux-deb-'));
+  const appPath = join(tempDir, 'usr/share/cursor');
+  const launcherPath = join(appPath, 'bin/cursor');
+
+  try {
+    await mkdir(join(appPath, 'resources/app'), { recursive: true });
+    await mkdir(join(appPath, 'bin'), { recursive: true });
+    await writeFile(launcherPath, '#!/bin/sh\n', 'utf8');
+    await writeFile(
+      join(appPath, 'resources/app/product.json'),
+      JSON.stringify({ version: '3.7.12', commit: 'linux-arm64-commit' }),
+      'utf8',
+    );
+
+    const cursor = await findCursor({
+      platform: 'linux',
+      execFile: async (command, args) => {
+        if (command === 'which' && args[0] === 'cursor') {
+          return { stdout: '/usr/bin/cursor\n' };
+        }
+        if (command === 'readlink' && args.join(' ') === '-f /usr/bin/cursor') {
+          return { stdout: `${launcherPath}\n` };
+        }
+        throw new Error(`unexpected command: ${command} ${args.join(' ')}`);
+      },
+    });
+
+    assert.equal(cursor.appPath, appPath);
+    assert.equal(cursor.version, '3.7.12');
+    assert.equal(cursor.commit, 'linux-arm64-commit');
+  } finally {
+    await rm(tempDir, { recursive: true, force: true });
+  }
+});
+
 test('findCursor extracts Linux AppImage files before reading product metadata', async () => {
   const tempDir = await mkdtemp(join(tmpdir(), 'cursor-pool-linux-appimage-'));
   const appImagePath = join(tempDir, 'Cursor.AppImage');

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';
@@ -42,20 +32,32 @@ const cursorVersion = '3.5.38';
 const cursorCommit = '009bb5a3600dd98fe1c1f25798f767f686e14750';
 const targetRelativePath =
   'Contents/Resources/app/extensions/cursor-agent-exec/dist/main.js';
+const alwaysLocalRelativePath =
+  'Contents/Resources/app/extensions/cursor-always-local/dist/main.js';
+const workbenchRelativePath =
+  'Contents/Resources/app/out/vs/workbench/workbench.desktop.main.js';
 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"}';
+const composerAuthGateAnchor =
+  'get when(){return p()&&!fzC},get fallback(){return he(DGC,{})}';
+const composerSubmitAuthGateAnchor =
+  'if(!p()){e.cursorAuthenticationService.login(),e.commandService.executeCommand(wV,"general");return}';
+const agentLoopRunAnchor =
+  'await this.agentClientService.run(te,H,$e,Ne,Ce,T,ze,me,we,[],ct)';
+const buildFlagsLocalModeAnchor = 'localMode:!1';
+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"}';
+const agentClientRunLocalModeAnchor =
+  'if(L0.localMode){try{g.onNetworkPhaseStart?.()}catch(b){this.logService.warn("[AgentClientService] onNetworkPhaseStart callback failed in local mode",b)}return this.runLocalAgentInExtensionHost(e,t,i,r,s,a,d,h,g)}return this.client.run(e,t,i,r,s,o,a,u,d,h,g)';
+
+function workbenchFixture() {
   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}}`,
+    `function composer(){return he(Mt,{${composerAuthGateAnchor},get children(){return "controls"}})}`,
+    `async function submit(){${composerSubmitAuthGateAnchor};return "submitted";}`,
+    `const flags={${buildFlagsLocalModeAnchor}}`,
     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}}`,
+    `async function runAgentLoop(){${agentLoopRunAnchor}}`,
+    `async function agentClientRun(){const g={};${agentClientRunLocalModeAnchor}}`,
   ].join(';');
 }
 
@@ -63,12 +65,15 @@ async function createFixtureApp(prefix: string) {
   const tempDir = await mkdtemp(join(tmpdir(), prefix));
   const appPath = join(tempDir, 'Cursor.app');
   const targetPath = join(appPath, targetRelativePath);
+  const alwaysLocalPath = join(appPath, alwaysLocalRelativePath);
+  const workbenchPath = join(appPath, workbenchRelativePath);
   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/extensions/cursor-always-local/dist'), {
+    recursive: true,
+  });
   await mkdir(join(appPath, 'Contents/Resources/app/out/vs/workbench'), {
     recursive: true,
   });
@@ -78,37 +83,18 @@ async function createFixtureApp(prefix: string) {
     'utf8',
   );
   await writeFile(targetPath, targetContent, 'utf8');
-  await writeFile(workbenchPath, workbenchContent, 'utf8');
+  await writeFile(alwaysLocalPath, 'function alwaysLocal(){}\n', 'utf8');
+  await writeFile(workbenchPath, workbenchFixture(), '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 +113,6 @@ async function createFixtureApp(prefix: string) {
     targetPath,
     targetContent,
     originalHash,
-    workbenchPath,
-    workbenchContent,
-    workbenchOriginalHash,
     runtimeFile: join(tempDir, 'runtime.json'),
     backupDir: join(tempDir, 'backups'),
     compatEntry,