claude-dev-env 8.12.0 → 8.14.0

package/_shared/pr-loop/scripts/pr_converge_scripts_constants/convergence_gate_constants.py

@@ -45,7 +45,7 @@ FIXTURE_KEY_UNRESOLVED_BOT_THREADS_PASSED: str = "unresolved_bot_threads_passed"
 FIXTURE_KEY_UNRESOLVED_BOT_THREADS_DETAIL: str = "unresolved_bot_threads_detail"
 FIXTURE_KEY_PENDING_REVIEWS_PASSED: str = "pending_reviews_passed"
 FIXTURE_KEY_PENDING_REVIEWS_DETAIL: str = "pending_reviews_detail"
-FIXTURE_KEY_CODEX_PERCENT_LEFT: str = "codex_percent_left"
+FIXTURE_KEY_CODEX_TIER: str = "codex_tier"
 FIXTURE_KEY_CODEX_CLEAN_AT: str = "codex_clean_at"
 FIXTURE_DEFAULT_THREADS_DETAIL: str = "0 unresolved"
 FIXTURE_DEFAULT_PENDING_DETAIL: str = "none pending"
@@ -68,3 +68,12 @@ PR_CONVERGE_STATE_FILENAME: str = "pr-converge-state.json"
 CODEX_CLEAN_AT_STATE_KEY: str = "codex_clean_at"
 CODEX_DOWN_STATE_KEY: str = "codex_down"
 MINIMUM_ABBREVIATED_SHA_LENGTH: int = 7
+SHARED_PACKAGE_ROOT_PARENT_INDEX: int = 3
+ALL_CODEX_ACCOUNT_PICKER_RELATIVE_PARTS: tuple[str, ...] = (
+    "scripts",
+    "codex_account_choice.py",
+)
+CODEX_ACCOUNT_PICKER_CHOOSE_COMMAND: str = "choose"
+CODEX_ACCOUNT_PICK_TIMEOUT_SECONDS: float = 150.0
+CODEX_TIER_KEY: str = "tier"
+CODEX_TIER_NORMAL: str = "normal"

package/_shared/pr-loop/scripts/run_codex_review.py

@@ -44,14 +44,9 @@ from process_tree_kill import (  # noqa: E402
     terminate_process_tree,
 )
 
