claude-dev-env 8.89.0 → 8.90.0

package/bin/codex-skill-load-block.mjs

@@ -9,14 +9,6 @@ export const QUESTION_PRESENTATION_BLOCK_START = '<!-- claude-dev-env question p
 export const QUESTION_PRESENTATION_BLOCK_END = '<!-- claude-dev-env question presentation: end -->';
 export const DEEPEN_GUIDANCE_BLOCK_START = '<!-- claude-dev-env deepen: start -->';
 export const DEEPEN_GUIDANCE_BLOCK_END = '<!-- claude-dev-env deepen: end -->';
-export const DEEPEN_GUIDANCE_TEXT = [
-    'Deepen the first interactive user task before any work starts.',
-    'Follow DeepStack intake. Write SCOPE (role), EXAMPLES (illustration only), and ZOOM-IN BLOCKER before any plan.',
-    'The worker prompt carries the marker CDE_DEEPEN:v1 on line 1 and the SCOPE (role) line.',
-    'On demand, follow the DeepStack skill or /deepen with a task.',
-    'Cursor Cloud registers the DeepStack SessionStart hook and the first-task gate. Use DeepStack intake on the launch prompt.',
-    'Codex cloud orchestration skips command hooks. This block is the local Codex instruction.',
-].join('\n');
 
 const WINDOWS_LONG_PATH_PREFIX = '\\\\?\\';
 
@@ -124,23 +116,6 @@ export function writeCodexPackageGuidance(codexHome, packageGuidanceText, allPac
     );
 }
 
