@lumenflow/cli 1.0.0 → 1.3.0

package/dist/wu-edit.js

@@ -26,6 +26,7 @@
  * Part of WU-1274: Add wu:edit command for spec-only changes
  * @see {@link tools/lib/micro-worktree.mjs} - Shared micro-worktree logic
  */
+import { fileURLToPath } from 'node:url';
 import { getGitForCwd, createGitForPath } from '@lumenflow/core/dist/git-adapter.js';
 import { die } from '@lumenflow/core/dist/error-handler.js';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
@@ -35,7 +36,9 @@ import { join, resolve } from 'node:path';
 import { parseYAML, stringifyYAML, readWU } from '@lumenflow/core/dist/wu-yaml.js';
 import { createWUParser, WU_OPTIONS } from '@lumenflow/core/dist/arg-parser.js';
 import { WU_PATHS } from '@lumenflow/core/dist/wu-paths.js';
-import { FILE_SYSTEM, EXIT_CODES, MICRO_WORKTREE_OPERATIONS, LOG_PREFIX, COMMIT_FORMATS, WU_STATUS, CLAIMED_MODES, getLaneBranch, PKG_MANAGER, SCRIPTS, PRETTIER_FLAGS, READINESS_UI, } from '@lumenflow/core/dist/wu-constants.js';
+import { FILE_SYSTEM, EXIT_CODES, MICRO_WORKTREE_OPERATIONS, LOG_PREFIX, COMMIT_FORMATS, WU_STATUS, CLAIMED_MODES, getLaneBranch, PKG_MANAGER, SCRIPTS, PRETTIER_FLAGS, READINESS_UI, 
+// WU-1039: Import exposure values for validation (Library-First, no magic strings)
+WU_EXPOSURE_VALUES, } from '@lumenflow/core/dist/wu-constants.js';
 // WU-1593: Use centralized validateWUIDFormat (DRY)
 import { ensureOnMain, ensureMainUpToDate, validateWUIDFormat, } from '@lumenflow/core/dist/wu-helpers.js';
 import { withMicroWorktree } from '@lumenflow/core/dist/micro-worktree.js';
@@ -57,6 +60,86 @@ import { normalizeWUSchema } from '@lumenflow/core/dist/wu-schema-normalization.
 import { lintWUSpec, formatLintErrors } from '@lumenflow/core/dist/wu-lint.js';
 /* eslint-disable security/detect-object-injection */
 const PREFIX = LOG_PREFIX.EDIT;
