claude-dev-env 8.51.4 → 8.52.1

package/bin/install-pstack-plugin.test.mjs

@@ -8,10 +8,11 @@ import {
     PSTACK_PLUGIN_HOSTS,
     PSTACK_PLUGIN_IDENTIFIER,
     PSTACK_PLUGIN_SPEC,
+    SUBAGENT_MODELS_PLUGIN_SPEC,
     USAGE_WRAPUP_PLUGIN_SPEC,
     hostCommandInvocation,
-    installMarketplacePlugin,
-    marketplacePluginPlan,
+    installMarketplacePlugins,
+    marketplacePluginsPlan,
     removeOrphanedPluginVersions,
     shouldInstallMarketplacePlugin,
 } from './install-pstack-plugin.mjs';
@@ -36,7 +37,7 @@ const ROOTS = Object.freeze({
 const WINDOWS_ENVIRONMENT = Object.freeze({ ComSpec: 'C:\\Windows\\system32\\cmd.exe' });
 
 test('the Claude plan carries the two documented plugin commands', () => {
-    const plan = marketplacePluginPlan(PSTACK_PLUGIN_SPEC, 'claude');
+    const plan = marketplacePluginsPlan([PSTACK_PLUGIN_SPEC], 'claude');
     assert.equal(plan.executable, 'claude');
     assert.deepEqual(plan.commands, [
         ['plugin', 'marketplace', 'add', PSTACK_MARKETPLACE_REPOSITORY],
@@ -45,7 +46,7 @@ test('the Claude plan carries the two documented plugin commands', () => {
 });
 
 test('the Codex plan adds the plugin with the Codex verb', () => {
-    const plan = marketplacePluginPlan(PSTACK_PLUGIN_SPEC, 'codex');
+    const plan = marketplacePluginsPlan([PSTACK_PLUGIN_SPEC], 'codex');
     assert.equal(plan.executable, 'codex');
     assert.deepEqual(plan.commands, [
         ['plugin', 'marketplace', 'add', PSTACK_MARKETPLACE_REPOSITORY],
@@ -54,13 +55,13 @@ test('the Codex plan adds the plugin with the Codex verb', () => {
 });
 
 test('an unsupported host names the hosts this installer knows', () => {
-    assert.throws(() => marketplacePluginPlan(PSTACK_PLUGIN_SPEC, 'cursor'), /cursor/);
+    assert.throws(() => marketplacePluginsPlan([PSTACK_PLUGIN_SPEC], 'cursor'), /cursor/);
     assert.deepEqual(PSTACK_PLUGIN_HOSTS, ['claude', 'codex']);
 });
 
 test('each host installs into the managed root this run wrote', () => {
     const runner = recordingRunner();
-    const outcome = installMarketplacePlugin(PSTACK_PLUGIN_SPEC, ROOTS, runner);
+    const outcome = installMarketplacePlugins([PSTACK_PLUGIN_SPEC], ROOTS, runner);
     assert.equal(outcome.status, 'installed');
     assert.deepEqual(runner.calls.map(call => [call.executable, ...call.commandArguments]), [
         ['claude', 'plugin', 'uninstall', PSTACK_PLUGIN_IDENTIFIER],
@@ -77,11 +78,11 @@ test('each host installs into the managed root this run wrote', () => {
 });
 
 test('each host removes the installed plugin and marketplace before it installs', () => {
-    assert.deepEqual(marketplacePluginPlan(PSTACK_PLUGIN_SPEC, 'claude').removalCommands, [
+    assert.deepEqual(marketplacePluginsPlan([PSTACK_PLUGIN_SPEC], 'claude').removalCommands, [
         ['plugin', 'uninstall', PSTACK_PLUGIN_IDENTIFIER],
         ['plugin', 'marketplace', 'remove', 'pstack-claude'],
     ]);
-    assert.deepEqual(marketplacePluginPlan(PSTACK_PLUGIN_SPEC, 'codex').removalCommands, [
+    assert.deepEqual(marketplacePluginsPlan([PSTACK_PLUGIN_SPEC], 'codex').removalCommands, [
         ['plugin', 'remove', PSTACK_PLUGIN_IDENTIFIER],
         ['plugin', 'marketplace', 'remove', 'pstack-claude'],
     ]);
@@ -92,7 +93,7 @@ test('a removal that finds nothing installed still lets the install run', () =>
         commandArguments.includes('uninstall') || commandArguments.includes('remove')
             ? { status: 1, stderr: 'not installed' }
             : { status: 0, stderr: '' }));
-    const outcome = installMarketplacePlugin(PSTACK_PLUGIN_SPEC, { ...ROOTS, hosts: ['claude'] }, runner);
+    const outcome = installMarketplacePlugins([PSTACK_PLUGIN_SPEC], { ...ROOTS, hosts: ['claude'] }, runner);
     assert.equal(outcome.status, 'installed');
     assert.deepEqual(runner.calls.at(-1).commandArguments, ['plugin', 'install', PSTACK_PLUGIN_IDENTIFIER]);
 });
@@ -101,7 +102,7 @@ test('an absent host command skips that host and leaves the other installed', ()
     const runner = recordingRunner((executable) => (executable === 'codex'
         ? { status: null, error: Object.assign(new Error('spawn codex ENOENT'), { code: 'ENOENT' }) }
         : { status: 0, stderr: '' }));
-    const outcome = installMarketplacePlugin(PSTACK_PLUGIN_SPEC, ROOTS, runner);
+    const outcome = installMarketplacePlugins([PSTACK_PLUGIN_SPEC], ROOTS, runner);
     assert.equal(outcome.hosts.find(host => host.host === 'claude').status, 'installed');
     const codex = outcome.hosts.find(host => host.host === 'codex');
     assert.equal(codex.status, 'skipped');
@@ -114,7 +115,7 @@ test('a failing command reports that host and still installs the next one', () =
         executable === 'claude' && commandArguments[2] === 'add'
             ? { status: 1, stderr: 'marketplace unreachable' }
             : { status: 0, stderr: '' }));
-    const outcome = installMarketplacePlugin(PSTACK_PLUGIN_SPEC, ROOTS, runner);
+    const outcome = installMarketplacePlugins([PSTACK_PLUGIN_SPEC], ROOTS, runner);
     assert.equal(outcome.status, 'failed');
     const claude = outcome.hosts.find(host => host.host === 'claude');
     assert.equal(claude.status, 'failed');
@@ -126,8 +127,8 @@ test('a failing command reports that host and still installs the next one', () =
 
 test('an executable override replaces the host command for that host only', () => {
     const runner = recordingRunner();
-    installMarketplacePlugin(
-        PSTACK_PLUGIN_SPEC,
+    installMarketplacePlugins(
+        [PSTACK_PLUGIN_SPEC],
         { ...ROOTS, environment: { CDE_CODEX_EXECUTABLE: '/opt/codex/bin/codex' } },
         runner,
     );
@@ -146,7 +147,7 @@ test('the opt-out flag and variable both turn the step off', () => {
 
 test('a selected host list installs only that host', () => {
     const runner = recordingRunner();
-    const outcome = installMarketplacePlugin(PSTACK_PLUGIN_SPEC, { ...ROOTS, hosts: ['codex'] }, runner);
+    const outcome = installMarketplacePlugins([PSTACK_PLUGIN_SPEC], { ...ROOTS, hosts: ['codex'] }, runner);
     assert.deepEqual(outcome.hosts.map(host => host.host), ['codex']);
     assert.deepEqual([...new Set(runner.calls.map(call => call.executable))], ['codex']);
 });
@@ -199,7 +200,7 @@ test("cmd.exe's command-not-found exit code reads as an absent host, not a failu
             stderr: "'codex' is not recognized as an internal or external command,\noperable program or batch file.",
         }
         : { status: 0, stderr: '' }));
-    const outcome = installMarketplacePlugin(PSTACK_PLUGIN_SPEC, ROOTS, runner);
+    const outcome = installMarketplacePlugins([PSTACK_PLUGIN_SPEC], ROOTS, runner);
     const codex = outcome.hosts.find(host => host.host === 'codex');
     assert.equal(codex.status, 'skipped');
     assert.equal(outcome.status, 'installed');
@@ -208,13 +209,13 @@ test("cmd.exe's command-not-found exit code reads as an absent host, not a failu
 
 test('a non-zero exit that is not command-not-found still reads as a failure', () => {
     const runner = recordingRunner(() => ({ status: 9009, stderr: 'the marketplace rejected the catalog' }));
-    const outcome = installMarketplacePlugin(PSTACK_PLUGIN_SPEC, { ...ROOTS, hosts: ['claude'] }, runner);
+    const outcome = installMarketplacePlugins([PSTACK_PLUGIN_SPEC], { ...ROOTS, hosts: ['claude'] }, runner);
     assert.equal(outcome.hosts[0].status, 'failed');
     assert.match(outcome.hosts[0].warning, /rejected the catalog/);
 });
 
 test('the usage-wrapup plan adds this repository marketplace and installs the plugin on Claude', () => {
-    const plan = marketplacePluginPlan(USAGE_WRAPUP_PLUGIN_SPEC, 'claude');
+    const plan = marketplacePluginsPlan([USAGE_WRAPUP_PLUGIN_SPEC], 'claude');
     assert.equal(plan.executable, 'claude');
     assert.equal(plan.homeVariable, 'CLAUDE_CONFIG_DIR');
     assert.deepEqual(plan.commands, [
@@ -225,12 +226,12 @@ test('the usage-wrapup plan adds this repository marketplace and installs the pl
 
 test('usage-wrapup is a Claude-only plugin and refuses a Codex plan', () => {
     assert.deepEqual(USAGE_WRAPUP_PLUGIN_SPEC.hosts, ['claude']);
-    assert.throws(() => marketplacePluginPlan(USAGE_WRAPUP_PLUGIN_SPEC, 'codex'), /usage-wrapup plugin host codex/);
+    assert.throws(() => marketplacePluginsPlan([USAGE_WRAPUP_PLUGIN_SPEC], 'codex'), /usage-wrapup plugin host codex/);
 });
 
 test('installing usage-wrapup runs only the Claude commands, inside the managed Claude root', () => {
     const runner = recordingRunner();
-    const outcome = installMarketplacePlugin(USAGE_WRAPUP_PLUGIN_SPEC, ROOTS, runner);
+    const outcome = installMarketplacePlugins([USAGE_WRAPUP_PLUGIN_SPEC], ROOTS, runner);
     assert.equal(outcome.status, 'installed');
     assert.deepEqual(outcome.hosts.map(host => host.host), ['claude']);
     assert.deepEqual(runner.calls.map(call => [call.executable, ...call.commandArguments]), [
@@ -249,7 +250,7 @@ test('an absent claude command skips usage-wrapup and names the plugin in the wa
         status: null,
         error: Object.assign(new Error('spawn claude ENOENT'), { code: 'ENOENT' }),
     }));
-    const outcome = installMarketplacePlugin(USAGE_WRAPUP_PLUGIN_SPEC, ROOTS, runner);
+    const outcome = installMarketplacePlugins([USAGE_WRAPUP_PLUGIN_SPEC], ROOTS, runner);
     assert.equal(outcome.status, 'skipped');
     assert.match(outcome.warning, /usage-wrapup was not installed for claude/);
 });
@@ -268,16 +269,60 @@ test('the usage-wrapup opt-out flag and variable turn off only usage-wrapup', ()
     );
 });
 
-test('the repository marketplace lists usage-wrapup from its package folder in this repository', () => {
-    const marketplace = JSON.parse(readFileSync(
-        new URL('../../../.claude-plugin/marketplace.json', import.meta.url),
-        'utf8',
-    ));
-    const [pluginName, marketplaceName] = USAGE_WRAPUP_PLUGIN_SPEC.pluginIdentifier.split('@');
-    assert.equal(marketplace.name, marketplaceName);
-    const entry = marketplace.plugins.find(plugin => plugin.name === pluginName);
-    assert.ok(entry, `the marketplace lists ${pluginName}`);
-    assert.equal(entry.source, './packages/usage-wrapup');
+for (const [spec, packageFolder] of [
+    [USAGE_WRAPUP_PLUGIN_SPEC, './packages/usage-wrapup'],
+    [SUBAGENT_MODELS_PLUGIN_SPEC, './packages/subagent-models'],
+]) {
+    test(`the repository marketplace lists ${spec.name} from its package folder in this repository`, () => {
+        const marketplace = JSON.parse(readFileSync(
+            new URL('../../../.claude-plugin/marketplace.json', import.meta.url),
+            'utf8',
+        ));
+        const [pluginName, marketplaceName] = spec.pluginIdentifier.split('@');
+        assert.equal(marketplace.name, marketplaceName);
+        const entry = marketplace.plugins.find(plugin => plugin.name === pluginName);
+        assert.ok(entry, `the marketplace lists ${pluginName}`);
+        assert.equal(entry.source, packageFolder);
+        assert.ok(spec.sparsePaths.includes(packageFolder.slice(2)), `the sparse checkout holds ${packageFolder}`);
+    });
+}
+
+test('should remove and add the shared marketplace once when installing usage-wrapup and subagent-models together', () => {
+    const runner = recordingRunner();
+    const outcome = installMarketplacePlugins([USAGE_WRAPUP_PLUGIN_SPEC, SUBAGENT_MODELS_PLUGIN_SPEC], ROOTS, runner);
+    assert.equal(outcome.status, 'installed');
+    assert.deepEqual(outcome.hosts.map(host => host.host), ['claude']);
+    assert.deepEqual(runner.calls.map(call => [call.executable, ...call.commandArguments]), [
+        ['claude', 'plugin', 'uninstall', 'usage-wrapup@claude-dev-env'],
+        ['claude', 'plugin', 'uninstall', 'subagent-models@claude-dev-env'],
+        ['claude', 'plugin', 'marketplace', 'remove', 'claude-dev-env'],
+        [
+            'claude', 'plugin', 'marketplace', 'add', 'jl-cmd/claude-dev-env',
+            '--sparse', '.claude-plugin', 'packages/usage-wrapup', 'packages/subagent-models',
+        ],
+        ['claude', 'plugin', 'install', 'usage-wrapup@claude-dev-env'],
+        ['claude', 'plugin', 'install', 'subagent-models@claude-dev-env'],
+    ]);
+});
+
+test('should refuse one plan for plugins from two marketplaces', () => {
+    assert.throws(
+        () => marketplacePluginsPlan([PSTACK_PLUGIN_SPEC, SUBAGENT_MODELS_PLUGIN_SPEC], 'claude'),
+        /subagent-models comes from jl-cmd\/claude-dev-env/,
+    );
+});
+
+test('should turn off only subagent-models with its opt-out flag or variable', () => {
+    assert.equal(shouldInstallMarketplacePlugin(SUBAGENT_MODELS_PLUGIN_SPEC, [], {}), true);
+    assert.equal(shouldInstallMarketplacePlugin(SUBAGENT_MODELS_PLUGIN_SPEC, ['--no-subagent-models'], {}), false);
+    assert.equal(
+        shouldInstallMarketplacePlugin(SUBAGENT_MODELS_PLUGIN_SPEC, [], { CDE_INSTALL_SUBAGENT_MODELS: '0' }),
+        false,
+    );
+    assert.equal(
+        shouldInstallMarketplacePlugin(USAGE_WRAPUP_PLUGIN_SPEC, ['--no-subagent-models'], { CDE_INSTALL_SUBAGENT_MODELS: '0' }),
+        true,
+    );
 });
 
 test('a clean install deletes the orphaned pstack versions and keeps the installed one', () => {
@@ -286,8 +331,8 @@ test('a clean install deletes the orphaned pstack versions and keeps the install
     mkdirSync(join(versionsDirectory, '0.9.55'), { recursive: true });
     writeFileSync(join(versionsDirectory, '0.9.55', '.orphaned_at'), '1');
     mkdirSync(join(versionsDirectory, '0.9.64'), { recursive: true });
-    const outcome = installMarketplacePlugin(
-        PSTACK_PLUGIN_SPEC,
+    const outcome = installMarketplacePlugins(
+        [PSTACK_PLUGIN_SPEC],
         { claudeRoot, hosts: ['claude'], environment: {} },
         recordingRunner(),
     );

package/bin/install.agents-home.test.mjs

@@ -52,6 +52,7 @@ function runInstaller(homeDirectory, extraArguments, environmentOverrides = {})
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
         HOME: homeDirectory,
         USERPROFILE: homeDirectory,
         GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),

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

@@ -58,6 +58,7 @@ function runInstaller(homeDirectory, extraArguments) {
             ...process.env,
             CDE_INSTALL_PSTACK: '0',
             CDE_INSTALL_USAGE_WRAPUP: '0',
+            CDE_INSTALL_SUBAGENT_MODELS: '0',
             HOME: homeDirectory,
             USERPROFILE: homeDirectory,
             GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),
@@ -87,6 +88,7 @@ function scanTextWithProductionPiiScanner(scannedText) {
                     ...process.env,
                     CDE_INSTALL_PSTACK: '0',
                     CDE_INSTALL_USAGE_WRAPUP: '0',
+                    CDE_INSTALL_SUBAGENT_MODELS: '0',
                     PYTHONPATH: BLOCKING_HOOKS_DIRECTORY,
                     CLAUDE_LOCAL_IDENTITY_PATH: join(
                         temporaryDirectory,

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

@@ -33,6 +33,7 @@ function runInstaller(homeDirectory, extraArguments, environmentOverrides = {})
             ...process.env,
             CDE_INSTALL_PSTACK: '0',
             CDE_INSTALL_USAGE_WRAPUP: '0',
+            CDE_INSTALL_SUBAGENT_MODELS: '0',
             HOME: homeDirectory,
             USERPROFILE: homeDirectory,
             CODEX_HOME: join(homeDirectory, '.codex'),

package/bin/install.mjs

@@ -49,8 +49,9 @@ import {
 } from './install-constants.mjs';
 import {
     PSTACK_PLUGIN_SPEC,
+    SUBAGENT_MODELS_PLUGIN_SPEC,
     USAGE_WRAPUP_PLUGIN_SPEC,
-    installMarketplacePlugin,
+    installMarketplacePlugins,
     shouldInstallMarketplacePlugin,
 } from './install-pstack-plugin.mjs';
 import { seedCodexPstackModels } from './seed-codex-pstack-models.mjs';
@@ -407,17 +408,19 @@ export function pythonFileAndPrefixArguments(pythonCommand) {
  * @returns {{status: string, hosts: object[], warning: string|null}} The outcome.
  */
 export function installPstackPluginForHosts() {
-    return installMarketplacePlugin(PSTACK_PLUGIN_SPEC, {
+    return installMarketplacePlugins([PSTACK_PLUGIN_SPEC], {
         claudeRoot: CLAUDE_HOME,
         codexHome: INSTALL_ROOT_RESOLUTION.codexHomeDirectory,
     });
 }
 
-function printPluginHostOutcomes(spec, pluginOutcome) {
-    for (const eachHost of pluginOutcome.hosts) {
-        console.log(eachHost.warning
-            ? `  ${spec.label} (${eachHost.host}): ${eachHost.status} — ${eachHost.warning}`
-            : `  ${spec.label} (${eachHost.host}): ${eachHost.status}`);
+function printPluginHostOutcomes(allSpecs, pluginOutcome) {
+    for (const eachSpec of allSpecs) {
+        for (const eachHost of pluginOutcome.hosts) {
+            console.log(eachHost.warning
+                ? `  ${eachSpec.label} (${eachHost.host}): ${eachHost.status} — ${eachHost.warning}`
+                : `  ${eachSpec.label} (${eachHost.host}): ${eachHost.status}`);
+        }
     }
 }
 
@@ -2890,14 +2893,16 @@ function executeInstallPlanMutations(plan, transactionHelpers) {
                 console.log(`  \u2713 ${skillLoadGuidancePath} (Codex skill-load line)`);
             }
         }
-        printPluginHostOutcomes(PSTACK_PLUGIN_SPEC, pstackPlugin);
+        printPluginHostOutcomes([PSTACK_PLUGIN_SPEC], pstackPlugin);
     }
-    if (!selectedGroups && shouldInstallMarketplacePlugin(USAGE_WRAPUP_PLUGIN_SPEC)) {
-        const usageWrapupPlugin = installMarketplacePlugin(USAGE_WRAPUP_PLUGIN_SPEC, {
+    const allRepositoryPluginSpecs = [USAGE_WRAPUP_PLUGIN_SPEC, SUBAGENT_MODELS_PLUGIN_SPEC]
+        .filter(eachSpec => shouldInstallMarketplacePlugin(eachSpec));
+    if (!selectedGroups && allRepositoryPluginSpecs.length > 0) {
+        const repositoryPlugins = installMarketplacePlugins(allRepositoryPluginSpecs, {
             claudeRoot: CLAUDE_HOME,
         });
-        summary.usageWrapupPlugin = usageWrapupPlugin;
-        printPluginHostOutcomes(USAGE_WRAPUP_PLUGIN_SPEC, usageWrapupPlugin);
+        summary.repositoryPlugins = repositoryPlugins;
+        printPluginHostOutcomes(allRepositoryPluginSpecs, repositoryPlugins);
     }
     if (!selectedGroups) {
         const packageGuidancePath = writeCodexPackageGuidance(
@@ -3412,6 +3417,7 @@ Usage:
   npx ${PACKAGE_NAME} --profiles A,B  Install into each selected profile (one ownership manifest per target)
   npx ${PACKAGE_NAME} --no-pstack  Full install without the pstack plugin (also CDE_INSTALL_PSTACK=0)
   npx ${PACKAGE_NAME} --no-usage-wrapup  Full install without the usage-wrapup plugin (also CDE_INSTALL_USAGE_WRAPUP=0)
+  npx ${PACKAGE_NAME} --no-subagent-models  Full install without the subagent-models plugin (also CDE_INSTALL_SUBAGENT_MODELS=0)
   npx ${PACKAGE_NAME} --uninstall  Remove installed files from the selected root
   npx ${PACKAGE_NAME} --help       Show this help
 

package/bin/install.prune.test.mjs

@@ -261,6 +261,7 @@ function resolveInstallerInvocation(homeDirectory) {
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
         HOME: homeDirectory,
         USERPROFILE: homeDirectory,
         GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),

package/bin/install.question-presentation.test.mjs

@@ -24,6 +24,7 @@ function installInScratchHome(homeDirectory, argumentsList = [], extraEnvironmen
             ...process.env,
             CDE_INSTALL_PSTACK: '0',
             CDE_INSTALL_USAGE_WRAPUP: '0',
+            CDE_INSTALL_SUBAGENT_MODELS: '0',
             HOME: homeDirectory,
             USERPROFILE: homeDirectory,
             CODEX_HOME: join(homeDirectory, '.codex'),
@@ -179,6 +180,7 @@ test('a successful pstack install retains its skill block and gains the question
     const installation = installInScratchHome(homeDirectory, [], {
         CDE_INSTALL_PSTACK: '1',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
         CDE_CODEX_EXECUTABLE: commandPath,
         CDE_CLAUDE_EXECUTABLE: commandPath,
     });
@@ -206,6 +208,7 @@ test('enabling pstack after a pstack-off install preserves question guidance', (
     const secondInstallation = installInScratchHome(homeDirectory, [], {
         CDE_INSTALL_PSTACK: '1',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
         CDE_CODEX_EXECUTABLE: commandPath,
         CDE_CLAUDE_EXECUTABLE: commandPath,
     });
@@ -234,6 +237,7 @@ test('a failed pstack transition restores question-only guidance and removes its
     const failedInstallation = installInScratchHome(homeDirectory, [], {
         CDE_INSTALL_PSTACK: '1',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
         CDE_CODEX_EXECUTABLE: commandPath,
         CDE_CLAUDE_EXECUTABLE: commandPath,
         CLAUDE_DEV_ENV_INSTALL_FAULT: 'after_file_staging',

package/bin/install.settings-defaults.test.mjs

@@ -58,6 +58,7 @@ function runInstallerInSandbox(sandboxHome, installerArguments = []) {
             ...process.env,
             CDE_INSTALL_PSTACK: '0',
             CDE_INSTALL_USAGE_WRAPUP: '0',
+            CDE_INSTALL_SUBAGENT_MODELS: '0',
             HOME: sandboxHome,
             USERPROFILE: sandboxHome,
             GIT_CONFIG_GLOBAL: gitConfigGlobal,

package/bin/install.shared-settings.test.mjs

@@ -31,6 +31,7 @@ function installEnvironment(homeDirectory) {
         GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),
         CDE_INSTALL_PSTACK: '0',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
     };
 }
 

package/bin/install.test.mjs

@@ -3026,6 +3026,7 @@ test('a failed update preserves an existing skills lookup pointer', () => {
             GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),
             CDE_INSTALL_PSTACK: '0',
             CDE_INSTALL_USAGE_WRAPUP: '0',
+            CDE_INSTALL_SUBAGENT_MODELS: '0',
         };
         const argumentsForCoreInstall = [PSTACK_TEST_INSTALLER_PATH, '--only', 'core'];
         const firstRun = spawnSync(process.execPath, argumentsForCoreInstall, {
@@ -3077,6 +3078,7 @@ function runPstackInstaller(homeDirectory, extraArguments, environmentOverrides
             GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),
             CDE_INSTALL_PSTACK: '1',
             CDE_INSTALL_USAGE_WRAPUP: '0',
+            CDE_INSTALL_SUBAGENT_MODELS: '0',
             ...environmentOverrides,
         },
     });
@@ -3391,6 +3393,60 @@ test('the help output names the usage-wrapup opt-out beside the pstack one', ()
     assert.match(helpRun.stdout, /--no-pstack .*\n.*--no-usage-wrapup .*CDE_INSTALL_USAGE_WRAPUP=0/);
 });
 
+const REPOSITORY_PLUGIN_CLAUDE_COMMANDS = Object.freeze([
+    'claude plugin uninstall usage-wrapup@claude-dev-env',
+    'claude plugin uninstall subagent-models@claude-dev-env',
+    'claude plugin marketplace remove claude-dev-env',
+    'claude plugin marketplace add jl-cmd/claude-dev-env --sparse .claude-plugin packages/usage-wrapup packages/subagent-models',
+    'claude plugin install usage-wrapup@claude-dev-env',
+    'claude plugin install subagent-models@claude-dev-env',
+]);
+
+test('should install subagent-models beside usage-wrapup with one marketplace add on a full install', t => {
+    const sandbox = pstackPluginSandbox(t);
+
+    const installerOutput = runPstackInstaller(sandbox.homeDirectory, ['--no-pstack'], {
+        ...sandbox.environment,
+        CDE_INSTALL_USAGE_WRAPUP: '1',
+        CDE_INSTALL_SUBAGENT_MODELS: '1',
+    });
+
+    assert.deepEqual(usageWrapupCommands(sandbox.recordedCommands()), REPOSITORY_PLUGIN_CLAUDE_COMMANDS);
+    assert.match(installerOutput, /Usage-wrapup \(claude\): installed/);
+    assert.match(installerOutput, /Subagent-models \(claude\): installed/);
+});
+
+for (const [caseName, extraArguments, environmentOverrides] of [
+    ['--no-subagent-models', ['--no-subagent-models'], { CDE_INSTALL_SUBAGENT_MODELS: '1' }],
+    ['CDE_INSTALL_SUBAGENT_MODELS=0', [], { CDE_INSTALL_SUBAGENT_MODELS: '0' }],
+    ['an --only run', ['--only', 'core'], { CDE_INSTALL_SUBAGENT_MODELS: '1' }],
+]) {
+    test(`should skip subagent-models on ${caseName}`, t => {
+        const sandbox = pstackPluginSandbox(t);
+
+        const installerOutput = runPstackInstaller(sandbox.homeDirectory, extraArguments, {
+            ...sandbox.environment,
+            ...environmentOverrides,
+        });
+
+        assert.equal(
+            sandbox.recordedCommands().some(eachCommand => eachCommand.includes('subagent-models')),
+            false,
+        );
+        assert.doesNotMatch(installerOutput, /Subagent-models \(/);
+    });
+}
+
+test('should name the subagent-models opt-out in the help output', () => {
+    const helpRun = spawnSync(process.execPath, [PSTACK_TEST_INSTALLER_PATH, '--help'], {
+        encoding: 'utf8',
+        env: process.env,
+    });
+
+    assert.equal(helpRun.status, 0, helpRun.stderr);
+    assert.match(helpRun.stdout, /--no-subagent-models .*CDE_INSTALL_SUBAGENT_MODELS=0/);
+});
+
 function continuityCommandCount(configurationPath) {
     if (!existsSync(configurationPath)) return 0;
     const configuration = JSON.parse(readFileSync(configurationPath, 'utf8'));

package/bin/install.transaction.test.mjs

@@ -87,6 +87,7 @@ test('capture and restore recover settings, manifest, files, and hooksPath', ()
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
         HOME: box.root,
         USERPROFILE: box.root,
         GIT_CONFIG_GLOBAL: gitConfigPath,
@@ -149,6 +150,7 @@ test('capture and restore recover an additional host settings file', () => {
             ...process.env,
             CDE_INSTALL_PSTACK: '0',
             CDE_INSTALL_USAGE_WRAPUP: '0',
+            CDE_INSTALL_SUBAGENT_MODELS: '0',
             HOME: box.root,
             USERPROFILE: box.root,
             GIT_CONFIG_GLOBAL: gitConfigPath,
@@ -184,6 +186,7 @@ test('runWithInstallTransaction restores prior state on injected fault', () => {
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
         HOME: box.root,
         USERPROFILE: box.root,
         GIT_CONFIG_GLOBAL: gitConfigPath,
@@ -238,6 +241,7 @@ test('runWithInstallTransaction commits and discards journal on success', () =>
             ...process.env,
             CDE_INSTALL_PSTACK: '0',
             CDE_INSTALL_USAGE_WRAPUP: '0',
+            CDE_INSTALL_SUBAGENT_MODELS: '0',
             HOME: box.root,
             USERPROFILE: box.root,
             GIT_CONFIG_GLOBAL: gitConfigPath,
@@ -281,6 +285,7 @@ function runInstaller(homeDirectory, extraArguments, options = {}) {
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
         HOME: homeDirectory,
         USERPROFILE: homeDirectory,
         GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),
@@ -316,6 +321,7 @@ test('a later install fault removes newly seeded Codex pstack files', () => {
             environment: {
                 CDE_INSTALL_PSTACK: '1',
                 CDE_INSTALL_USAGE_WRAPUP: '0',
+                CDE_INSTALL_SUBAGENT_MODELS: '0',
                 CDE_CODEX_EXECUTABLE: codexCommandPath,
             },
         });
@@ -459,6 +465,7 @@ test('installer fault after_git_config restores prior core.hooksPath', () => {
                 ...process.env,
                 CDE_INSTALL_PSTACK: '0',
                 CDE_INSTALL_USAGE_WRAPUP: '0',
+                CDE_INSTALL_SUBAGENT_MODELS: '0',
                 HOME: homeDirectory,
                 USERPROFILE: homeDirectory,
                 GIT_CONFIG_GLOBAL: gitConfigPath,
@@ -476,6 +483,7 @@ test('installer fault after_git_config restores prior core.hooksPath', () => {
                 ...process.env,
                 CDE_INSTALL_PSTACK: '0',
                 CDE_INSTALL_USAGE_WRAPUP: '0',
+                CDE_INSTALL_SUBAGENT_MODELS: '0',
                 HOME: homeDirectory,
                 USERPROFILE: homeDirectory,
                 GIT_CONFIG_GLOBAL: gitConfigPath,

package/bin/install.uninstall-transaction.test.mjs

@@ -73,6 +73,7 @@ function runInstaller(homeDirectory, extraArguments, options = {}) {
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
         HOME: homeDirectory,
         USERPROFILE: homeDirectory,
         GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),
@@ -307,6 +308,7 @@ test('uninstall fault after_git_config restores prior core.hooksPath', () => {
                 ...process.env,
                 CDE_INSTALL_PSTACK: '0',
                 CDE_INSTALL_USAGE_WRAPUP: '0',
+                CDE_INSTALL_SUBAGENT_MODELS: '0',
                 HOME: homeDirectory,
                 USERPROFILE: homeDirectory,
                 GIT_CONFIG_GLOBAL: gitConfigPath,

package/bin/install.update-keeps-hooks.test.mjs

@@ -24,6 +24,7 @@ function installerEnvironment(homeDirectory) {
         ...process.env,
         CDE_INSTALL_PSTACK: '0',
         CDE_INSTALL_USAGE_WRAPUP: '0',
+        CDE_INSTALL_SUBAGENT_MODELS: '0',
         HOME: homeDirectory,
         USERPROFILE: homeDirectory,
         GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "claude-dev-env",
-    "version": "8.51.4",
+    "version": "8.52.1",
     "description": "Claude Code development standards — rules, hooks, agents, commands, and skills",
     "type": "module",
     "bin": {

package/scripts/account_broker_support.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import dataclasses
 import errno
+import importlib
 import json
 import os
 import shutil
@@ -63,6 +64,16 @@ from dev_env_scripts_constants.codex_account_constants import (
     WEEKLY_WINDOW_MINUTES,
 )
 from dev_env_scripts_constants.shared_tree_constants import CLAUDE_CONFIG_DIR_ENV_VAR
+from shared_tree_paths import resolve_shared_process_tree_scripts_directory
+
+_shared_process_tree_scripts_directory = resolve_shared_process_tree_scripts_directory(
+    __file__,
+    all_environment=os.environ,
+)
+if str(_shared_process_tree_scripts_directory) not in sys.path:
+    sys.path.insert(0, str(_shared_process_tree_scripts_directory))
+
+_process_tree_kill = importlib.import_module("process_tree_kill")
 
 
 def _read_list(path: Path) -> object:
@@ -492,21 +503,26 @@ def _run_captured_subprocess(all_argv: Sequence[str], **options: object) -> subp
     errors = str(options.get("errors") or "replace")
     stdin_bytes = options.get("input")
     with tempfile.TemporaryFile() as stdout_file, tempfile.TemporaryFile() as stderr_file:
-        completion = subprocess.run(
+        with subprocess.Popen(
             _resolve_command(all_argv),
-            input=stdin_bytes,
+            stdin=subprocess.PIPE if stdin_bytes is not None else None,
             stdout=stdout_file,
             stderr=stderr_file,
             env=options.get("env"),
             cwd=options.get("cwd"),
-            timeout=options.get("timeout"),
-            check=False,
-        )
+            start_new_session=_process_tree_kill.should_start_new_session(),
+        ) as process:
+            try:
+                process.communicate(input=stdin_bytes, timeout=options.get("timeout"))
+            except (subprocess.TimeoutExpired, KeyboardInterrupt):
+                _process_tree_kill.terminate_process_tree(process)
+                process.wait()
+                raise
         stdout_file.seek(0)
         stderr_file.seek(0)
         stdout = stdout_file.read().decode(encoding, errors).replace("\r\n", "\n").replace("\r", "\n")
         stderr = stderr_file.read().decode(encoding, errors).replace("\r\n", "\n").replace("\r", "\n")
-    return subprocess.CompletedProcess(list(all_argv), completion.returncode, stdout, stderr)
+    return subprocess.CompletedProcess(list(all_argv), process.returncode, stdout, stderr)
 
 
 subprocess_runner: SubprocessRunner = _run_captured_subprocess