claude-dev-env 7.5.0 → 7.6.1

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

@@ -30,6 +30,8 @@ from pr_converge_skill_constants.constants import (
     GH_ISSUE_COMMENT_CREATE_PATH_TEMPLATE,
 )
 
+from subprocess_window_access import hidden_window_creation_flags
+
 
 def post_inline_reply(
     *,
@@ -67,6 +69,7 @@ def post_inline_reply(
         encoding="utf-8",
         errors="replace",
         check=False,
+        creationflags=hidden_window_creation_flags(),
     )
     if completed_process.returncode != 0:
         print(f"gh api error: {completed_process.stderr}", file=sys.stderr)
@@ -108,6 +111,7 @@ def post_pr_comment(
         encoding="utf-8",
         errors="replace",
         check=False,
+        creationflags=hidden_window_creation_flags(),
     )
     if completed_process.returncode != 0:
         print(f"gh api error: {completed_process.stderr}", file=sys.stderr)

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

@@ -48,6 +48,8 @@ from reviews_disabled import (
     is_bugteam_disabled_via_env,
 )
 
+from subprocess_window_access import hidden_window_creation_flags, inherited_stream_startup_info
+
 
 def verify_git_hooks_path(repository_root: Path | None = None) -> int:
     """Check that core.hooksPath resolves to the claude-dev-env git-hooks directory.
@@ -95,6 +97,7 @@ def verify_git_hooks_path(repository_root: Path | None = None) -> int:
             encoding="utf-8",
             errors="replace",
             check=False,
+            creationflags=hidden_window_creation_flags(),
         )
     except FileNotFoundError:
         print(
@@ -201,6 +204,7 @@ def has_discoverable_tests(root: Path) -> bool | None:
             encoding="utf-8",
             errors="replace",
             check=True,
+            creationflags=hidden_window_creation_flags(),
         )
     except FileNotFoundError:
         print(
@@ -260,6 +264,7 @@ def run_pytest(
         command,
         cwd=str(repository_root),
         check=False,
+        startupinfo=inherited_stream_startup_info(),
     )
     if completed.returncode == _pytest_exit_code_no_tests_collected():
         return 0
@@ -302,6 +307,7 @@ def get_changed_files(repository_root: Path, base_ref: str) -> list[Path] | None
             encoding="utf-8",
             errors="replace",
             check=False,
+            creationflags=hidden_window_creation_flags(),
         )
     except FileNotFoundError:
         print(
@@ -398,6 +404,7 @@ def run_pre_commit(repository_root: Path) -> int:
         list(ALL_PRE_COMMIT_RUN_ALL_FILES_COMMAND),
         cwd=str(repository_root),
         check=False,
+        startupinfo=inherited_stream_startup_info(),
     )
     return completed.returncode
 

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

@@ -24,6 +24,8 @@ from pr_loop_shared_constants.preflight_self_heal_constants import (  # noqa: E4
     ALL_GIT_CONFIG_LOCAL_UNSET_ALL_HOOKS_PATH_ARGUMENTS,
 )
 
+from subprocess_window_access import hidden_window_creation_flags
+
 
 def _is_canonical_hooks_path_entry(
     raw_hooks_path_entry: str,
@@ -71,6 +73,7 @@ def _canonical_global_hooks_path_is_set(expected_hooks_path_suffix: str) -> bool
             encoding="utf-8",
             errors="replace",
             check=False,
+            creationflags=hidden_window_creation_flags(),
         )
     except (FileNotFoundError, OSError):
         return False
@@ -127,6 +130,7 @@ def silently_clear_stale_local_hooks_path_override(
             encoding="utf-8",
             errors="replace",
             check=False,
+            creationflags=hidden_window_creation_flags(),
         )
     except (FileNotFoundError, OSError):
         return
@@ -159,6 +163,7 @@ def silently_clear_stale_local_hooks_path_override(
             encoding="utf-8",
             errors="replace",
             check=False,
+            creationflags=hidden_window_creation_flags(),
         )
     except (FileNotFoundError, OSError):
         return

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

@@ -90,6 +90,8 @@ from codex_review_scripts_constants.run_constants import (  # noqa: E402
     VERSION_PROBE_PATTERN,
 )
 
+from subprocess_window_access import hidden_window_creation_flags
+
 
 def _open_codex_popen(
     all_arguments: list[str],
@@ -110,6 +112,7 @@ def _open_codex_popen(
         encoding=stream_encoding if isinstance(stream_encoding, str) else None,
         env=process_environment if isinstance(process_environment, dict) else None,
         start_new_session=should_start_new_session(),
+        creationflags=hidden_window_creation_flags(),
     )
 
 

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

@@ -0,0 +1,41 @@
+"""Reach the hidden-window helpers from the scripts this directory deploys.
+
+The installer copies this directory into a profile that holds no installed
+Python distribution, and this repository's own tests run the deployed scripts
+under ``python -S -E``, which hides every installed package from the child
+process. On both routes ``hooks_constants`` is reachable only through the
+deployed ``hooks`` directory, so this module puts that directory on
+``sys.path`` and re-exports the helpers a caller asks for::
+
+    from subprocess_window_access import hidden_window_creation_flags
+
+The directory goes on the end of ``sys.path``. ``PathFinder`` runs ahead of
+every editable-install finder, so a trailing entry still selects the deployed
+copy, and the head of ``sys.path`` stays exactly as the caller left it. A
+caller that prepended its own roots keeps them first.
+"""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+
+_subprocess_window_hooks_directory = str(
+    Path(__file__).resolve().parents[3] / "hooks"
+)
+if _subprocess_window_hooks_directory not in sys.path:
+    sys.path.append(_subprocess_window_hooks_directory)
+
+from hooks_constants.subprocess_window import (
+    HiddenWindowStartupInfo,
+    detached_hidden_window_creation_flags,
+    hidden_window_creation_flags,
+    inherited_stream_startup_info,
+)
+
+__all__ = [
+    "HiddenWindowStartupInfo",
+    "detached_hidden_window_creation_flags",
+    "hidden_window_creation_flags",
+    "inherited_stream_startup_info",
+]

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

@@ -75,6 +75,8 @@ from pr_loop_shared_constants.terminology_sweep_constants import (
     TEST_FILE_SUFFIX,
 )
 
+from subprocess_window_access import hidden_window_creation_flags
+
 IdentifierTuple = tuple[str, ...]
 
 
@@ -656,6 +658,7 @@ def _base_tree_names(
                 timeout=GIT_DIFF_SUBPROCESS_TIMEOUT_SECONDS,
                 check=False,
                 env=repository_environment(),
+                creationflags=hidden_window_creation_flags(),
             )
         except (subprocess.TimeoutExpired, FileNotFoundError, OSError):
             continue
@@ -678,6 +681,7 @@ def _run_strict_git(
             timeout=GIT_DIFF_SUBPROCESS_TIMEOUT_SECONDS,
             check=False,
             env=repository_environment(),
+            creationflags=hidden_window_creation_flags(),
         )
     except (subprocess.TimeoutExpired, OSError) as e:
         raise RuntimeError(str(e)) from e
@@ -807,6 +811,7 @@ def staged_terminology_findings(repository_root: Path) -> list[str]:
         timeout=GIT_DIFF_SUBPROCESS_TIMEOUT_SECONDS,
         check=False,
         env=repository_environment(),
+        creationflags=hidden_window_creation_flags(),
     )
     if diff_process.returncode != 0:
         return []

package/_shared/process-tree/scripts/process_tree_kill.py

@@ -39,6 +39,8 @@ from process_tree_scripts_constants.process_tree_kill_constants import (  # noqa
     WINDOWS_TASKKILL_TREE_FLAG,
 )
 
+from subprocess_window_access import hidden_window_creation_flags
+
 process_tree_subprocess_run = subprocess.run
 
 
@@ -73,6 +75,7 @@ def _kill_windows_process_tree(process_identifier: int) -> None:
             stderr=subprocess.DEVNULL,
             check=False,
             timeout=PROCESS_TREE_KILL_TIMEOUT_SECONDS,
+            creationflags=hidden_window_creation_flags(),
         )
     except (subprocess.TimeoutExpired, OSError):
         return

package/_shared/process-tree/scripts/subprocess_window_access.py

@@ -0,0 +1,41 @@
+"""Reach the hidden-window helpers from the scripts this directory deploys.
+
+The installer copies this directory into a profile that holds no installed
+Python distribution, and this repository's own tests run the deployed scripts
+under ``python -S -E``, which hides every installed package from the child
+process. On both routes ``hooks_constants`` is reachable only through the
+deployed ``hooks`` directory, so this module puts that directory on
+``sys.path`` and re-exports the helpers a caller asks for::
+
+    from subprocess_window_access import hidden_window_creation_flags
+
+The directory goes on the end of ``sys.path``. ``PathFinder`` runs ahead of
+every editable-install finder, so a trailing entry still selects the deployed
+copy, and the head of ``sys.path`` stays exactly as the caller left it. A
+caller that prepended its own roots keeps them first.
+"""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+
+_subprocess_window_hooks_directory = str(
+    Path(__file__).resolve().parents[3] / "hooks"
+)
+if _subprocess_window_hooks_directory not in sys.path:
+    sys.path.append(_subprocess_window_hooks_directory)
+
+from hooks_constants.subprocess_window import (
+    HiddenWindowStartupInfo,
+    detached_hidden_window_creation_flags,
+    hidden_window_creation_flags,
+    inherited_stream_startup_info,
+)
+
+__all__ = [
+    "HiddenWindowStartupInfo",
+    "detached_hidden_window_creation_flags",
+    "hidden_window_creation_flags",
+    "inherited_stream_startup_info",
+]

package/bin/install-constants.mjs

@@ -56,8 +56,10 @@ export const RUN_BACKUP_DIRECTORY_NAME_PATTERN =
 export const PACKAGE_AGENTS_HOME_DIRECTORY_NAME = '.agents';
 
 export const PSTACK_MODEL_RULE_FILE_NAME = 'pstack-models.mdc';
-export const PSTACK_CODEX_MODEL_PREFERENCES_FILE_NAME =
-    'pstack-model-preferences.codex.json';
+export const PSTACK_SEEDED_MODEL_PREFERENCES_FILE_NAMES = Object.freeze([
+    'pstack-model-preferences.claude.json',
+    'pstack-model-preferences.codex.json',
+]);
 
 /**
  * The directory name skill directories carry in a package source and under

package/bin/install-session-continuity.mjs

@@ -44,41 +44,84 @@ export function mergeContinuityHooks(existing, host, script) {
     return mergedConfiguration;
 }
 
-async function main() {
-    const requested = process.argv.slice(2);
-    const selected = requested.length ? requested : supportedHosts;
+export const CONTINUITY_SCRIPT_MARKER = '/session-continuity/continuity.mjs';
+
+export function isContinuityHookCommand(command) {
+    return typeof command === 'string' && command.includes(CONTINUITY_SCRIPT_MARKER);
+}
+
+export function continuityScriptPath(roots) {
+    return join(roots.skillsInstallDirectory, 'session-continuity', 'continuity.mjs');
+}
+
+export function continuityHostConfigurationPaths(roots) {
+    return {
+        claude: join(roots.managedRoot, 'settings.json'),
+        codex: join(dirname(roots.codexRulesInstallDirectory), 'hooks.json'),
+        cursor: join(roots.cursorInstallDirectory, 'hooks.json'),
+    };
+}
+
+export function removeContinuityHooks(configuration) {
+    let removedCount = 0;
+    for (const [event, entries] of Object.entries(configuration.hooks || {})) {
+        const kept = entries.flatMap(entry => {
+            if (!entry.hooks) {
+                if (!isContinuityHookCommand(entry.command)) return [entry];
+                removedCount += 1;
+                return [];
+            }
+            const hooks = entry.hooks.filter(hook => !isContinuityHookCommand(hook.command));
+            removedCount += entry.hooks.length - hooks.length;
+            return hooks.length ? [{ ...entry, hooks }] : [];
+        });
+        if (kept.length) configuration.hooks[event] = kept;
+        else delete configuration.hooks[event];
+    }
+    return removedCount;
+}
+
+function continuityConfigurationPlan(host, path, script) {
+    if (!existsSync(dirname(path))) throw new Error(`Host config directory is absent: ${dirname(path)}`);
+    const existing = existsSync(path) ? readFileSync(path, 'utf8') : null;
+    const merged = mergeContinuityHooks(existing ? JSON.parse(existing) : {}, host, script);
+    return { host, path, existing, content: JSON.stringify(merged, null, 2) + '\n' };
+}
+
+function applyContinuityConfigurationPlan(plan) {
+    if (plan.existing === plan.content) return { host: plan.host, path: plan.path, changed: false };
+    if (plan.existing !== null) {
+        const backup = `${plan.path}.before-session-continuity`;
+        if (!existsSync(backup)) writeFileSync(backup, plan.existing, { flag: 'wx', mode: 0o600 });
+    }
+    const current = existsSync(plan.path) ? readFileSync(plan.path, 'utf8') : null;
+    if (current !== plan.existing) throw new Error(`Config changed during setup: ${plan.path}. Rerun setup.`);
+    const temporary = `${plan.path}.continuity-${process.pid}.tmp`;
+    writeFileSync(temporary, plan.content, { flag: 'wx', mode: 0o600 });
+    renameSync(temporary, plan.path);
+    if (readFileSync(plan.path, 'utf8') !== plan.content) throw new Error(`Config read-back mismatch: ${plan.path}`);
+    return { host: plan.host, path: plan.path, changed: true };
+}
+
+export function configureContinuityHosts(roots, selected) {
     const unsupported = selected.find(host => !supportedHosts.includes(host));
     if (unsupported) throw new Error(`Unsupported host ${unsupported}`);
-    const { resolveInstallRoot } = await import('./resolve-install-root.mjs');
-    const roots = resolveInstallRoot();
-    const script = join(roots.skillsInstallDirectory, 'session-continuity', 'continuity.mjs');
+    const script = continuityScriptPath(roots);
     if (!existsSync(script) || !existsSync(join(dirname(script), 'SKILL.md'))) {
         throw new Error('Run the full claude-dev-env installer from this checkout first so the companion is in the canonical agents home.');
     }
-    const paths = {
-        claude: join(roots.managedRoot, 'settings.json'),
-        codex: join(dirname(roots.codexRulesInstallDirectory), 'hooks.json'),
-        cursor: join(roots.cursorInstallDirectory, 'hooks.json'),
-    };
-    const plans = selected.map(host => {
-        const path = paths[host];
-        if (!existsSync(dirname(path))) throw new Error(`Host config directory is absent: ${dirname(path)}`);
-        const existing = existsSync(path) ? readFileSync(path, 'utf8') : null;
-        return { path, existing, content: JSON.stringify(mergeContinuityHooks(existing ? JSON.parse(existing) : {}, host, script), null, 2) + '\n' };
-    });
-    for (const plan of plans) {
-        if (plan.existing === plan.content) { console.log(`Already configured: ${plan.path}`); continue; }
-        if (plan.existing !== null) {
-            const backup = `${plan.path}.before-session-continuity`;
-            if (!existsSync(backup)) writeFileSync(backup, plan.existing, { flag: 'wx', mode: 0o600 });
-        }
-        const current = existsSync(plan.path) ? readFileSync(plan.path, 'utf8') : null;
-        if (current !== plan.existing) throw new Error(`Config changed during setup: ${plan.path}. Rerun setup.`);
-        const temporary = `${plan.path}.continuity-${process.pid}.tmp`;
-        writeFileSync(temporary, plan.content, { flag: 'wx', mode: 0o600 });
-        renameSync(temporary, plan.path);
-        if (readFileSync(plan.path, 'utf8') !== plan.content) throw new Error(`Config read-back mismatch: ${plan.path}`);
-        console.log(`Configured and read back: ${plan.path}`);
+    const paths = continuityHostConfigurationPaths(roots);
+    return selected
+        .map(host => continuityConfigurationPlan(host, paths[host], script))
+        .map(applyContinuityConfigurationPlan);
+}
+
+async function main() {
+    const requested = process.argv.slice(2);
+    const selected = requested.length ? requested : supportedHosts;
+    const { resolveInstallRoot } = await import('./resolve-install-root.mjs');
+    for (const result of configureContinuityHosts(resolveInstallRoot(), selected)) {
+        console.log(`${result.changed ? 'Configured and read back' : 'Already configured'}: ${result.path}`);
     }
     console.log('Review and trust the new hooks in each host.');
 }

package/bin/install-session-continuity.test.mjs

@@ -1,6 +1,30 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import { continuityHookConfiguration, mergeContinuityHooks } from './install-session-continuity.mjs';
+import { mkdirSync, mkdtempSync, readFileSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import {
+    configureContinuityHosts,
+    continuityHookConfiguration,
+    mergeContinuityHooks,
+    removeContinuityHooks,
+} from './install-session-continuity.mjs';
+
+function installRootFixture() {
+    const root = mkdtempSync(join(tmpdir(), 'continuity-roots-'));
+    const skillsInstallDirectory = join(root, 'agents', 'skills');
+    const companionDirectory = join(skillsInstallDirectory, 'session-continuity');
+    mkdirSync(companionDirectory, { recursive: true });
+    writeFileSync(join(companionDirectory, 'continuity.mjs'), 'export default null;\n');
+    writeFileSync(join(companionDirectory, 'SKILL.md'), '# companion\n');
+    const managedRoot = join(root, 'claude');
+    const codexRulesInstallDirectory = join(root, 'codex', 'rules');
+    const cursorInstallDirectory = join(root, 'cursor');
+    for (const directory of [managedRoot, codexRulesInstallDirectory, cursorInstallDirectory]) {
+        mkdirSync(directory, { recursive: true });
+    }
+    return { managedRoot, skillsInstallDirectory, codexRulesInstallDirectory, cursorInstallDirectory };
+}
 
 test('setup preserves other hooks and settings, is idempotent, and rejects competing profiles', () => {
     const existing = { permissions: { deny: ['secret'] }, hooks: { SessionStart: [{ hooks: [{ type: 'command', command: 'existing-hook' }] }] } };
@@ -53,3 +77,30 @@ for (const host of ['claude', 'codex']) {
         }
     });
 }
+
+test('configureContinuityHosts writes each host config, reads it back, and repeats without a change', () => {
+    const roots = installRootFixture();
+    const settingsPath = join(roots.managedRoot, 'settings.json');
+    writeFileSync(settingsPath, JSON.stringify({ permissions: { deny: ['secret'] } }, null, 2) + '\n');
+    const first = configureContinuityHosts(roots, ['claude', 'codex', 'cursor']);
+    assert.deepEqual(first.map(result => result.changed), [true, true, true]);
+    const written = JSON.parse(readFileSync(settingsPath, 'utf8'));
+    assert.deepEqual(written.permissions.deny, ['secret']);
+    const command = written.hooks.SessionStart[0].hooks[0].command;
+    assert.equal(command.endsWith('session-continuity/continuity.mjs" hook claude'), true);
+    const second = configureContinuityHosts(roots, ['claude', 'codex', 'cursor']);
+    assert.deepEqual(second.map(result => result.changed), [false, false, false]);
+});
+
+test('removeContinuityHooks takes out only the companion registrations', () => {
+    const roots = installRootFixture();
+    configureContinuityHosts(roots, ['claude']);
+    const settingsPath = join(roots.managedRoot, 'settings.json');
+    const settings = JSON.parse(readFileSync(settingsPath, 'utf8'));
+    settings.hooks.SessionStart.unshift({ hooks: [{ type: 'command', command: 'python other_hook.py' }] });
+    const removedCount = removeContinuityHooks(settings);
+    assert.equal(removedCount, 3);
+    assert.deepEqual(Object.keys(settings.hooks), ['SessionStart']);
+    assert.equal(settings.hooks.SessionStart.length, 1);
+    assert.equal(settings.hooks.SessionStart[0].hooks[0].command, 'python other_hook.py');
+});

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

@@ -220,18 +220,60 @@ for (const targetName of [null, 'profile']) {
                 model: 'gpt-5.6-sol',
             });
 
-            const foreignPreferencesPath = join(
+            const claudePreferencesPath = join(
                 resolution.agentsHome,
                 'rules',
                 'pstack-model-preferences.claude.json',
             );
-            writeFileSync(foreignPreferencesPath, JSON.stringify({
+            const seededClaudePreferences = JSON.parse(
+                readFileSync(claudePreferencesPath, 'utf8'),
+            );
+            assert.deepEqual(seededClaudePreferences, {
+                host: 'claude',
+                modelsByRole: {
+                    'feature, refactoring': ['opus'],
+                    'bug-fix': ['opus'],
+                    'perf-issue': ['fable'],
+                    hillclimb: ['fable'],
+                    'judgment and prose': ['fable'],
+                    'hardest tasks': ['fable'],
+                    'how explorer': ['sonnet'],
+                    'how explainer': ['opus'],
+                    'how critics': ['sonnet', 'opus', 'fable'],
+                    'why investigators': ['sonnet'],
+                    'why synthesizer': ['fable'],
+                    'reflect tooling': ['opus'],
+                    'reflect judgment, divergent, synthesizer': ['fable'],
+                    'arena runners': ['sonnet', 'opus', 'fable'],
+                    'arena cross-judge pool': ['opus', 'fable'],
+                    'swarm workers': ['sonnet'],
+                    'architect runners': ['opus', 'fable'],
+                    'interrogate reviewers': ['sonnet', 'opus', 'fable'],
+                },
+            });
+            const claudeSelection = runSelector(selectorPath, {
+                host: 'claude',
+                inventoryHost: 'claude',
+                role: 'swarm workers',
+                delegationIndex: 0,
+                availableModelIds: ['sonnet', 'opus', 'fable'],
+                confirmedSuitableModelIds: [],
+                parentFallback: {
+                    isAllowed: false,
+                    hasMaterialCapabilityLoss: false,
+                },
+            });
+            assert.deepEqual(claudeSelection.nativeSpawnArguments, {
+                model: 'sonnet',
+            });
+
+            writeFileSync(claudePreferencesPath, JSON.stringify({
                 host: 'claude',
                 modelsByRole: {
                     'feature, refactoring': ['confirmed-claude-model'],
                 },
             }));
-            const foreignSelection = runSelector(selectorPath, {
+            const editedClaudeSelection = runSelector(selectorPath, {
                 host: 'claude',
                 inventoryHost: 'claude',
                 role: 'feature, refactoring',
@@ -243,7 +285,7 @@ for (const targetName of [null, 'profile']) {
                     hasMaterialCapabilityLoss: false,
                 },
             });
-            assert.deepEqual(foreignSelection.nativeSpawnArguments, {
+            assert.deepEqual(editedClaudeSelection.nativeSpawnArguments, {
                 model: 'confirmed-claude-model',
             });
 
@@ -251,7 +293,7 @@ for (const targetName of [null, 'profile']) {
             assert.equal(manifest.files.includes(sharedPath), true);
             assert.equal(manifest.files.includes(managedSelectorPath), true);
             assert.equal(manifest.files.includes(preferencesPath), false);
-            assert.equal(manifest.files.includes(foreignPreferencesPath), false);
+            assert.equal(manifest.files.includes(claudePreferencesPath), false);
 
             writeFileSync(sharedPath, 'stale');
             writeFileSync(preferencesPath, JSON.stringify({
@@ -268,7 +310,7 @@ for (const targetName of [null, 'profile']) {
                 ['user-edited-codex-model'],
             );
             assert.deepEqual(
-                JSON.parse(readFileSync(foreignPreferencesPath, 'utf8'))
+                JSON.parse(readFileSync(claudePreferencesPath, 'utf8'))
                     .modelsByRole['feature, refactoring'],
                 ['confirmed-claude-model'],
             );
@@ -295,7 +337,7 @@ for (const targetName of [null, 'profile']) {
             assert.equal(existsSync(cursorPath), false);
             assert.equal(existsSync(selectorPath), false);
             assert.equal(existsSync(preferencesPath), true);
-            assert.equal(existsSync(foreignPreferencesPath), true);
+            assert.equal(existsSync(claudePreferencesPath), true);
         } finally {
             rmSync(homeDirectory, { recursive: true, force: true });
         }
@@ -317,21 +359,21 @@ test('a blocked shared rule destination rolls back generated Cursor files', () =
     }
 });
 
-test('a failed install rolls back a newly seeded Codex preference file', () => {
+test('a failed install rolls back newly seeded host preference files', () => {
     const homeDirectory = mkdtempSync(join(tmpdir(), 'cdev-pstack-seed-rollback-'));
     try {
-        const preferencesPath = join(
-            homeDirectory,
-            '.agents',
-            'rules',
-            'pstack-model-preferences.codex.json',
-        );
+        const preferencesDirectory = join(homeDirectory, '.agents', 'rules');
         assert.throws(() => runInstaller(
             homeDirectory,
             ['--only', 'core'],
             { CLAUDE_DEV_ENV_INSTALL_FAULT: 'after_file_staging' },
         ));
-        assert.equal(existsSync(preferencesPath), false);
+        for (const hostName of ['claude', 'codex']) {
+            assert.equal(
+                existsSync(join(preferencesDirectory, 'pstack-model-preferences.' + hostName + '.json')),
+                false,
+            );
+        }
     } finally {
         rmSync(homeDirectory, { recursive: true, force: true });
     }