+/**
+ * WU-1039: Validate which edits are allowed on done WUs
+ *
+ * Done WUs only allow metadata reassignment: initiative, phase, and exposure.
+ * All other edits are blocked to preserve WU immutability after completion.
+ *
+ * @param opts - Parsed CLI options
+ * @returns { valid: boolean, disallowedEdits: string[] }
+ */
+export function validateDoneWUEdits(opts) {
+    const disallowedEdits = [];
+    // Check for disallowed edits on done WUs
+    if (opts.specFile)
+        disallowedEdits.push('--spec-file');
+    if (opts.description)
+        disallowedEdits.push('--description');
+    if (opts.acceptance && Array.isArray(opts.acceptance) && opts.acceptance.length > 0) {
+        disallowedEdits.push('--acceptance');
+    }
+    if (opts.notes)
+        disallowedEdits.push('--notes');
+    if (opts.codePaths && Array.isArray(opts.codePaths) && opts.codePaths.length > 0) {
+        disallowedEdits.push('--code-paths');
+    }
+    if (opts.lane)
+        disallowedEdits.push('--lane');
+    if (opts.type)
+        disallowedEdits.push('--type');
+    if (opts.priority)
+        disallowedEdits.push('--priority');
+    if (opts.testPathsManual &&
+        Array.isArray(opts.testPathsManual) &&
+        opts.testPathsManual.length > 0) {
+        disallowedEdits.push('--test-paths-manual');
+    }
+    if (opts.testPathsUnit && Array.isArray(opts.testPathsUnit) && opts.testPathsUnit.length > 0) {
+        disallowedEdits.push('--test-paths-unit');
+    }
+    if (opts.testPathsE2e && Array.isArray(opts.testPathsE2e) && opts.testPathsE2e.length > 0) {
+        disallowedEdits.push('--test-paths-e2e');
+    }
+    return {
+        valid: disallowedEdits.length === 0,
+        disallowedEdits,
+    };
+}
+/**
+ * WU-1039: Validate exposure value against schema
+ *
+ * Uses WU_EXPOSURE_VALUES from core constants (Library-First, no magic strings).
+ *
+ * @param exposure - Exposure value to validate
+ * @returns { valid: boolean, error?: string }
+ */
+export function validateExposureValue(exposure) {
+    // WU_EXPOSURE_VALUES is readonly array, need to cast for includes check
+    const validValues = WU_EXPOSURE_VALUES;
+    if (!validValues.includes(exposure)) {
+        return {
+            valid: false,
+            error: `Invalid exposure value: "${exposure}"\n\nValid values: ${WU_EXPOSURE_VALUES.join(', ')}`,
+        };
+    }
+    return { valid: true };
+}
+/**
+ * WU-1039: Apply exposure edit to WU object
+ *
+ * Returns a new WU object with updated exposure (immutable pattern).
+ *
+ * @param wu - Original WU object
+ * @param exposure - New exposure value
+ * @returns Updated WU object (does not mutate original)
+ */
+export function applyExposureEdit(wu, exposure) {
+    return {
+        ...wu,
+        exposure,
+    };
+}
 /**
  * Custom options for wu-edit (not in shared WU_OPTIONS)
  */
@@ -244,6 +327,8 @@ function parseArgs() {
             // WU-2564: Add blocked_by and dependencies
             EDIT_OPTIONS.blockedBy,
             EDIT_OPTIONS.addDep,
+            // WU-1039: Add exposure for done WU metadata updates
+            WU_OPTIONS.exposure,
         ],
         required: ['id'],
         allowPositionalId: true,
@@ -629,6 +714,14 @@ function applyEdits(wu, opts) {
             .filter(Boolean);
         updated.dependencies = mergeArrayField(wu.dependencies, depIds, opts.append);
     }