-from codex_review_scripts_constants.codex_usage_probe_constants import (  # noqa: E402
-    ALL_WINDOWS_SCRIPT_SUFFIXES,
-    WINDOWS_COMMAND_SHELL,
-    WINDOWS_COMMAND_SHELL_RUN_FLAG,
-    WINDOWS_OS_NAME,
-)
 from codex_review_scripts_constants.run_constants import (  # noqa: E402
     ALL_SHAPE_PROBE_REQUIRED_FLAGS,
+    ALL_WINDOWS_SCRIPT_SUFFIXES,
     BASE_TARGET_FLAG,
     CAPTURE_STREAMS_KEYWORD,
     CHECK_KEYWORD,
@@ -88,6 +83,9 @@ from codex_review_scripts_constants.run_constants import (  # noqa: E402
     UTF8_ENCODING,
     VERSION_FLAG,
     VERSION_PROBE_PATTERN,
+    WINDOWS_COMMAND_SHELL,
+    WINDOWS_COMMAND_SHELL_RUN_FLAG,
+    WINDOWS_OS_NAME,
 )
 
 from subprocess_window_access import hidden_window_creation_flags

package/_shared/pr-loop/scripts/test_check_convergence.py

@@ -107,14 +107,14 @@ def _raise_if_called(gate_label: str) -> Callable[..., tuple[bool, str]]:
     return _stub
 
 
-def _null_codex_percent_left() -> float | None:
+def _unread_codex_tier() -> str | None:
     return None
 
 
 def _patch_all_gates_passing(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(check_convergence, "_get_pr_head_sha", _passing_head_sha)
     monkeypatch.setattr(
-        check_convergence, "_probe_codex_percent_left", _null_codex_percent_left
+        check_convergence, "_read_codex_tier", _unread_codex_tier
     )
     for each_gate_name in _ALL_LEAF_GATE_NAMES:
         monkeypatch.setattr(check_convergence, each_gate_name, _passing_gate)
@@ -135,7 +135,7 @@ def should_pass_when_clean_bugteam_review_present_on_current_head(
         check_convergence, "_gh_api_paginated", _make_stub_gh_paginated(reviews_payload)
     )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
+        owner="octocat", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is True
     assert "clean bugteam audit" in detail
@@ -157,7 +157,7 @@ def should_fail_when_dirty_bugteam_review_present_on_current_head(
         check_convergence, "_gh_api_paginated", _make_stub_gh_paginated(reviews_payload)
     )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
+        owner="octocat", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is False
     assert "dirty bugteam audit" in detail
@@ -185,7 +185,7 @@ def should_fail_when_no_bugteam_review_present_on_current_head(
         check_convergence, "_gh_api_paginated", _make_stub_gh_paginated(reviews_payload)
     )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
+        owner="octocat", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is False
     assert "no bugteam review found" in detail
@@ -204,7 +204,7 @@ def should_fail_with_shape_detail_when_gh_returns_non_list_payload(
         check_convergence, "_gh_api_paginated", stub_gh_api_paginated_returning_object
     )
     passed, detail = check_convergence._check_bugteam_clean(
-        owner="JonEcho", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
+        owner="octocat", repo="tests", number=42, head_sha=CURRENT_HEAD_SHA
     )
     assert passed is False
     assert "unexpected gh api response shape" in detail

package/_shared/pr-loop/scripts/test_check_convergence_codex.py

@@ -1,8 +1,8 @@
 """Fixture-driven tests for the conditional Codex convergence gate.
 
-Covers: required-and-clean, required-and-dirty, skipped-by-threshold,
-skipped-by-token, skipped-by-down. Threshold comes from the probe constant
-via ``is_codex_review_required`` — this module never inlines the percent.
+Covers: required-and-clean, required-and-dirty, skipped-by-tier,
+skipped-by-token, skipped-by-down, and the read of the Codex account picker's
+``choose`` answer. The required tier comes from ``CODEX_TIER_NORMAL``.
 """
 
 from __future__ import annotations
@@ -16,10 +16,8 @@ from types import ModuleType
 import pytest
 
 import _pr_converge_path_setup  # noqa: F401
-from codex_review_scripts_constants.codex_usage_probe_constants import (
-    WEEKLY_USAGE_GATE_THRESHOLD_PERCENT,
-)
 from pr_converge_scripts_constants.convergence_gate_constants import (
+    CODEX_TIER_NORMAL,
     MINIMUM_ABBREVIATED_SHA_LENGTH,
 )
 
@@ -33,8 +31,7 @@ CLEAN_BODY = (
 )
 HEAD_SHA = "ae8005aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 OTHER_SHA = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
-PERCENT_ABOVE_THRESHOLD = float(WEEKLY_USAGE_GATE_THRESHOLD_PERCENT) + 1.0
-PERCENT_AT_THRESHOLD = float(WEEKLY_USAGE_GATE_THRESHOLD_PERCENT)
+ALL_TIERS_WITHOUT_ROOM_FOR_REVIEW = ("luna", "wait")
 
 
 def _load_module() -> ModuleType:
@@ -64,7 +61,7 @@ check_convergence = _load_module()
 def _write_fixture(
     tmp_path: Path,
     *,
-    codex_percent_left: float | None,
+    codex_tier: str | None,
     codex_clean_at: str | None,
     filename: str = "codex-gate.json",
 ) -> Path:
@@ -83,7 +80,7 @@ def _write_fixture(
         "unresolved_bot_threads_detail": "0 unresolved",
         "pending_reviews_passed": True,
         "pending_reviews_detail": "none pending",
-        "codex_percent_left": codex_percent_left,
+        "codex_tier": codex_tier,
         "codex_clean_at": codex_clean_at,
     }
     fixture_path.write_text(json.dumps(payload), encoding="utf-8")
@@ -95,7 +92,7 @@ def should_pass_when_codex_required_and_clean(
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=HEAD_SHA,
         filename="required-clean.json",
     )
@@ -120,20 +117,18 @@ def should_pass_when_codex_required_and_clean(
     assert "All pre-conditions met" in captured
 
 
-def should_pass_without_reading_usage_when_the_clean_stamp_is_on_head(
+def should_pass_without_running_the_picker_when_the_clean_stamp_is_on_head(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    def _probe_that_must_not_run() -> float | None:
+    def _picker_that_must_not_run() -> str | None:
         raise AssertionError(
-            "the weekly usage probe must not run when codex_clean_at is on HEAD"
+            "the Codex account picker must not run when codex_clean_at is on HEAD"
         )
 
-    monkeypatch.setattr(
-        check_convergence, "_probe_codex_percent_left", _probe_that_must_not_run
-    )
+    monkeypatch.setattr(check_convergence, "_read_codex_tier", _picker_that_must_not_run)
 
     is_passed, detail = check_convergence._evaluate_codex_clean(
-        read_percent_left=check_convergence._probe_codex_percent_left,
+        read_codex_tier=check_convergence._read_codex_tier,
         codex_clean_at=HEAD_SHA,
         head_sha=HEAD_SHA,
     )
@@ -151,7 +146,7 @@ def should_fail_when_codex_clean_stamp_is_shorter_than_an_abbreviated_sha(
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=HEAD_SHA[:1],
         filename="required-short-stamp.json",
     )
@@ -179,7 +174,7 @@ def should_pass_when_codex_clean_stamp_is_an_abbreviated_head_sha(
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=HEAD_SHA[:MINIMUM_ABBREVIATED_SHA_LENGTH],
         filename="required-abbreviated-stamp.json",
     )
@@ -207,7 +202,7 @@ def should_fail_when_codex_required_and_dirty(
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=OTHER_SHA,
         filename="required-dirty.json",
     )
@@ -232,14 +227,15 @@ def should_fail_when_codex_required_and_dirty(
     assert "do not mark ready" in captured
 
 
-def should_skip_when_usage_at_or_below_threshold(
-    tmp_path: Path, capsys: pytest.CaptureFixture[str]
+@pytest.mark.parametrize("tier_without_room", ALL_TIERS_WITHOUT_ROOM_FOR_REVIEW)
+def should_skip_when_the_picker_names_no_account_with_room_for_review(
+    tier_without_room: str, tmp_path: Path, capsys: pytest.CaptureFixture[str]
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_AT_THRESHOLD,
+        codex_tier=tier_without_room,
         codex_clean_at=None,
-        filename="skipped-threshold.json",
+        filename="skipped-tier.json",
     )
     exit_code = check_convergence.main(
         [
@@ -261,12 +257,12 @@ def should_skip_when_usage_at_or_below_threshold(
     assert "skipped (codex review not required)" in captured
 
 
-def should_skip_when_codex_percent_left_is_null(
+def should_skip_when_codex_tier_is_null(
     tmp_path: Path, capsys: pytest.CaptureFixture[str]
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=None,
+        codex_tier=None,
         codex_clean_at=None,
         filename="skipped-null.json",
     )
@@ -297,7 +293,7 @@ def should_bypass_when_codex_token_disables_reviewer(
     monkeypatch.setenv("CLAUDE_REVIEWS_DISABLED", "codex")
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=None,
         filename="skipped-token.json",
     )
@@ -326,7 +322,7 @@ def should_bypass_when_codex_down_flag_set(
 ) -> None:
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=None,
         filename="skipped-down.json",
     )
@@ -433,7 +429,7 @@ def should_bypass_when_job_state_codex_down_is_true(
     )
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=None,
         filename="job-state-codex-down.json",
     )
@@ -470,7 +466,7 @@ def should_fail_when_job_state_lacks_codex_down_and_clean_stamp(
     )
     fixture_path = _write_fixture(
         tmp_path,
-        codex_percent_left=PERCENT_ABOVE_THRESHOLD,
+        codex_tier=CODEX_TIER_NORMAL,
         codex_clean_at=None,
         filename="job-state-no-down.json",
     )
@@ -515,3 +511,49 @@ def should_accept_codex_clean_at_flag_in_parsed_arguments() -> None:
         ]
     )
     assert arguments.codex_clean_at == HEAD_SHA
+
+
+def _install_fake_picker(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, picker_source: str
+) -> None:
+    picker_path = tmp_path / "codex_account_choice.py"
+    picker_path.write_text(picker_source, encoding="utf-8")
+    monkeypatch.setattr(check_convergence, "_codex_account_picker_path", lambda: picker_path)
+
+
+def should_read_the_tier_the_picker_chooses(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    _install_fake_picker(
+        tmp_path,
+        monkeypatch,
+        "import json, sys\n"
+        "assert sys.argv[1:] == ['choose']\n"
+        "print(json.dumps({'tier': 'normal', 'account': 'codex-2'}))\n",
+    )
+
+    assert check_convergence._read_codex_tier() == CODEX_TIER_NORMAL
+
+
+@pytest.mark.parametrize(
+    "picker_source",
+    [
+        "import sys\nprint('{\"tier\": \"normal\"}')\nsys.exit(1)\n",
+        "print('not json')\n",
+        "print('[\"normal\"]')\n",
+        "print('{\"tier\": 1}')\n",
+    ],
+)
+def should_read_no_tier_when_the_picker_fails_or_answers_out_of_shape(
+    picker_source: str, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    _install_fake_picker(tmp_path, monkeypatch, picker_source)
+
+    assert check_convergence._read_codex_tier() is None
+
+
+def should_locate_the_packaged_codex_account_picker() -> None:
+    picker_path = check_convergence._codex_account_picker_path()
+
+    assert picker_path.name == "codex_account_choice.py"
+    assert picker_path.is_file()

package/_shared/pr-loop/scripts/test_check_convergence_contract.py

@@ -118,14 +118,14 @@ def _refuse_bugteam_clean(**_call_keywords: object) -> tuple[bool, str]:
     )
 
 
-def _null_codex_percent_left() -> float | None:
+def _unread_codex_tier() -> str | None:
     return None
 
 
 def _patch_gates_clean(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(check_convergence, "_get_pr_head_sha", _clean_head)
     monkeypatch.setattr(
-        check_convergence, "_probe_codex_percent_left", _null_codex_percent_left
+        check_convergence, "_read_codex_tier", _unread_codex_tier
     )
     for each_gate_name in _ALL_LEAF_GATE_NAMES:
         monkeypatch.setattr(check_convergence, each_gate_name, _clean_gate)

package/_shared/pr-loop/scripts/tests/test__claude_permissions_common.py

@@ -127,10 +127,10 @@ def test_path_contains_glob_metacharacters_accepts_windows_paths_with_parens() -
     `(`, `)`, and `,` are not glob metacharacters in Claude Code's permission
     rule matching. Including them in the metacharacter set causes
     get_current_project_path to raise ValueError for any user whose home
-    directory contains parentheses (e.g. `C:/Users/Jon (Admin)/...`).
+    directory contains parentheses (e.g. `C:/Users/Example (Admin)/...`).
     """
     assert common.path_contains_glob_metacharacters("C:/Program Files (x86)/app") is False
-    assert common.path_contains_glob_metacharacters("C:/Users/Jon (Admin)/project") is False
+    assert common.path_contains_glob_metacharacters("C:/Users/Example (Admin)/project") is False
     assert common.path_contains_glob_metacharacters("C:/Projects/a,b/file.py") is False
 
 

package/bin/git_hooks_installer.test.mjs

@@ -227,7 +227,7 @@ test('generated advisory shims keep temporary Git commit and push available afte
     const { temporaryRoot, gitHooksDirectory } = makeTemporaryGitHooksDirectory();
     const repositoryRoot = join(temporaryRoot, 'repository');
     const bareRepositoryRoot = join(temporaryRoot, 'remote.git');
-    const targetRemote = 'https://github.com/JonEcho/python-automation.git';
+    const targetRemote = 'https://github.com/example-owner/example-repo.git';
     try {
         writeFileSync(
             join(gitHooksDirectory, 'broken_advisory.py'),

package/bin/install-constants.mjs

@@ -159,15 +159,10 @@ export const CODEX_RULES_SHIPPED_FILE_NAME = 'claude-dev-env.rules';
 export const DEFAULT_CURSOR_DIRECTORY_NAME = '.cursor';
 
 /**
- * Directory name under the Cursor home that holds generated `.mdc` rule files.
+ * Directory name for rule files, under the Cursor home and under the agents home.
  */
 export const CURSOR_RULES_DIRECTORY_NAME = 'rules';
 
-/**
- * Installed script that writes Cursor `.mdc` files from Claude rules.
- */
-export const CURSOR_SYNC_SCRIPT_FILE_NAME = 'sync_to_cursor.py';
-
 /**
  * Windows Python launcher command the installer may bake into hook settings.
  */

package/bin/install.cursor-rules.test.mjs

@@ -15,7 +15,6 @@ import { fileURLToPath } from 'node:url';
 import { execFileSync } from 'node:child_process';
 import {
     resolveInstallRoot,
-    isAllowedInstallDestination,
 } from './resolve-install-root.mjs';
 import {
     DEFAULT_CURSOR_DIRECTORY_NAME,
@@ -43,78 +42,54 @@ function runInstaller(homeDirectory, extraArguments, environmentOverrides = {})
     });
 }
 
-test('resolveInstallRoot names ~/.cursor/rules and allows generated mdc files under it', () => {
-    const homeDirectory = join(tmpdir(), 'cdev-cursor-rules-home');
-    const resolution = resolveInstallRoot({
-        homeDirectory,
-        environment: {},
-        explicitTarget: null,
-    });
-    const expectedDirectory = join(
-        homeDirectory,
-        DEFAULT_CURSOR_DIRECTORY_NAME,
-        CURSOR_RULES_DIRECTORY_NAME,
-    );
-    assert.equal(resolution.cursorRulesInstallDirectory, expectedDirectory);
-    assert.equal(
-        isAllowedInstallDestination(join(expectedDirectory, 'asd-ste100-language.mdc'), resolution),
-        true,
-    );
-    assert.equal(
-        isAllowedInstallDestination(join(homeDirectory, '.ssh', 'id_rsa'), resolution),
-        false,
-    );
-});
-
-test('a full install writes stem-named Cursor rules and leaves a local extra mdc in place', () => {
+test('a reinstall moves the Cursor rules an older install generated and keeps a local mdc', () => {
     const homeDirectory = mkdtempSync(join(tmpdir(), 'cdev-cursor-install-'));
     try {
-        const extraRulePath = join(
-            homeDirectory,
-            DEFAULT_CURSOR_DIRECTORY_NAME,
-            CURSOR_RULES_DIRECTORY_NAME,
-            'user-local.mdc',
-        );
-        mkdirSync(dirname(extraRulePath), { recursive: true });
-        writeFileSync(extraRulePath, 'keep-me\n');
+        runInstaller(homeDirectory, []);
+        const cursorDirectory = join(homeDirectory, DEFAULT_CURSOR_DIRECTORY_NAME);
+        const rulesDirectory = join(cursorDirectory, CURSOR_RULES_DIRECTORY_NAME);
+        const generatedRulePath = join(rulesDirectory, 'asd-ste100-language.mdc');
+        const syncManifestPath = join(cursorDirectory, '.sync-manifest.json');
+        const localRulePath = join(rulesDirectory, 'user-local.mdc');
+        mkdirSync(rulesDirectory, { recursive: true });
+        writeFileSync(generatedRulePath, 'generated\n');
+        writeFileSync(syncManifestPath, '{}\n');
+        writeFileSync(localRulePath, 'keep-me\n');
+        const manifestPath = join(homeDirectory, '.claude', '.claude-dev-env-manifest.json');
+        const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'));
+        manifest.files.push(generatedRulePath, syncManifestPath);
+        writeFileSync(manifestPath, JSON.stringify(manifest, null, 2) + '\n');
 
         runInstaller(homeDirectory, []);
 
-        const generatedPath = join(
-            homeDirectory,
-            DEFAULT_CURSOR_DIRECTORY_NAME,
-            CURSOR_RULES_DIRECTORY_NAME,
-            'asd-ste100-language.mdc',
-        );
-        assert.equal(existsSync(generatedPath), true);
-        const generatedText = readFileSync(generatedPath, 'utf8');
-        assert.equal(generatedText.includes('alwaysApply: true'), true);
-        assert.equal(readFileSync(extraRulePath, 'utf8'), 'keep-me\n');
+        assert.equal(existsSync(generatedRulePath), false);
+        assert.equal(existsSync(syncManifestPath), false);
+        assert.equal(readFileSync(localRulePath, 'utf8'), 'keep-me\n');
+        const reinstalledManifest = JSON.parse(readFileSync(manifestPath, 'utf8'));
+        assert.equal(reinstalledManifest.files.includes(generatedRulePath), false);
     } finally {
         rmSync(homeDirectory, { recursive: true, force: true });
     }
 });
 
-test('--only journal is rejected before Cursor rules change; --only core writes them', () => {
+test('--only journal is rejected before the policy is seeded; --only core seeds it and writes no Cursor rules', () => {
     const homeDirectory = mkdtempSync(join(tmpdir(), 'cdev-cursor-groups-'));
     try {
-        const generatedPath = join(
+        const cursorRulesDirectory = join(
             homeDirectory,
             DEFAULT_CURSOR_DIRECTORY_NAME,
             CURSOR_RULES_DIRECTORY_NAME,
-            'asd-ste100-language.mdc',
         );
         const policyPath = join(homeDirectory, '.agents', 'rules', 'subagent-model-policy.json');
         assert.throws(
             () => runInstaller(homeDirectory, ['--only', 'journal']),
             error => error.status === 1 && /Unknown group\(s\): journal/.test(error.stderr),
         );
-        assert.equal(existsSync(generatedPath), false);
         assert.equal(existsSync(policyPath), false);
 
         runInstaller(homeDirectory, ['--only', 'core']);
-        assert.equal(existsSync(generatedPath), true);
         assert.equal(existsSync(policyPath), true);
+        assert.equal(existsSync(cursorRulesDirectory), false);
     } finally {
         rmSync(homeDirectory, { recursive: true, force: true });
     }
@@ -427,7 +402,7 @@ test('uninstalling one profile keeps routing for another installed profile', ()
     }
 });
 
-test('a blocked shared rule destination rolls back generated Cursor files', () => {
+test('a blocked shared rule destination fails the install and keeps the existing file', () => {
     const homeDirectory = mkdtempSync(join(tmpdir(), 'cdev-pstack-rollback-'));
     try {
         const sharedRulesPath = join(homeDirectory, '.agents', 'rules');
@@ -435,8 +410,6 @@ test('a blocked shared rule destination rolls back generated Cursor files', () =
         writeFileSync(sharedRulesPath, 'keep-existing-file');
         assert.throws(() => runInstaller(homeDirectory, ['--only', 'core']));
         assert.equal(readFileSync(sharedRulesPath, 'utf8'), 'keep-existing-file');
-        assert.equal(existsSync(join(homeDirectory, '.cursor', 'rules', 'pstack-models.mdc')), false);
-        assert.equal(existsSync(join(homeDirectory, '.cursor', '.sync-manifest.json')), false);
     } finally {
         rmSync(homeDirectory, { recursive: true, force: true });
     }

package/bin/install.mjs

@@ -33,7 +33,6 @@ import {
     CODEX_HOME_ENVIRONMENT_VARIABLE,
     DEFAULT_CODEX_DIRECTORY_NAME,
     CODEX_RULES_PACKAGE_DIRECTORY_NAME,
-    CURSOR_SYNC_SCRIPT_FILE_NAME,
     CURSOR_RULES_DIRECTORY_NAME,
     SUBAGENT_MODEL_POLICY_FILE_NAME,
     WINDOWS_PYTHON_LAUNCHER_COMMAND,
@@ -378,58 +377,6 @@ export function pythonFileAndPrefixArguments(pythonCommand) {
     return { file: unquoted, prefixArguments: [] };
 }
 
-/**
- * Read generated Cursor paths from the sync manifest under a Cursor home.
- *
- * Args:
- *   cursorRoot: Absolute `.cursor` directory.
- *
- * Returns:
- *   Absolute paths the installer may record, including the sync manifest.
- */
-export function collectManagedCursorSyncPaths(cursorRoot) {
-    const manifestPath = join(cursorRoot, '.sync-manifest.json');
-    if (!existsSync(manifestPath)) return [];
-    const parsed = JSON.parse(readFileSync(manifestPath, 'utf8'));
-    const generatedPaths = [manifestPath];
-    const allEntries = { ...(parsed.entries || {}), ...(parsed.docs_entries || {}) };
-    for (const eachRelativePath of Object.keys(allEntries)) {
-        generatedPaths.push(join(cursorRoot, eachRelativePath));
-    }
-    return generatedPaths;
-}
-
-/**
- * Run the installed Cursor rule generator against Claude and Cursor roots.
- *
- * Args:
- *   pythonCommand: Interpreter command from install preflight.
- *   scriptPath: Absolute `sync_to_cursor.py` path.
- *   claudeRoot: Managed Claude root that holds `rules/` and `docs/`.
- *   cursorRoot: Cursor home that receives `rules/*.mdc`.
- *
- * Returns:
- *   void
- */
-export function runCursorRuleSync(pythonCommand, scriptPath, claudeRoot, cursorRoot) {
-    mkdirSync(cursorRoot, { recursive: true });
-    const { file, prefixArguments } = pythonFileAndPrefixArguments(pythonCommand);
-    execFileSync(
-        file,
-        [
-            ...prefixArguments,
-            scriptPath,
-            '--force',
-            '--quiet',
-            '--claude-root',
-            claudeRoot,
-            '--cursor-root',
-            cursorRoot,
-        ],
-        { stdio: 'inherit' },
-    );
-}
-
 /**
  * Install the pstack plugin from its marketplace into the hosts this run serves.
  *
@@ -2371,6 +2318,19 @@ function pruneStaleFilesAcrossManagedRoots(priorInstalledFiles, currentInstalled
             skillsPrunedCount += rootOutcome.prunedCount;
         }
     }
+    const cursorInstallDirectory = INSTALL_ROOT_RESOLUTION.cursorInstallDirectory;
+    const retiredCursorSyncManifestPath = join(cursorInstallDirectory, '.sync-manifest.json');
+    const isRetiredCursorRuleFile = priorFile => resolve(priorFile) === retiredCursorSyncManifestPath
+        || isInsideDirectory(resolve(priorFile), INSTALL_ROOT_RESOLUTION.cursorRulesInstallDirectory);
+    const retiredCursorRulesOutcome = pruneStaleInstalledFiles(
+        priorInstalledFiles?.filter(isRetiredCursorRuleFile) ?? null,
+        currentInstalledFiles,
+        cursorInstallDirectory,
+        join(backupRoot, 'cursor'),
+        { managedHomeDirectory: cursorInstallDirectory },
+    );
+    prunedCount += retiredCursorRulesOutcome.prunedCount;
+    failedPaths.push(...retiredCursorRulesOutcome.failedPaths);
     const retiredClaudeGuidancePath = join(CLAUDE_HOME, 'AGENTS.md');
     const retiredGuidanceOutcome = pruneStaleInstalledFiles(
         priorInstalledFiles?.filter(priorFile => resolve(priorFile) === retiredClaudeGuidancePath) ?? null,
@@ -2714,19 +2674,9 @@ function executeInstallPlanMutations(plan, transactionHelpers) {
             allInstalledFiles.push(...stats.paths);
         }
     }
-    const shouldInstallCursorRules = !selectedGroups
+    const shouldSeedSubagentModelPolicy = !selectedGroups
         || activeGroups.some((eachGroup) => (eachGroup.includeDirectories || []).includes('rules'));
-    if (shouldInstallCursorRules) {
-        const scriptPath = join(CLAUDE_HOME, 'scripts', CURSOR_SYNC_SCRIPT_FILE_NAME);
-        if (!existsSync(scriptPath)) {
-            throw new Error(`cursor rule sync script missing: ${scriptPath}`);
-        }
-        const cursorRoot = dirname(INSTALL_ROOT_RESOLUTION.cursorRulesInstallDirectory);
-        runCursorRuleSync(pythonCommand, scriptPath, CLAUDE_HOME, cursorRoot);
-        const generatedCursorPaths = collectManagedCursorSyncPaths(cursorRoot);
-        allInstalledFiles.push(...generatedCursorPaths);
-        summary.cursorRules = { created: generatedCursorPaths.length, updated: 0, paths: generatedCursorPaths };
-        syncWrittenPaths(allInstalledFiles);
+    if (shouldSeedSubagentModelPolicy) {
         const seededPolicyPath = seedSubagentModelPolicy();
         if (seededPolicyPath) {
             allInstalledFiles.push(seededPolicyPath);
@@ -2988,10 +2938,6 @@ function executeInstallPlanMutations(plan, transactionHelpers) {
         const { created, updated } = summary.codexRules;
         console.log(`  ${CODEX_RULES_PACKAGE_DIRECTORY_NAME}: ${created + updated} files (${created} new, ${updated} updated)`);
     }
-    if (summary.cursorRules) {
-        const { created } = summary.cursorRules;
-        console.log(`  cursor-rules: ${created} generated files`);
-    }
     if (summary[MANAGED_AGENTS_DIRECTORY_NAME]) {
         const { created, updated } = summary[MANAGED_AGENTS_DIRECTORY_NAME];
         console.log(`  ${MANAGED_AGENTS_DIRECTORY_NAME}: ${created + updated} files (${created} new, ${updated} updated)`);
@@ -3336,7 +3282,7 @@ Install location: ~/.claude/ by default; CLAUDE_CONFIG_DIR or --target selects a
 Skills and agents live under ~/.agents (sibling of ~/.claude). ~/.claude/skills and ~/.claude/agents are directory pointers to that home.
 Named profiles resolve under LLM_SETTINGS_PROFILES_ROOT or ~/.claude-profiles/<directoryName>.
 Codex exec-policy files copy into ~/.codex/rules, or CODEX_HOME/rules when CODEX_HOME is set.
-Cursor rule files generate into ~/.cursor/rules as stem-named mdc files, one per Claude rule.
+A reinstall moves the Cursor rule files older installs generated under ~/.cursor/rules into the run backup.
 
 The installer reads only flags. A bare path argument carries no meaning, so
 npx ${PACKAGE_NAME} . lands in the same root as a run with no argument.