-export function writeCodexDeepenGuidance(codexHome, deepenText = DEEPEN_GUIDANCE_TEXT) {
-    const agentsPath = join(codexHome, 'AGENTS.md');
-    const agentsEntry = lstatSync(agentsPath, { throwIfNoEntry: false });
-    if (agentsEntry && !agentsEntry.isFile()) return null;
-    const currentText = agentsEntry ? readFileSync(agentsPath, 'utf8') : '';
-    const block = managedBlock(DEEPEN_GUIDANCE_BLOCK_START, deepenText, DEEPEN_GUIDANCE_BLOCK_END);
-    const replacedText = withBlockReplaced(
-        currentText, DEEPEN_GUIDANCE_BLOCK_START, DEEPEN_GUIDANCE_BLOCK_END, block,
-    );
-    const separator = currentText && !currentText.endsWith('\n') ? '\n' : '';
-    const updatedText = replacedText ?? `${currentText}${separator}${block}`;
-    if (updatedText === currentText) return null;
-    mkdirSync(codexHome, { recursive: true });
-    writeFileSync(agentsPath, updatedText, 'utf8');
-    return agentsPath;
-}
-
 export function writeCodexQuestionGuidance(codexHome, policyText) {
     const agentsPath = join(codexHome, 'AGENTS.md');
     const agentsEntry = lstatSync(agentsPath, { throwIfNoEntry: false });

package/bin/codex-skill-load-block.test.mjs

@@ -16,9 +16,7 @@ import {
     withoutSkillLoadBlock,
     DEEPEN_GUIDANCE_BLOCK_END,
     DEEPEN_GUIDANCE_BLOCK_START,
-    DEEPEN_GUIDANCE_TEXT,
     writeCodexAgentsGuidance,
-    writeCodexDeepenGuidance,
     writeCodexPackageGuidance,
     writeCodexQuestionGuidance,
 } from './codex-skill-load-block.mjs';
@@ -28,6 +26,7 @@ const STALE_SKILL_LOAD_SENTENCE = 'Load the pstack:poteto-mode skill before your
     + 'including a helper started with spawn_agent, whatever its task message says.';
 const STALE_SKILL_LOAD_BLOCK = `${SKILL_LOAD_BLOCK_START}\n${STALE_SKILL_LOAD_SENTENCE}\n${SKILL_LOAD_BLOCK_END}\n`;
 const PACKAGE_GUIDANCE = 'Status\n\nChanged / proof / blocked.\n';
+const RETIRED_DEEPEN_BLOCK = `${DEEPEN_GUIDANCE_BLOCK_START}\nDeepen the first interactive user task.\n${DEEPEN_GUIDANCE_BLOCK_END}\n`;
 const QUESTION_POLICY = '# Present questions clearly\n\nAsk one question.\n';
 
 function guidanceBlock(guidanceText) {
@@ -109,7 +108,7 @@ test('a stale skill-load sentence is removed and question and deepen blocks stay
     const homes = makeHomes(context);
     mkdirSync(homes.codexHome);
     const questionBlock = `${QUESTION_PRESENTATION_BLOCK_START}\n${QUESTION_POLICY}${QUESTION_PRESENTATION_BLOCK_END}\n`;
-    const deepenBlock = `${DEEPEN_GUIDANCE_BLOCK_START}\n${DEEPEN_GUIDANCE_TEXT}\n${DEEPEN_GUIDANCE_BLOCK_END}\n`;
+    const deepenBlock = RETIRED_DEEPEN_BLOCK;
     writeFileSync(
         homes.agentsPath,
         `${STALE_SKILL_LOAD_BLOCK}\n${guidanceBlock('Old guidance\n')}${questionBlock}${deepenBlock}`,
@@ -397,24 +396,13 @@ test('question removal leaves a missing guidance file absent', (context) => {
     assert.equal(lstatSync(homes.agentsPath, { throwIfNoEntry: false }), undefined);
 });
 
-test('should write the deepen block into Codex AGENTS.md', (context) => {
-    const homes = makeHomes(context);
-
-    assert.equal(writeCodexDeepenGuidance(homes.codexHome), homes.agentsPath);
-    const guidanceText = readFileSync(homes.agentsPath, 'utf8');
-    assert.ok(guidanceText.includes(DEEPEN_GUIDANCE_BLOCK_START));
-    assert.ok(guidanceText.includes(DEEPEN_GUIDANCE_BLOCK_END));
-    assert.ok(guidanceText.includes(DEEPEN_GUIDANCE_TEXT.split('\n')[0]));
-    assert.equal(writeCodexDeepenGuidance(homes.codexHome), null);
-});
-
-test('should restore the custom guidance bytes when the deepen block is removed', (context) => {
+test('should restore the custom guidance bytes when a retired deepen block is removed', (context) => {
     const homes = makeHomes(context);
     mkdirSync(homes.codexHome);
     const customGuidance = '# My notes\n\nKeep this line.\n';
-    writeFileSync(homes.agentsPath, customGuidance);
+    writeFileSync(homes.agentsPath, `${customGuidance}${RETIRED_DEEPEN_BLOCK}`);
 
-    assert.equal(writeCodexDeepenGuidance(homes.codexHome), homes.agentsPath);
     assert.equal(removeCodexDeepenGuidance(homes.codexHome), homes.agentsPath);
     assert.equal(readFileSync(homes.agentsPath, 'utf8'), customGuidance);
+    assert.equal(removeCodexDeepenGuidance(homes.codexHome), null);
 });

package/bin/codex-trimmed-sol.test.mjs

@@ -35,7 +35,6 @@ function installInScratchHome(homeDirectory, argumentsList = [], environment = {
             CDE_INSTALL_DEEPSTACK: '0',
             CDE_INSTALL_USAGE_WRAPUP: '0',
             CDE_INSTALL_SUBAGENT_MODELS: '0',
-            CDE_INSTALL_DEEPEN_FIRST_PROMPT: '0',
             CLAUDE_DEV_ENV_INSTALL_FAULT: undefined,
             HOME: homeDirectory,
             USERPROFILE: homeDirectory,

package/bin/cursor-native-hooks.test.mjs

@@ -17,10 +17,10 @@ const LEGACY_SESSION_GROUP = {
 };
 const LEGACY_PROMPT_GROUP = {
     matcher: '',
-    hooks: [{ type: 'command', command: 'python3 /home/dev/.agents/hooks/session/deepen_first_prompt.py', timeout: 10 }],
+    hooks: [{ type: 'command', command: 'python3 /home/dev/.agents/hooks/session/first_prompt_gate.py', timeout: 10 }],
 };
 const USER_TOOL_GROUP = { matcher: 'Shell', hooks: [{ type: 'command', command: './audit.sh' }] };
-const isOwned = command => command.includes('plugins/deepstack/hooks/session-start.') || command.includes('deepen_first_prompt.py');
+const isOwned = command => command.includes('plugins/deepstack/hooks/session-start.') || command.includes('first_prompt_gate.py');
 
 test('Claude-style groups become flat native entries under the Cursor event names', () => {
     const native = nativeCursorHooksConfiguration({
@@ -54,7 +54,7 @@ test('owned entries collapse to one copy and removal drops only owned entries',
     };
     const ownedEntries = {
         sessionStart: [{ command: "'/home/dev/.cursor/plugins/deepstack/hooks/session-start.sh' cursor", timeout: 10 }],
-        beforeSubmitPrompt: [{ command: 'python3 /home/dev/.agents/hooks/session/deepen_first_prompt.py', timeout: 10 }],
+        beforeSubmitPrompt: [{ command: 'python3 /home/dev/.agents/hooks/session/first_prompt_gate.py', timeout: 10 }],
     };
     const merged = withOwnedCursorHooks(legacyFile, isOwned, ownedEntries);
     assert.deepEqual(merged.hooks, { ...ownedEntries, stop: [{ command: './user-stop.sh' }] });

package/bin/ever-shipped-skills.mjs

@@ -79,6 +79,7 @@ export const EVER_SHIPPED_SKILL_NAMES = new Set([
     'pull-request',
     'pre-compact',
     'privacy-hygiene',
+    'pr-visual',
     'prototype',
     'prompt-generator',
     'qbug',

package/bin/install-deepstack-plugin.mjs

@@ -1,5 +1,5 @@
 import { spawnSync } from 'node:child_process';
-import { cpSync, existsSync, mkdirSync, mkdtempSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
+import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import {
@@ -8,8 +8,8 @@ import {
     shouldInstallMarketplacePlugin,
 } from './install-pstack-plugin.mjs';
 import {
-    CURSOR_BEFORE_SUBMIT_PROMPT_EVENT,
     CURSOR_HOOK_TIMEOUT_SECONDS,
+    CURSOR_HOOKS_FILE_NAME,
     CURSOR_SESSION_START_EVENT,
 } from './install-constants.mjs';
 import { updateCursorHooksFile, withOwnedCursorHooks, withoutOwnedCursorHooks } from './cursor-native-hooks.mjs';
@@ -32,8 +32,8 @@ export const DEEPSTACK_SESSION_POWERSHELL_RELATIVE_PATH = 'hooks/session-start.p
 export const DEEPSTACK_CURSOR_SESSION_COMMAND_MARKER = 'plugins/deepstack/hooks/session-start.';
 export const DEEPSTACK_SESSION_RUNTIME = 'cursor';
 const WINDOWS_POWERSHELL_FILE_PREFIX = 'powershell -NoProfile -ExecutionPolicy Bypass -File';
-const DEFAULT_PYTHON_COMMAND = 'python3';
-export const DEEPSTACK_FIRST_TASK_HOOK_NAME = 'deepen_first_prompt.py';
+/** Script name of the retired first-task hook that earlier installs registered in Cursor. */
+export const RETIRED_CURSOR_FIRST_TASK_HOOK_NAME = 'deepen_first_prompt.py';
 export const DEEPSTACK_CODEX_MODEL_SHEET_NAME = 'deepstack-models.md';
 
 export const DEEPSTACK_PLUGIN_SPEC = Object.freeze({
@@ -62,14 +62,13 @@ function quoteCommandPath(pathValue) {
  * Read the Claude, Codex, and Cursor actions one DeepStack install performs.
  *
  * Claude and Codex use the marketplace verbs. Cursor has no plugin command, so
- * its action is a copy into the Cursor home plus two native hook registrations.
+ * its action is a copy into the Cursor home plus one native session hook.
  *
  * @returns {{claude: object, codex: object, cursor: {
  *   pluginDirectoryName: string,
  *   skillRelativePath: string,
  *   sessionScriptRelativePath: string,
  *   sessionRuntimeArgument: string,
- *   firstTaskHookName: string,
  * }}} The three host actions.
  */
 export function deepStackInstallPlan() {
@@ -81,7 +80,6 @@ export function deepStackInstallPlan() {
             skillRelativePath: DEEPSTACK_SKILL_RELATIVE_PATH,
             sessionScriptRelativePath: DEEPSTACK_SESSION_SCRIPT_RELATIVE_PATH,
             sessionRuntimeArgument: DEEPSTACK_SESSION_RUNTIME,
-            firstTaskHookName: DEEPSTACK_FIRST_TASK_HOOK_NAME,
         },
     };
 }
@@ -142,33 +140,36 @@ export function resolveDeepStackPluginSource(options = {}) {
 /**
  * True for a Cursor hook command the DeepStack install owns.
  *
+ * The retired first-task hook counts as owned, so the merge and the removal
+ * both strip the entry an earlier install registered.
+ *
  * @param {string} forwardSlashedCommand A hook command with forward slashes.
- * @returns {boolean} True for the DeepStack session hook or the first-task hook.
+ * @returns {boolean} True for the DeepStack session hook or the retired first-task hook.
  */
 export function isDeepStackCursorCommand(forwardSlashedCommand) {
     return forwardSlashedCommand.includes(DEEPSTACK_CURSOR_SESSION_COMMAND_MARKER)
-        || forwardSlashedCommand.includes(DEEPSTACK_FIRST_TASK_HOOK_NAME);
+        || forwardSlashedCommand.includes(RETIRED_CURSOR_FIRST_TASK_HOOK_NAME);
 }
 
 /**
- * Return the native Cursor configuration with one DeepStack session entry and one first-task entry.
+ * Return the native Cursor configuration with one DeepStack session entry.
  *
- * Earlier installs wrote these as Claude-style groups, which Cursor never ran;
- * every owned copy, old or new, is replaced by one native entry each.
+ * Earlier installs wrote the session entry as a Claude-style group, which
+ * Cursor never ran, and also registered the retired first-task hook. Every
+ * owned entry, old or new, is replaced by one native session entry.
  *
  * @param {object} configuration The parsed Cursor hooks file.
- * @param {{sessionCommand: string, firstTaskCommand: string}} commands The two commands.
- * @returns {object} The configuration with both native entries present once.
+ * @param {{sessionCommand: string}} commands The session command.
+ * @returns {object} The configuration with the session entry present once.
  */
 export function mergeDeepStackCursorHooks(configuration, commands) {
     return withOwnedCursorHooks(configuration, isDeepStackCursorCommand, {
         [CURSOR_SESSION_START_EVENT]: [{ command: commands.sessionCommand, timeout: CURSOR_HOOK_TIMEOUT_SECONDS }],
-        [CURSOR_BEFORE_SUBMIT_PROMPT_EVENT]: [{ command: commands.firstTaskCommand, timeout: CURSOR_HOOK_TIMEOUT_SECONDS }],
     });
 }
 
 /**
- * Remove the DeepStack session and first-task entries from the Cursor hooks file.
+ * Remove the DeepStack session entry and the retired first-task entry from the Cursor hooks file.
  *
  * @param {string} cursorDirectory The Cursor home.
  * @returns {string|null} The hooks.json path when this call changed it.
@@ -180,6 +181,30 @@ export function removeDeepStackCursorHooks(cursorDirectory) {
     );
 }
 
+/**
+ * Remove the retired first-task entry from the Cursor hooks file.
+ *
+ * A full install runs this whether or not it installs DeepStack, so an install
+ * that opts out of DeepStack still drops the entry an earlier install wrote.
+ * A hooks file that never names the retired script is left byte for byte.
+ *
+ * @param {string} cursorDirectory The Cursor home.
+ * @returns {string|null} The hooks.json path when this call changed it.
+ */
+export function removeRetiredCursorFirstTaskHook(cursorDirectory) {
+    if (!cursorDirectory) return null;
+    const hooksPath = join(cursorDirectory, CURSOR_HOOKS_FILE_NAME);
+    if (!existsSync(hooksPath)) return null;
+    if (!readFileSync(hooksPath, 'utf8').includes(RETIRED_CURSOR_FIRST_TASK_HOOK_NAME)) return null;
+    return updateCursorHooksFile(
+        cursorDirectory,
+        configuration => withoutOwnedCursorHooks(
+            configuration,
+            forwardSlashedCommand => forwardSlashedCommand.includes(RETIRED_CURSOR_FIRST_TASK_HOOK_NAME),
+        ),
+    );
+}
+
 /**
  * Build the Cursor command for the DeepStack session script.
  *
@@ -201,13 +226,11 @@ export function deepStackCursorSessionCommand(pluginDirectory, formatPathArgumen
 }
 
 /**
- * Copy the plugin into the Cursor home and register both hooks in Cursor's native format.
+ * Copy the plugin into the Cursor home and register its session hook in Cursor's native format.
  *
  * @param {object} options Copy inputs.
  * @param {string} options.cursorDirectory The Cursor home, usually ~/.cursor.
  * @param {string|null} options.pluginSourceDirectory The plugin tree to copy.
- * @param {string} options.firstTaskHookPath Absolute path of deepen_first_prompt.py.
- * @param {string} [options.pythonCommand] The interpreter the installer detected.
  * @param {(pathValue: string) => string} [options.formatPathArgument] The platform path quoting.
  * @param {string} [options.platform] The Node platform name.
  * @returns {{status: string, pluginDirectory: string|null, hooksPath: string|null, warning: string|null}} The outcome.
@@ -229,10 +252,8 @@ export function installDeepStackCursor(options) {
     mkdirSync(options.cursorDirectory, { recursive: true });
     cpSync(options.pluginSourceDirectory, pluginDirectory, { recursive: true, force: true });
     const formatPathArgument = options.formatPathArgument ?? quoteCommandPath;
-    const pythonCommand = options.pythonCommand ?? DEFAULT_PYTHON_COMMAND;
     const commands = {
         sessionCommand: deepStackCursorSessionCommand(pluginDirectory, formatPathArgument, options.platform ?? process.platform),
-        firstTaskCommand: `${pythonCommand} ${formatPathArgument(options.firstTaskHookPath)}`,
     };
     updateCursorHooksFile(
         options.cursorDirectory,
@@ -263,8 +284,6 @@ export function seedCodexDeepStackModels(codexHome) {
  * @param {string} [options.claudeRoot] The managed Claude root.
  * @param {string} [options.codexHome] The Codex home.
  * @param {string} [options.cursorDirectory] The Cursor home.
- * @param {string} [options.firstTaskHookPath] Absolute path of the hook the first-task command runs.
- * @param {string} [options.pythonCommand] The interpreter the installer detected.
  * @param {(pathValue: string) => string} [options.formatPathArgument] The platform path quoting.
  * @param {string} [options.sourceDirectory] A local plugin tree for the Cursor copy.
  * @param {string[]} [options.argumentList] Command-line arguments, for the opt-out flag.
@@ -307,8 +326,6 @@ export function installDeepStackForHosts(options = {}, dependencies = {}) {
         cursor = installDeepStackCursor({
             cursorDirectory: options.cursorDirectory,
             pluginSourceDirectory: sourceDirectory,
-            firstTaskHookPath: options.firstTaskHookPath,
-            pythonCommand: options.pythonCommand,
             formatPathArgument: options.formatPathArgument,
         });
     } finally {

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

@@ -15,6 +15,7 @@ import {
     installDeepStackForHosts,
     mergeDeepStackCursorHooks,
     removeDeepStackCursorHooks,
+    removeRetiredCursorFirstTaskHook,
 } from './install-deepstack-plugin.mjs';
 import { marketplacePluginsPlan, shouldInstallMarketplacePlugin } from './install-pstack-plugin.mjs';
 
@@ -31,23 +32,23 @@ test('Claude and Codex plans name jl-cmd-projects/DeepStack', () => {
     assert.equal(DEEPSTACK_MARKETPLACE_REPOSITORY, 'jl-cmd-projects/DeepStack');
     assert.equal(deepStackCloneUrl(), 'https://github.com/jl-cmd-projects/DeepStack.git');
     assert.equal(plan.cursor.skillRelativePath, 'skills/deepstack-mode/SKILL.md');
-    assert.equal(plan.cursor.firstTaskHookName, 'deepen_first_prompt.py');
+    assert.equal('firstTaskHookName' in plan.cursor, false);
     assert.throws(() => marketplacePluginsPlan([DEEPSTACK_PLUGIN_SPEC], 'cursor'), /cursor/);
 });
 
-test('cursor hooks are one native sessionStart entry and one native beforeSubmitPrompt entry', () => {
+test('cursor hooks are one native sessionStart entry and the retired first-task entry is dropped', () => {
     const legacySessionGroup = {
         matcher: 'startup|resume|clear|compact',
         hooks: [{ type: 'command', command: "'C:\\Users\\dev\\.cursor\\plugins\\deepstack\\hooks\\session-start.sh' cursor" }],
     };
     const commands = {
         sessionCommand: "'/cursor/plugins/deepstack/hooks/session-start.sh' cursor",
-        firstTaskCommand: "python3 '/claude/hooks/session/deepen_first_prompt.py'",
     };
     const merged = mergeDeepStackCursorHooks({
         hooks: {
             SessionStart: [legacySessionGroup, legacySessionGroup, legacySessionGroup],
             UserPromptSubmit: [{ matcher: '', hooks: [{ type: 'command', command: 'python3 /old/deepen_first_prompt.py', timeout: 10 }] }],
+            beforeSubmitPrompt: [{ command: "python3 '/claude/hooks/session/deepen_first_prompt.py'", timeout: 10 }],
             preToolUse: [],
         },
     }, commands);
@@ -55,7 +56,6 @@ test('cursor hooks are one native sessionStart entry and one native beforeSubmit
         version: 1,
         hooks: {
             sessionStart: [{ command: commands.sessionCommand, timeout: 10 }],
-            beforeSubmitPrompt: [{ command: commands.firstTaskCommand, timeout: 10 }],
             preToolUse: [],
         },
     });
@@ -75,7 +75,7 @@ test('the Windows session command runs the PowerShell script, other platforms th
     }
 });
 
-test('the cursor copy writes the skill and both native hook commands, and removal takes out only those', () => {
+test('the cursor copy writes the skill and the native session hook, and removal takes out only that', () => {
     const root = mkdtempSync(join(tmpdir(), 'deepstack-cursor-'));
     try {
         const source = join(root, 'source');
@@ -89,8 +89,6 @@ test('the cursor copy writes the skill and both native hook commands, and remova
         const outcome = installDeepStackCursor({
             cursorDirectory,
             pluginSourceDirectory: source,
-            firstTaskHookPath: join(root, '.agents', 'hooks', 'session', 'deepen_first_prompt.py'),
-            pythonCommand: '/usr/bin/python3.12',
             platform: 'linux',
         });
         assert.equal(outcome.status, 'installed');
@@ -102,7 +100,7 @@ test('the cursor copy writes the skill and both native hook commands, and remova
         assert.equal(hooks.version, 1);
         assert.equal(hooks.hooks.sessionStart.length, 1);
         assert.match(hooks.hooks.sessionStart[0].command, /session-start\.sh' cursor$/);
-        assert.match(hooks.hooks.beforeSubmitPrompt[0].command, /^\/usr\/bin\/python3\.12 '.*deepen_first_prompt\.py'$/);
+        assert.equal(hooks.hooks.beforeSubmitPrompt, undefined);
         removeDeepStackCursorHooks(cursorDirectory);
         assert.deepEqual(
             JSON.parse(readFileSync(join(cursorDirectory, 'hooks.json'), 'utf8')),
@@ -113,11 +111,41 @@ test('the cursor copy writes the skill and both native hook commands, and remova
     }
 });
 
+test('the retired first-task entry leaves the Cursor hooks file and every other entry stays', () => {
+    const root = mkdtempSync(join(tmpdir(), 'deepstack-cursor-'));
+    try {
+        const hooksPath = join(root, 'hooks.json');
+        writeFileSync(hooksPath, JSON.stringify({
+            version: 1,
+            hooks: {
+                beforeSubmitPrompt: [
+                    { command: "python3 '/home/dev/.claude/hooks/session/deepen_first_prompt.py'", timeout: 10 },
+                    { command: './user-prompt.sh' },
+                ],
+                stop: [{ command: './user-stop.sh' }],
+            },
+        }));
+        assert.equal(removeRetiredCursorFirstTaskHook(root), hooksPath);
+        assert.deepEqual(JSON.parse(readFileSync(hooksPath, 'utf8')), {
+            version: 1,
+            hooks: {
+                beforeSubmitPrompt: [{ command: './user-prompt.sh' }],
+                stop: [{ command: './user-stop.sh' }],
+            },
+        });
+        const cleanText = readFileSync(hooksPath, 'utf8');
+        assert.equal(removeRetiredCursorFirstTaskHook(root), null);
+        assert.equal(readFileSync(hooksPath, 'utf8'), cleanText);
+        assert.equal(removeRetiredCursorFirstTaskHook(join(root, 'absent')), null);
+    } finally {
+        rmSync(root, { recursive: true, force: true });
+    }
+});
+
 test('a missing plugin tree fails the cursor copy', () => {
     const outcome = installDeepStackCursor({
         cursorDirectory: '/tmp/unused-cursor',
         pluginSourceDirectory: null,
-        firstTaskHookPath: '/tmp/deepen_first_prompt.py',
     });
     assert.equal(outcome.status, 'failed');
     assert.match(outcome.warning, /jl-cmd-projects\/DeepStack/);
@@ -162,7 +190,6 @@ test('the temporary clone is removed once the Cursor copy is written', () => {
             claudeRoot: join(root, 'claude'),
             codexHome: join(root, 'codex'),
             cursorDirectory,
-            firstTaskHookPath: join(root, 'hooks', 'deepen_first_prompt.py'),
             environment: {},
             cloneParentDirectory,
         }, {
@@ -190,7 +217,6 @@ test('a failed clone leaves no temporary folder behind', () => {
             claudeRoot: join(root, 'claude'),
             codexHome: join(root, 'codex'),
             cursorDirectory: join(root, 'cursor'),
-            firstTaskHookPath: join(root, 'hooks', 'deepen_first_prompt.py'),
             environment: {},
             cloneParentDirectory,
         }, { runCommand: absentHostRunner, cloneRepository: () => null });

package/bin/install-pstack-plugin.mjs

@@ -35,17 +35,17 @@ export const USAGE_WRAPUP_PLUGIN_SPEC = Object.freeze({
     optOutVariable: 'CDE_INSTALL_USAGE_WRAPUP',
 });
 
-export const DEEPEN_FIRST_PROMPT_PLUGIN_SPEC = Object.freeze({
-    name: 'deepen-first-prompt',
-    label: 'Deepen-first-prompt',
-    marketplaceRepository: 'jl-cmd-projects/claude-dev-env',
-    marketplaceName: 'claude-dev-env',
-    sparsePaths: Object.freeze(['.claude-plugin', 'packages/deepen-first-prompt']),
-    pluginIdentifier: 'deepen-first-prompt@claude-dev-env',
-    hosts: Object.freeze(['claude']),
-    optOutFlag: '--no-deepen-first-prompt',
-    optOutVariable: 'CDE_INSTALL_DEEPEN_FIRST_PROMPT',
-});
+/**
+ * Plugins this installer used to install and now removes from each Claude home
+ * that still holds them, so an update leaves none behind.
+ */
+export const ALL_RETIRED_PLUGIN_SPECS = Object.freeze([
+    Object.freeze({
+        name: 'deepen-first-prompt',
+        marketplaceName: 'claude-dev-env',
+        pluginIdentifier: 'deepen-first-prompt@claude-dev-env',
+    }),
+]);
 
 export const SUBAGENT_MODELS_PLUGIN_SPEC = Object.freeze({
     name: 'subagent-models',
@@ -341,3 +341,50 @@ export function installMarketplacePlugins(allSpecs, options = {}, dependencies =
     const warnings = hostOutcomes.map(outcome => outcome.warning).filter(Boolean);
     return { status, hosts: hostOutcomes, warning: warnings.join(' ') || null };
 }
+
+/**
+ * Uninstall each retired plugin a Claude home still holds.
+ *
+ * A home holds a retired plugin when its plugin cache has a folder for it. For
+ * each such plugin the step runs `claude plugin uninstall` and then deletes
+ * the cached versions Claude Code marked as orphaned. A home with no cached
+ * folder runs no command, so a fresh install and a second update both leave
+ * the home as it stands. A missing `claude` command skips the step. A failed
+ * uninstall is recorded in `failedRemovals` with its detail, and its cached
+ * versions stay on disk.
+ *
+ * @param {ReadonlyArray<{name: string, marketplaceName: string, pluginIdentifier: string}>} allRetiredSpecs The retired plugins.
+ * @param {object} options Removal targets.
+ * @param {string|undefined} options.claudeRoot The managed Claude root.
+ * @param {Record<string, string|undefined>} [options.environment] The process environment.
+ * @param {object} [dependencies] Seams for the command runner.
+ * @returns {{removedIdentifiers: string[], removedVersionPaths: string[], failedRemovals: Array<{pluginIdentifier: string, detail: string}>}} What the step removed and what it could not.
+ */
+export function removeRetiredMarketplacePlugins(allRetiredSpecs, options, dependencies = {}) {
+    const environment = options.environment ?? process.env;
+    const runCommand = dependencies.runCommand ?? runHostCommand;
+    const hostDefinition = HOST_DEFINITIONS.claude;
+    const executable = environment[hostDefinition.executableVariable] || hostDefinition.executable;
+    const removedIdentifiers = [];
+    const removedVersionPaths = [];
+    const failedRemovals = [];
+    if (!options.claudeRoot) return { removedIdentifiers, removedVersionPaths, failedRemovals };
+    for (const eachSpec of allRetiredSpecs) {
+        const versionsDirectory = hostDefinition.orphanedVersionsDirectory(options.claudeRoot, eachSpec);
+        if (!existsSync(versionsDirectory)) continue;
+        const outcome = runCommand(
+            executable,
+            ['plugin', hostDefinition.uninstallVerb, eachSpec.pluginIdentifier],
+            { environment: { [hostDefinition.homeVariable]: options.claudeRoot } },
+        );
+        if (namesAnAbsentCommand(outcome)) break;
+        if (outcome.status !== 0 || outcome.error) {
+            const detail = singleLineDetail(outcome.stderr) || outcome.error?.message || `exit ${outcome.status}`;
+            failedRemovals.push({ pluginIdentifier: eachSpec.pluginIdentifier, detail });
+            continue;
+        }
+        removedIdentifiers.push(eachSpec.pluginIdentifier);
+        removedVersionPaths.push(...removeOrphanedPluginVersions(versionsDirectory));
+    }
+    return { removedIdentifiers, removedVersionPaths, failedRemovals };
+}

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

@@ -1,13 +1,13 @@
 import { test } from 'node:test';
 import { strict as assert } from 'node:assert';
-import { existsSync, mkdirSync, mkdtempSync, readFileSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import {
     PSTACK_MARKETPLACE_REPOSITORY,
     PSTACK_PLUGIN_HOSTS,
     PSTACK_PLUGIN_IDENTIFIER,
-    DEEPEN_FIRST_PROMPT_PLUGIN_SPEC,
+    ALL_RETIRED_PLUGIN_SPECS,
     PSTACK_PLUGIN_SPEC,
     SUBAGENT_MODELS_PLUGIN_SPEC,
     USAGE_WRAPUP_PLUGIN_SPEC,
@@ -15,6 +15,7 @@ import {
     installMarketplacePlugins,
     marketplacePluginsPlan,
     removeOrphanedPluginVersions,
+    removeRetiredMarketplacePlugins,
     shouldInstallMarketplacePlugin,
 } from './install-pstack-plugin.mjs';
 
@@ -301,7 +302,6 @@ test('the usage-wrapup opt-out flag and variable turn off only usage-wrapup', ()
 for (const [spec, packageFolder] of [
     [USAGE_WRAPUP_PLUGIN_SPEC, './packages/usage-wrapup'],
     [SUBAGENT_MODELS_PLUGIN_SPEC, './packages/subagent-models'],
-    [DEEPEN_FIRST_PROMPT_PLUGIN_SPEC, './packages/deepen-first-prompt'],
 ]) {
     test(`the repository marketplace lists ${spec.name} from its package folder in this repository`, () => {
         const marketplace = JSON.parse(readFileSync(
@@ -335,25 +335,58 @@ test('should remove and add the shared marketplace once when installing usage-wr
     ]);
 });
 
-test('should include deepen-first-prompt in one marketplace add with the other repository plugins', () => {
-    const plan = marketplacePluginsPlan(
-        [USAGE_WRAPUP_PLUGIN_SPEC, SUBAGENT_MODELS_PLUGIN_SPEC, DEEPEN_FIRST_PROMPT_PLUGIN_SPEC],
-        'claude',
-    );
-    assert.deepEqual(plan.commands[0], [
-        'plugin', 'marketplace', 'add', 'jl-cmd-projects/claude-dev-env',
-        '--sparse', '.claude-plugin', 'packages/usage-wrapup', 'packages/subagent-models',
-        'packages/deepen-first-prompt',
+test('the repository marketplace no longer lists a retired plugin', () => {
+    const marketplace = JSON.parse(readFileSync(
+        new URL('../../../.claude-plugin/marketplace.json', import.meta.url),
+        'utf8',
+    ));
+    const allListedNames = marketplace.plugins.map(plugin => plugin.name);
+    for (const eachRetiredSpec of ALL_RETIRED_PLUGIN_SPECS) {
+        assert.equal(allListedNames.includes(eachRetiredSpec.name), false, `${eachRetiredSpec.name} is retired`);
+    }
+    assert.deepEqual(ALL_RETIRED_PLUGIN_SPECS.map(spec => spec.pluginIdentifier), ['deepen-first-prompt@claude-dev-env']);
+});
+
+test('a Claude home that holds a retired plugin gets it uninstalled and its orphaned versions deleted', (context) => {
+    const claudeRoot = mkdtempSync(join(tmpdir(), 'retired-plugin-'));
+    context.after(() => rmSync(claudeRoot, { recursive: true, force: true }));
+    const versionsDirectory = join(claudeRoot, 'plugins', 'cache', 'claude-dev-env', 'deepen-first-prompt');
+    const orphanedVersion = join(versionsDirectory, '0.1.0');
+    mkdirSync(orphanedVersion, { recursive: true });
+    const runner = recordingRunner(() => {
+        writeFileSync(join(orphanedVersion, '.orphaned_at'), '1');
+        return { status: 0, stderr: '' };
+    });
+    const outcome = removeRetiredMarketplacePlugins(ALL_RETIRED_PLUGIN_SPECS, { claudeRoot, environment: {} }, runner);
+    assert.deepEqual(runner.calls.map(call => [call.executable, ...call.commandArguments]), [
+        ['claude', 'plugin', 'uninstall', 'deepen-first-prompt@claude-dev-env'],
     ]);
-    assert.equal(shouldInstallMarketplacePlugin(DEEPEN_FIRST_PROMPT_PLUGIN_SPEC, ['--no-deepen-first-prompt'], {}), false);
-    assert.equal(
-        shouldInstallMarketplacePlugin(
-            DEEPEN_FIRST_PROMPT_PLUGIN_SPEC,
-            [],
-            { CDE_INSTALL_DEEPEN_FIRST_PROMPT: '0' },
-        ),
-        false,
-    );
+    assert.deepEqual(runner.calls[0].environment, { CLAUDE_CONFIG_DIR: claudeRoot });
+    assert.deepEqual(outcome.removedIdentifiers, ['deepen-first-prompt@claude-dev-env']);
+    assert.equal(existsSync(orphanedVersion), false);
+});
+
+test('a Claude home with no retired plugin runs no command', (context) => {
+    const claudeRoot = mkdtempSync(join(tmpdir(), 'retired-plugin-'));
+    context.after(() => rmSync(claudeRoot, { recursive: true, force: true }));
+    const runner = recordingRunner();
+    const outcome = removeRetiredMarketplacePlugins(ALL_RETIRED_PLUGIN_SPECS, { claudeRoot, environment: {} }, runner);
+    assert.deepEqual(runner.calls, []);
+    assert.deepEqual(outcome, { removedIdentifiers: [], removedVersionPaths: [], failedRemovals: [] });
+});
+
+test('a failed retired plugin uninstall is reported as failed and keeps its cached versions', (context) => {
+    const claudeRoot = mkdtempSync(join(tmpdir(), 'retired-plugin-'));
+    context.after(() => rmSync(claudeRoot, { recursive: true, force: true }));
+    const cachedVersion = join(claudeRoot, 'plugins', 'cache', 'claude-dev-env', 'deepen-first-prompt', '0.1.0');
+    mkdirSync(cachedVersion, { recursive: true });
+    const runner = recordingRunner(() => ({ status: 1, stderr: 'Plugin not found\n' }));
+    const outcome = removeRetiredMarketplacePlugins(ALL_RETIRED_PLUGIN_SPECS, { claudeRoot, environment: {} }, runner);
+    assert.deepEqual(outcome.removedIdentifiers, []);
+    assert.deepEqual(outcome.failedRemovals, [
+        { pluginIdentifier: 'deepen-first-prompt@claude-dev-env', detail: 'Plugin not found' },
+    ]);
+    assert.equal(existsSync(cachedVersion), true);
 });
 
 test('should refuse one plan for plugins from two marketplaces', () => {

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

@@ -56,7 +56,6 @@ function runInstaller(homeDirectory, extraArguments, environmentOverrides = {})
         CDE_INSTALL_DEEPSTACK: '0',
         CDE_INSTALL_USAGE_WRAPUP: '0',
         CDE_INSTALL_SUBAGENT_MODELS: '0',
-        CDE_INSTALL_DEEPEN_FIRST_PROMPT: '0',
         HOME: homeDirectory,
         USERPROFILE: homeDirectory,
         GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),

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

@@ -62,7 +62,6 @@ function runInstaller(homeDirectory, extraArguments) {
             CDE_INSTALL_DEEPSTACK: '0',
             CDE_INSTALL_USAGE_WRAPUP: '0',
             CDE_INSTALL_SUBAGENT_MODELS: '0',
-            CDE_INSTALL_DEEPEN_FIRST_PROMPT: '0',
             HOME: homeDirectory,
             USERPROFILE: homeDirectory,
             GIT_CONFIG_GLOBAL: join(homeDirectory, '.gitconfig'),
@@ -96,7 +95,6 @@ function scanTextWithProductionPiiScanner(scannedText) {
                     CDE_INSTALL_DEEPSTACK: '0',
                     CDE_INSTALL_USAGE_WRAPUP: '0',
                     CDE_INSTALL_SUBAGENT_MODELS: '0',
-                    CDE_INSTALL_DEEPEN_FIRST_PROMPT: '0',
                     PYTHONPATH: BLOCKING_HOOKS_DIRECTORY,
                     CLAUDE_LOCAL_IDENTITY_PATH: join(
                         temporaryDirectory,