+    // WU-1039: Handle --exposure flag with validation
+    if (opts.exposure) {
+        const exposureResult = validateExposureValue(opts.exposure);
+        if (!exposureResult.valid) {
+            die(exposureResult.error);
+        }
+        updated.exposure = opts.exposure;
+    }
     return updated;
 }
 /**
@@ -642,38 +735,18 @@ async function main() {
     // Validate inputs
     validateWUIDFormat(id);
     const { wu: originalWU, editMode, isDone } = validateWUEditable(id);
-    // WU-1929: Done WUs only allow initiative/phase edits (metadata reassignment)
+    // WU-1039: Done WUs allow initiative/phase/exposure edits only (metadata reassignment)
+    // Uses validateDoneWUEdits (DRY - centralized validation logic)
     if (isDone) {
-        const disallowedEdits = [];
-        if (opts.specFile)
-            disallowedEdits.push('--spec-file');
-        if (opts.description)
-            disallowedEdits.push('--description');
-        if (opts.acceptance && opts.acceptance.length > 0)
-            disallowedEdits.push('--acceptance');
-        if (opts.notes)
-            disallowedEdits.push('--notes');
-        if (opts.codePaths && opts.codePaths.length > 0)
-            disallowedEdits.push('--code-paths');
-        if (opts.lane)
-            disallowedEdits.push('--lane');
-        if (opts.type)
-            disallowedEdits.push('--type');
-        if (opts.priority)
-            disallowedEdits.push('--priority');
-        if (opts.testPathsManual && opts.testPathsManual.length > 0)
-            disallowedEdits.push('--test-paths-manual');
-        if (opts.testPathsUnit && opts.testPathsUnit.length > 0)
-            disallowedEdits.push('--test-paths-unit');
-        if (opts.testPathsE2e && opts.testPathsE2e.length > 0)
-            disallowedEdits.push('--test-paths-e2e');
-        if (disallowedEdits.length > 0) {
+        const doneValidation = validateDoneWUEdits(opts);
+        if (!doneValidation.valid) {
             die(`Cannot edit WU ${id}: WU is done/immutable.\n\n` +
-                `Completed WUs only allow initiative/phase reassignment.\n` +
-                `Disallowed edits: ${disallowedEdits.join(', ')}\n\n` +
+                `Completed WUs only allow initiative/phase/exposure reassignment.\n` +
+                `Disallowed edits: ${doneValidation.disallowedEdits.join(', ')}\n\n` +
                 `Allowed for done WUs:\n` +
                 `  --initiative <initId>     Reassign to different initiative\n` +
-                `  --phase <number>          Update phase within initiative`);
+                `  --phase <number>          Update phase within initiative\n` +
+                `  --exposure <type>         Update exposure level`);
         }
     }
     // Check we have something to edit
@@ -698,7 +771,9 @@ async function main() {
         opts.phase ||
         // WU-2564: Add blocked_by and add_dep to hasEdits check
         opts.blockedBy ||
-        opts.addDep;
+        opts.addDep ||
+        // WU-1039: Add exposure to hasEdits check
+        opts.exposure;
     if (!hasEdits) {
         die('No edits specified.\n\n' +
             'Provide one of:\n' +
@@ -716,7 +791,8 @@ async function main() {
             '  --test-paths-unit <path>  Add unit test paths (repeatable; use --append to add)\n' +
             '  --test-paths-e2e <path>   Add e2e test paths (repeatable; use --append to add)\n' +
             '  --blocked-by <wuIds>      WU IDs that block this WU (comma-separated; use --append to add)\n' +
-            '  --add-dep <wuIds>         Add WU IDs to dependencies (comma-separated; use --append to add)');
+            '  --add-dep <wuIds>         Add WU IDs to dependencies (comma-separated; use --append to add)\n' +
+            '  --exposure <type>         Update exposure level (ui, api, backend-only, documentation)');
     }
     // Apply edits to get updated WU
     const updatedWU = applyEdits(originalWU, opts);
@@ -814,39 +890,54 @@ async function main() {
         const oldInitiative = originalWU.initiative;
         const newInitiative = opts.initiative;
         const initiativeChanged = newInitiative && newInitiative !== oldInitiative;
-        await withMicroWorktree({
-            operation: MICRO_WORKTREE_OPERATIONS.WU_EDIT,
-            id: id,
-            logPrefix: PREFIX,
-            execute: async ({ worktreePath }) => {
-                const files = [WU_PATHS.WU(id)];
-                // Write updated WU to micro-worktree (WU-1750: use normalized data)
-                const wuPath = join(worktreePath, WU_PATHS.WU(id));
-                // WU-1442: Normalize dates before dumping to prevent ISO timestamp corruption
-                normalizeWUDates(normalizedWU);
-                // Emergency fix Session 2: Use centralized stringifyYAML helper
-                const yamlContent = stringifyYAML(normalizedWU);
-                // eslint-disable-next-line security/detect-non-literal-fs-filename -- CLI tool writes WU files
-                writeFileSync(wuPath, yamlContent, { encoding: FILE_SYSTEM.ENCODING });
-                console.log(`${PREFIX} ✅ Updated ${id}.yaml in micro-worktree`);
-                // WU-1929: Handle bidirectional initiative updates
-                if (initiativeChanged) {
-                    const initiativeFiles = updateInitiativeWusArrays(worktreePath, id, oldInitiative, newInitiative);
-                    files.push(...initiativeFiles);
-                }
-                return {
-                    commitMessage: COMMIT_FORMATS.EDIT(id),
-                    files,
-                };
-            },
-        });
+        const previousWuTool = process.env.LUMENFLOW_WU_TOOL;
+        process.env.LUMENFLOW_WU_TOOL = MICRO_WORKTREE_OPERATIONS.WU_EDIT;
+        try {
+            await withMicroWorktree({
+                operation: MICRO_WORKTREE_OPERATIONS.WU_EDIT,
+                id: id,
+                logPrefix: PREFIX,
+                execute: async ({ worktreePath }) => {
+                    const files = [WU_PATHS.WU(id)];
+                    // Write updated WU to micro-worktree (WU-1750: use normalized data)
+                    const wuPath = join(worktreePath, WU_PATHS.WU(id));
+                    // WU-1442: Normalize dates before dumping to prevent ISO timestamp corruption
+                    normalizeWUDates(normalizedWU);
+                    // Emergency fix Session 2: Use centralized stringifyYAML helper
+                    const yamlContent = stringifyYAML(normalizedWU);
+                    // eslint-disable-next-line security/detect-non-literal-fs-filename -- CLI tool writes WU files
+                    writeFileSync(wuPath, yamlContent, { encoding: FILE_SYSTEM.ENCODING });
+                    console.log(`${PREFIX} ✅ Updated ${id}.yaml in micro-worktree`);
+                    // WU-1929: Handle bidirectional initiative updates
+                    if (initiativeChanged) {
+                        const initiativeFiles = updateInitiativeWusArrays(worktreePath, id, oldInitiative, newInitiative);
+                        files.push(...initiativeFiles);
+                    }
+                    return {
+                        commitMessage: COMMIT_FORMATS.EDIT(id),
+                        files,
+                    };
+                },
+            });
+        }
+        finally {
+            if (previousWuTool === undefined) {
+                delete process.env.LUMENFLOW_WU_TOOL;
+            }
+            else {
+                process.env.LUMENFLOW_WU_TOOL = previousWuTool;
+            }
+        }
         console.log(`${PREFIX} ✅ Successfully edited ${id}`);
         console.log(`${PREFIX} Changes pushed to origin/main`);
         // WU-1620: Display readiness summary
         displayReadinessSummary(id);
     }
 }
-main().catch((err) => {
-    console.error(`${PREFIX} ❌ ${err.message}`);
-    process.exit(EXIT_CODES.ERROR);
-});
+// Guard main() execution for testability (WU-1366)
+if (process.argv[1] === fileURLToPath(import.meta.url)) {
+    main().catch((err) => {
+        console.error(`${PREFIX} ❌ ${err.message}`);
+        process.exit(EXIT_CODES.ERROR);
+    });
+}

package/dist/wu-infer-lane.js

@@ -16,7 +16,7 @@
  */
 import { readFileSync, existsSync } from 'node:fs';
 import path from 'node:path';
-import yaml from 'js-yaml';
+import { parseYAML } from '@lumenflow/core/dist/wu-yaml.js';
 import { inferSubLane } from '@lumenflow/core/dist/lane-inference.js';
 import { die } from '@lumenflow/core/dist/error-handler.js';
 import { FILE_SYSTEM, EXIT_CODES } from '@lumenflow/core/dist/wu-constants.js';
@@ -81,7 +81,7 @@ function loadWuYaml(id) {
             `  2. Ensure you have read access to the repository`);
     }
     try {
-        const doc = yaml.load(content);
+        const doc = parseYAML(content);
         return doc;
     }
     catch (err) {

package/dist/wu-spawn.js

@@ -11,7 +11,7 @@
  *
  * Output:
  *   A complete Task tool invocation block with:
- *   - Context loading preamble (CLAUDE-core.md, README, lumenflow, WU YAML)
+ *   - Context loading preamble (.claude/CLAUDE.md, README, lumenflow, WU YAML)
  *   - WU details and acceptance criteria
  *   - Skills Selection section (sub-agent reads catalogue and selects at runtime)
  *   - Mandatory agent advisory
@@ -25,7 +25,7 @@
  * Codex Mode:
  *   When --codex is used, outputs a Codex/GPT-friendly Markdown prompt (no antml/XML escaping).
  *
- * @see {@link ai/onboarding/agent-invocation-guide.md} - Context loading templates
+ * @see {@link docs/04-operations/_frameworks/lumenflow/agent/onboarding/agent-invocation-guide.md} - Context loading templates
  */
 import { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
@@ -40,6 +40,9 @@ import { minimatch } from 'minimatch';
 // WU-2252: Import invariants loader for spawn output injection
 import { loadInvariants, INVARIANT_TYPES } from '@lumenflow/core/dist/invariants-runner.js';
 import { validateSpawnArgs, generateExecutionModeSection, generateThinkToolGuidance, recordSpawnToRegistry, formatSpawnRecordedMessage, } from '@lumenflow/core/dist/wu-spawn-helpers.js';
+import { SpawnStrategyFactory } from '@lumenflow/core/dist/spawn-strategy.js';
+import { getConfig } from '@lumenflow/core/dist/lumenflow-config.js';
+import { generateClientSkillsGuidance, generateSkillsSelectionSection, resolveClientConfig, } from '@lumenflow/core/dist/wu-spawn-skills.js';
 import { validateSpawnDependencies, formatDependencyError, } from '@lumenflow/core/dist/dependency-validator.js';
 /**
  * Mandatory agent trigger patterns.
@@ -50,27 +53,6 @@ const MANDATORY_TRIGGERS = {
     'beacon-guardian': ['**/prompts/**', '**/classification/**', '**/detector/**', '**/llm/**'],
 };
 const LOG_PREFIX = '[wu:spawn]';
-/** @type {string} */
-const AGENTS_DIR = '.claude/agents';
-/**
- * Load skills configured in agent's frontmatter
- *
- * @param {string} agentName - Agent name (e.g., 'general-purpose')
- * @returns {string[]} Array of skill names or empty array if not found
- */
-function loadAgentConfiguredSkills(agentName) {
-    const agentPath = `${AGENTS_DIR}/${agentName}.md`;
-    if (!existsSync(agentPath)) {
-        return [];
-    }
-    try {
-        const content = readFileSync(agentPath, { encoding: FILE_SYSTEM.UTF8 });
-        return []; // Skills loading removed - vendor agnostic
-    }
-    catch {
-        return [];
-    }
-}
 /**
  * Detect mandatory agents based on code paths.
  *
@@ -319,27 +301,15 @@ function generateTDDDirective() {
  * @param {string} id - WU ID
  * @returns {string} Context loading preamble
  */
-function generatePreamble(id) {
-    return `Load the following context in this order:
-
-1. Read CLAUDE.md (workflow fundamentals and critical rules)
-2. Read README.md (project structure and tech stack)
-3. Read docs/04-operations/_frameworks/lumenflow/lumenflow-complete.md sections 1-7 (TDD, gates, Definition of Done)
-4. Read docs/04-operations/tasks/wu/${id}.yaml (the specific WU you're working on)
-
-## WIP=1 Lane Check (BEFORE claiming)
-
-Before running wu:claim, check docs/04-operations/tasks/status.md to ensure the lane is free.
-Only ONE WU can be in_progress per lane at any time.
-
-## Context Recovery (Session Resumption)
-
-Before starting work, check for prior context from previous sessions:
-
-1. \`pnpm mem:ready --wu ${id}\` — Query pending nodes (what's next?)
-2. \`pnpm mem:inbox --wu ${id}\` — Check coordination signals from parallel agents
-
-If prior context exists, resume from the last checkpoint. Otherwise, proceed with the task below.`;
+/**
+ * Generate the context loading preamble using the strategy
+ *
+ * @param {string} id - WU ID
+ * @param {SpawnStrategy} strategy - Client strategy
+ * @returns {string} Context loading preamble
+ */
+function generatePreamble(id, strategy) {
+    return strategy.getPreamble(id);
 }
 /**
  * Generate the constraints block (appended at end per Lost in the Middle research)
@@ -739,7 +709,7 @@ pnpm mem:triage --wu ${id}           # List discoveries for this WU
 pnpm mem:triage --promote <node-id> --lane "<lane>"  # Create Bug WU (human action)
 \`\`\`
 
-See: ai/onboarding/agent-invocation-guide.md §Bug Discovery`;
+See: docs/04-operations/_frameworks/lumenflow/agent/onboarding/agent-invocation-guide.md §Bug Discovery`;
 }
 /**
  * Generate lane-specific guidance
@@ -838,128 +808,37 @@ pnpm wu:done --id ${id}
 
 **Do not ask** "should I run wu:done?" — just run it when gates pass.`;
 }
-/**
- * Generate the Skills Selection section for sub-agents.
- *
- * Unlike /wu-prompt (human-facing, skills selected at generation time),
- * wu:spawn instructs the sub-agent to read the catalogue and select skills
- * at execution time based on WU context.
- *
- * If an agentName is provided, that agent's configured skills (from frontmatter)
- * are auto-loaded at the top.
- *
- * @param {object} doc - WU YAML document
- * @param {string} [agentName='general-purpose'] - Agent to spawn
- * @returns {string} Skills Selection section
- */
-// eslint-disable-next-line sonarjs/cognitive-complexity -- WU-2025: Pre-existing complexity, refactor tracked
-function generateSkillsSection(doc, agentName = 'general-purpose') {
-    const lane = doc.lane || '';
-    const type = doc.type || 'feature';
-    const laneParent = lane.split(':')[0].trim();
-    // Load agent's configured skills from frontmatter
-    const agentSkills = loadAgentConfiguredSkills(agentName);
-    const hasAgentSkills = agentSkills.length > 0;
-    // Build auto-load section if agent has configured skills
-    const autoLoadSection = hasAgentSkills
-        ? `### Auto-Loaded Skills (from ${agentName} agent config)
-
-These skills are pre-configured for this agent and should be loaded first:
-
-${agentSkills.map((s) => `- \`${s}\` — Load via \`/skill ${s}\``).join('\n')}
-
-`
-        : '';
-    // Build context hints for the sub-agent
-    const contextHints = [];
-    // Universal baselines (only if not already in agent skills)
-    if (!agentSkills.includes('wu-lifecycle')) {
-        contextHints.push('- `wu-lifecycle` — ALL WUs need workflow automation');
-    }
-    if (!agentSkills.includes('worktree-discipline')) {
-        contextHints.push('- `worktree-discipline` — ALL WUs need path safety');
-    }
-    // Type-based hints
-    if ((type === 'feature' || type === 'enhancement') && !agentSkills.includes('tdd-workflow')) {
-        contextHints.push('- `tdd-workflow` — TDD is mandatory for feature/enhancement WUs');
-    }
-    if (type === 'bug' && !agentSkills.includes('bug-classification')) {
-        contextHints.push('- `bug-classification` — Bug severity assessment');
-    }
-    // Lane-based hints
-    if (laneParent === 'Operations' &&
-        lane.includes('Tooling') &&
-        !agentSkills.includes('lumenflow-gates')) {
-        contextHints.push('- `lumenflow-gates` — Tooling often affects gates');
-    }
-    if (laneParent === 'Intelligence') {
-        if (!agentSkills.includes('beacon-compliance')) {
-            contextHints.push('- `beacon-compliance` — Intelligence lane requires Beacon validation');
-        }
-        if (!agentSkills.includes('prompt-management')) {
-            contextHints.push('- `prompt-management` — For prompt template work');
-        }
-    }
-    if (laneParent === 'Experience' && !agentSkills.includes('frontend-design')) {
-        contextHints.push('- `frontend-design` — For UI component work');
-    }
-    const softPolicySection = contextHints.length > 0
-        ? `### Soft Policy (baselines for this WU)
-
-Based on WU context, consider loading:
-
-${contextHints.join('\n')}
-
-`
-        : '';
-    return `## Skills Selection
-
-**IMPORTANT**: Before starting work, select and load relevant skills.
-
-${autoLoadSection}### How to Select Skills
-
-1. Read the skill catalogue frontmatter from \`.claude/skills/*/SKILL.md\`
-2. Match skills to WU context (lane, type, code_paths, description)
-3. Load selected skills via \`/skill <skill-name>\`
-
-${softPolicySection}### Additional Skills (load if needed)
-
-| Skill | Use When |
-|-------|----------|
-| lumenflow-gates | Gates fail, debugging format/lint/typecheck errors |
-| bug-classification | Bug discovered mid-WU, need priority classification |
-| beacon-compliance | Code touches LLM, prompts, classification |
-| prompt-management | Working with prompt templates, golden datasets |
-| frontend-design | Building UI components, pages |
-| initiative-management | Multi-phase projects, INIT-XXX coordination |
-| multi-agent-coordination | Spawning sub-agents, parallel WU work |
-| orchestration | Agent coordination, mandatory agent checks |
-| ops-maintenance | Metrics, validation, health checks |
-
-### Graceful Degradation
-
-If the skill catalogue is missing or invalid:
-- Load baseline skills: \`/skill wu-lifecycle\`, \`/skill tdd-workflow\` (for features)
-- Continue with implementation using Mandatory Standards below
-`;
+function generateClientBlocksSection(clientContext) {
+    if (!clientContext?.config?.blocks?.length)
+        return '';
+    const blocks = clientContext.config.blocks
+        .map((block) => `### ${block.title}\n\n${block.content}`)
+        .join('\n\n');
+    return `## Client Guidance (${clientContext.name})\n\n${blocks}`;
 }
 /**
  * Generate the complete Task tool invocation
  *
  * @param {object} doc - WU YAML document
  * @param {string} id - WU ID
+ * @param {SpawnStrategy} strategy - Client strategy
  * @param {object} [options={}] - Thinking mode options
  * @param {boolean} [options.thinking] - Whether extended thinking is enabled
  * @param {boolean} [options.noThinking] - Whether thinking is explicitly disabled
  * @param {string} [options.budget] - Token budget for thinking
  * @returns {string} Complete Task tool invocation
  */
-export function generateTaskInvocation(doc, id, options = {}) {
+export function generateTaskInvocation(doc, id, strategy, options = {}) {
     const codePaths = doc.code_paths || [];
     const mandatoryAgents = detectMandatoryAgents(codePaths);
-    const preamble = generatePreamble(id);
+    const preamble = generatePreamble(id, strategy);
     const tddDirective = generateTDDDirective();
-    const skillsSection = generateSkillsSection(doc);
+    const clientContext = options.client;
+    const config = options.config || getConfig();
+    const clientSkillsGuidance = generateClientSkillsGuidance(clientContext);
+    const skillsSection = generateSkillsSelectionSection(doc, config, clientContext?.name) +
+        (clientSkillsGuidance ? `\n${clientSkillsGuidance}` : '');
+    const clientBlocks = generateClientBlocksSection(clientContext);
     const mandatorySection = generateMandatoryAgentSection(mandatoryAgents, id);
     const laneGuidance = generateLaneGuidance(doc.lane);
     const bugDiscoverySection = generateBugDiscoverySection(id);
@@ -1038,7 +917,7 @@ ${thinkingBlock}${skillsSection}
 - **Documentation**: Update tooling docs if changing tools. Keep docs in sync with code
 - **Sub-agents**: Use Explore agent for codebase investigation. Activate mandatory agents (security-auditor for PHI/auth, beacon-guardian for LLM/prompts)
 
-${worktreeGuidance ? `---\n\n${worktreeGuidance}\n\n` : ''}---
+${clientBlocks ? `---\n\n${clientBlocks}\n\n` : ''}${worktreeGuidance ? `---\n\n${worktreeGuidance}\n\n` : ''}---
 
 ${bugDiscoverySection}
 
@@ -1103,10 +982,10 @@ ${constraints}`;
     ].join('\n');
     return invocation;
 }
-export function generateCodexPrompt(doc, id, options = {}) {
+export function generateCodexPrompt(doc, id, strategy, options = {}) {
     const codePaths = doc.code_paths || [];
     const mandatoryAgents = detectMandatoryAgents(codePaths);
-    const preamble = generatePreamble(id);
+    const preamble = generatePreamble(id, strategy);
     const tddDirective = generateTDDDirective();
     const mandatorySection = generateMandatoryAgentSection(mandatoryAgents, id);
     const laneGuidance = generateLaneGuidance(doc.lane);
@@ -1114,6 +993,12 @@ export function generateCodexPrompt(doc, id, options = {}) {
     const implementationContext = generateImplementationContext(doc);
     const action = generateActionSection(doc, id);
     const constraints = generateCodexConstraints(id);
+    const clientContext = options.client;
+    const config = options.config || getConfig();
+    const clientSkillsGuidance = generateClientSkillsGuidance(clientContext);
+    const skillsSection = generateSkillsSelectionSection(doc, config, clientContext?.name) +
+        (clientSkillsGuidance ? `\n${clientSkillsGuidance}` : '');
+    const clientBlocks = generateClientBlocksSection(clientContext);
     const executionModeSection = generateExecutionModeSection(options);
     const thinkToolGuidance = generateThinkToolGuidance(options);
     const thinkingSections = [executionModeSection, thinkToolGuidance]
@@ -1156,6 +1041,10 @@ ${formatAcceptance(doc.acceptance)}
 
 ---
 
+${skillsSection}
+
+---
+
 ## Action
 
 ${action}
@@ -1169,7 +1058,7 @@ ${action}
 
 ---
 
-${mandatorySection}${implementationContext ? `${implementationContext}\n\n---\n\n` : ''}${thinkingBlock}${bugDiscoverySection}
+${mandatorySection}${implementationContext ? `${implementationContext}\n\n---\n\n` : ''}${clientBlocks ? `${clientBlocks}\n\n---\n\n` : ''}${thinkingBlock}${bugDiscoverySection}
 
 ---
 
@@ -1223,6 +1112,8 @@ async function main() {
             WU_OPTIONS.budget,
             WU_OPTIONS.codex,
             WU_OPTIONS.parentWu, // WU-1945: Parent WU for spawn registry tracking
+            WU_OPTIONS.client,
+            WU_OPTIONS.vendor,
         ],
         required: ['id'],
         allowPositionalId: true,
@@ -1295,15 +1186,43 @@ async function main() {
         noThinking: args.noThinking,
         budget: args.budget,
     };
+    // Client Resolution
+    const config = getConfig();
+    let clientName = args.client;
+    if (!clientName && args.vendor) {
+        console.warn(`${LOG_PREFIX} ${EMOJI.WARNING} Warning: --vendor is deprecated. Use --client.`);
+        clientName = args.vendor;
+    }
+    // Codex handling (deprecated legacy flag)
     if (args.codex) {
-        const prompt = generateCodexPrompt(doc, id, thinkingOptions);
+        if (!clientName) {
+            console.warn(`${LOG_PREFIX} ${EMOJI.WARNING} Warning: --codex is deprecated. Use --client codex-cli.`);
+            clientName = 'codex-cli';
+        }
+    }
+    if (!clientName) {
+        clientName = config.agents.defaultClient || 'claude-code';
+    }
+    // Create strategy
+    const strategy = SpawnStrategyFactory.create(clientName);
+    const clientContext = { name: clientName, config: resolveClientConfig(config, clientName) };
+    if (clientName === 'codex-cli' || args.codex) {
+        const prompt = generateCodexPrompt(doc, id, strategy, {
+            ...thinkingOptions,
+            client: clientContext,
+            config,
+        });
         console.log(`${LOG_PREFIX} Generated Codex/GPT prompt for ${id}`);
         console.log(`${LOG_PREFIX} Copy the Markdown below:\n`);
         console.log(prompt.trimEnd());
         return;
     }
     // Generate and output the Task invocation
-    const invocation = generateTaskInvocation(doc, id, thinkingOptions);
+    const invocation = generateTaskInvocation(doc, id, strategy, {
+        ...thinkingOptions,
+        client: clientContext,
+        config,
+    });
     console.log(`${LOG_PREFIX} Generated Task tool invocation for ${id}`);
     console.log(`${LOG_PREFIX} Copy the block below to spawn a sub-agent:\n`);
     console.log(invocation);