@lumenflow/cli 3.1.2 → 3.1.3

package/dist/init.js

@@ -19,6 +19,7 @@ import * as path from 'node:path';
 import * as yaml from 'yaml';
 import { execFileSync } from 'node:child_process';
 import { getDefaultConfig, createWUParser, WU_OPTIONS, CLAUDE_HOOKS, LUMENFLOW_CLIENT_IDS, } from '@lumenflow/core';
+import { WORKSPACE_V2_KEYS } from '@lumenflow/core/config-schema';
 // WU-1067: Import GATE_PRESETS for --preset support
 import { GATE_PRESETS } from '@lumenflow/core/gates-config';
 // WU-1362: Import worktree guard utilities for branch checking
@@ -41,6 +42,7 @@ import { getDocsPath, detectDocsStructure, detectDefaultClient, isGitRepo, hasGi
 export { detectIDEEnvironment, checkPrerequisites, getDocsPath, detectDocsStructure, } from './init-detection.js';
 // WU-1644: Import scaffolding helpers from dedicated module
 import { processTemplate, loadTemplate, createFile, createDirectory, createExecutableScript, } from './init-scaffolding.js';
+import { CANONICAL_BOOTSTRAP_COMMAND, DEFAULT_PROJECT_NAME, getDefaultWorkspaceConfig, WORKSPACE_FILENAME, } from './workspace-init.js';
 /**
  * WU-1085: CLI option definitions for init command
  * WU-1171: Added --merge and --client options
@@ -84,8 +86,33 @@ const INIT_OPTIONS = {
         flags: '--preset <preset>',
         description: 'Gate preset for config (node, python, go, rust, dotnet)',
     },
+    bootstrapDomain: {
+        name: 'bootstrapDomain',
+        flags: '--bootstrap-domain <domain>',
+        description: 'Bootstrap domain: software-delivery, infra, or custom',
+    },
+    skipBootstrap: {
+        name: 'skipBootstrap',
+        flags: '--skip-bootstrap',
+        description: 'Skip workspace bootstrap-all flow (workspace.yaml + pack install)',
+    },
+    skipBootstrapPackInstall: {
+        name: 'skipBootstrapPackInstall',
+        flags: '--skip-bootstrap-pack-install',
+        description: 'Skip registry pack install during bootstrap',
+    },
     force: WU_OPTIONS.force,
 };
+function parseBootstrapDomain(rawDomain) {
+    if (!rawDomain) {
+        return BOOTSTRAP_DEFAULT_DOMAIN;
+    }
+    if (BOOTSTRAP_VALID_DOMAINS.has(rawDomain)) {
+        return rawDomain;
+    }
+    const validDomains = Array.from(BOOTSTRAP_VALID_DOMAINS).join(', ');
+    throw new Error(`${BOOTSTRAP_ERROR_PREFIX} Invalid --bootstrap-domain "${rawDomain}". Valid values: ${validDomains}`);
+}
 /**
  * WU-1085: Parse init command options using createWUParser
  * WU-1171: Added --merge, --client options
@@ -97,7 +124,8 @@ export function parseInitOptions() {
         name: 'lumenflow-init',
         description: 'Initialize LumenFlow in a project\n\n' +
             'Subcommands:\n' +
-            '  lumenflow commands    List all available CLI commands',
+            '  lumenflow commands         List all available CLI commands\n' +
+            '  lumenflow cloud connect    Configure cloud control-plane access',
         options: Object.values(INIT_OPTIONS),
     });
     // WU-1171: --client takes precedence, --vendor is alias
@@ -105,6 +133,7 @@ export function parseInitOptions() {
     // WU-1286: --full is now the default (true), use --minimal to disable
     // --minimal explicitly sets full to false, otherwise full defaults to true
     const fullMode = opts.minimal ? false : (opts.full ?? true);
+    const bootstrapDomain = parseBootstrapDomain(opts.bootstrapDomain);
     return {
         force: opts.force ?? false,
         full: fullMode,
@@ -113,10 +142,48 @@ export function parseInitOptions() {
         client: clientValue,
         vendor: clientValue,
         preset: opts.preset,
+        bootstrapDomain,
+        skipBootstrap: Boolean(opts.skipBootstrap),
+        skipBootstrapPackInstall: Boolean(opts.skipBootstrapPackInstall),
     };
 }
 const DEFAULT_CLIENT_CLAUDE = LUMENFLOW_CLIENT_IDS.CLAUDE_CODE;
-const CONFIG_FILE_NAME = '.lumenflow.config.yaml';
+const BOOTSTRAP_DEFAULT_DOMAIN = 'software-delivery';
+const BOOTSTRAP_INFRA_DOMAIN = 'infra';
+const BOOTSTRAP_CUSTOM_DOMAIN = 'custom';
+const BOOTSTRAP_VALID_DOMAINS = new Set([
+    BOOTSTRAP_DEFAULT_DOMAIN,
+    BOOTSTRAP_INFRA_DOMAIN,
+    BOOTSTRAP_CUSTOM_DOMAIN,
+]);
+const BOOTSTRAP_SKIP_REASON_FLAG = '--skip-bootstrap';
+const BOOTSTRAP_SKIP_REASON_EXISTING_WORKSPACE = `${WORKSPACE_FILENAME} already exists`;
+const BOOTSTRAP_ERROR_PREFIX = '[lumenflow bootstrap]';
+const INIT_SUBCOMMANDS = {
+    COMMANDS: 'commands',
+    CLOUD: 'cloud',
+};
+const LEGACY_SUBCOMMANDS = {
+    ONBOARD: 'onboard',
+    WORKSPACE_INIT_COLON: 'workspace:init',
+    WORKSPACE_INIT_DASH: 'workspace-init',
+};
+const CLOUD_SUBCOMMANDS = {
+    CONNECT: 'connect',
+};
+const CLOUD_CONNECT_BIN = 'cloud-connect';
+const INIT_ERROR_PREFIX = '[lumenflow init]';
+const INIT_CLOUD_CONNECT_HELP = 'Usage: lumenflow cloud connect --endpoint <url> --org-id <id> --project-id <id> [--token-env <name>]';
+const LEGACY_SUBCOMMAND_ERROR_PREFIX = `${INIT_ERROR_PREFIX} Legacy onboarding subcommand`;
+const LEGACY_SUBCOMMAND_GUIDANCE = `Use "${CANONICAL_BOOTSTRAP_COMMAND}" for bootstrap-all onboarding`;
+const LEGACY_SUBCOMMAND_HELP_HINT = `Run "${CANONICAL_BOOTSTRAP_COMMAND} --help" for supported options`;
+const CONFIG_FILE_NAME = WORKSPACE_FILENAME;
+const SOFTWARE_DELIVERY_KEY = WORKSPACE_V2_KEYS.SOFTWARE_DELIVERY;
+const SOFTWARE_DELIVERY_CONFIG_KEYS = {
+    AGENTS: 'agents',
+    CLIENTS: 'clients',
+    ENFORCEMENT: 'enforcement',
+};
 const FRAMEWORK_HINT_FILE = '.lumenflow.framework.yaml';
 const LUMENFLOW_DIR = '.lumenflow';
 const LUMENFLOW_AGENTS_DIR = `${LUMENFLOW_DIR}/agents`;
@@ -210,30 +277,77 @@ function detectProjectTooling(targetDir) {
         return { hasTurbo: false };
     }
 }
+function asRecord(value) {
+    return value && typeof value === 'object' && !Array.isArray(value)
+        ? value
+        : null;
+}
+function mergeConfigDefaults(defaults, existing) {
+    const merged = { ...defaults };
+    for (const [key, existingValue] of Object.entries(existing)) {
+        const defaultValue = merged[key];
+        const existingRecord = asRecord(existingValue);
+        const defaultRecord = asRecord(defaultValue);
+        if (defaultRecord && existingRecord) {
+            merged[key] = mergeConfigDefaults(defaultRecord, existingRecord);
+            continue;
+        }
+        merged[key] = existingValue;
+    }
+    return merged;
+}
+function toWorkspaceId(value) {
+    return value
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '-')
+        .replace(/^-+|-+$/g, '');
+}
+function loadWorkspaceDocument(targetDir) {
+    const workspacePath = path.join(targetDir, CONFIG_FILE_NAME);
+    if (!fs.existsSync(workspacePath)) {
+        const projectName = resolveBootstrapProjectName(targetDir);
+        const projectId = toWorkspaceId(projectName);
+        const workspace = {
+            ...getDefaultWorkspaceConfig(),
+            id: projectId,
+            name: projectName,
+            memory_namespace: projectId,
+            event_namespace: projectId,
+        };
+        return { exists: false, workspace };
+    }
+    const content = fs.readFileSync(workspacePath, 'utf-8');
+    const workspace = asRecord(yaml.parse(content));
+    if (!workspace) {
+        throw new Error(`${INIT_ERROR_PREFIX} ${CONFIG_FILE_NAME} exists but is not a valid YAML object. ` +
+            `Fix ${CONFIG_FILE_NAME} and re-run init.`);
+    }
+    return { exists: true, workspace };
+}
+function upsertWorkspaceSoftwareDelivery(targetDir, softwareDeliveryConfig, result) {
+    const workspacePath = path.join(targetDir, CONFIG_FILE_NAME);
+    const { exists, workspace } = loadWorkspaceDocument(targetDir);
+    const existingSoftwareDelivery = asRecord(workspace[SOFTWARE_DELIVERY_KEY]) ?? {};
+    workspace[SOFTWARE_DELIVERY_KEY] = mergeConfigDefaults(softwareDeliveryConfig, existingSoftwareDelivery);
+    fs.writeFileSync(workspacePath, yaml.stringify(workspace), 'utf-8');
+    if (exists) {
+        result.overwritten = result.overwritten ?? [];
+        if (!result.overwritten.includes(CONFIG_FILE_NAME)) {
+            result.overwritten.push(CONFIG_FILE_NAME);
+        }
+        return;
+    }
+    result.created.push(CONFIG_FILE_NAME);
+}
 /**
- * Generate YAML configuration with header comment
+ * Build software_delivery configuration defaults
  * WU-1067: Supports --preset option for config-driven gates
  * WU-1307: Includes default lane definitions for onboarding
  * WU-1364: Supports git config overrides (requireRemote)
  * WU-1383: Adds enforcement hooks config for Claude client by default
  * WU-1965: Detects installed tooling from package.json for config defaults
  */
-function generateLumenflowConfigYaml(gatePreset, gitConfigOverride, client, docsPaths, targetDir) {
-    // WU-1382: Add managed file header to prevent manual edits
-    const header = `# ============================================================================
-# LUMENFLOW MANAGED FILE - DO NOT EDIT MANUALLY
-# ============================================================================
-# Generated by: lumenflow init
-# Regenerate with: pnpm exec lumenflow init --force
-#
-# This file is managed by LumenFlow tooling. Manual edits may be overwritten.
-# To customize, use the CLI commands or edit the appropriate source templates.
-# ============================================================================
-
-# LumenFlow Configuration
-# Customize paths based on your project structure
-
-`;
+function buildSoftwareDeliveryConfig(gatePreset, gitConfigOverride, client, docsPaths, targetDir) {
     const config = getDefaultConfig();
     config.directories.agentsDir = LUMENFLOW_AGENTS_DIR;
     // WU-1755: Override directory paths to match detected docs structure.
@@ -319,7 +433,7 @@ function generateLumenflowConfigYaml(gatePreset, gitConfigOverride, client, docs
             },
         };
     }
-    return header + yaml.stringify(config);
+    return config;
 }
 /**
  * Get current date in YYYY-MM-DD format
@@ -381,22 +495,29 @@ async function runClientIntegrations(targetDir, result) {
     const configPath = path.join(targetDir, CONFIG_FILE_NAME);
     if (!fs.existsSync(configPath))
         return integrationFiles;
-    let config;
+    let softwareDeliveryConfig;
     try {
         const content = fs.readFileSync(configPath, 'utf-8');
-        config = yaml.parse(content);
+        const workspaceConfig = asRecord(yaml.parse(content));
+        softwareDeliveryConfig = workspaceConfig
+            ? asRecord(workspaceConfig[SOFTWARE_DELIVERY_KEY])
+            : null;
     }
     catch {
         return integrationFiles; // Config unreadable -- skip silently
     }
-    if (!config)
+    if (!softwareDeliveryConfig)
         return integrationFiles;
-    const agents = config.agents;
-    const clients = agents?.clients;
+    const agents = asRecord(softwareDeliveryConfig[SOFTWARE_DELIVERY_CONFIG_KEYS.AGENTS]);
+    const clients = asRecord(agents?.[SOFTWARE_DELIVERY_CONFIG_KEYS.CLIENTS]);
     if (!clients)
         return integrationFiles;
-    for (const [clientKey, clientConfig] of Object.entries(clients)) {
-        const enforcement = clientConfig.enforcement;
+    for (const [clientKey, unsafeClientConfig] of Object.entries(clients)) {
+        const clientConfig = asRecord(unsafeClientConfig);
+        if (!clientConfig) {
+            continue;
+        }
+        const enforcement = asRecord(clientConfig[SOFTWARE_DELIVERY_CONFIG_KEYS.ENFORCEMENT]);
         if (!enforcement?.hooks)
             continue;
         const integration = CLIENT_INTEGRATIONS[clientKey];
@@ -504,19 +625,8 @@ export async function scaffoldProject(targetDir, options) {
         DOCS_TASKS_PATH: docsPaths.tasks,
         DOCS_ONBOARDING_PATH: docsPaths.onboarding,
     };
-    // Create .lumenflow.config.yaml (WU-1067: includes gate preset if specified)
-    // WU-1364: Includes git config overrides (e.g., requireRemote: false for local-only)
-    // WU-1383: Includes enforcement hooks for Claude client
-    // Note: Config files don't use merge mode (always skip or force)
-    const configPath = path.join(targetDir, CONFIG_FILE_NAME);
-    // WU-1383: Warn if config already exists to discourage manual editing
-    if (fs.existsSync(configPath) && !options.force) {
-        result.warnings = result.warnings ?? [];
-        result.warnings.push(`${CONFIG_FILE_NAME} already exists. ` +
-            'To modify configuration, use CLI commands (e.g., pnpm lumenflow:init --force) ' +
-            'instead of manual editing.');
-    }
-    await createFile(configPath, generateLumenflowConfigYaml(options.gatePreset, gitConfigOverride, client, docsPaths, targetDir), options.force ? 'force' : 'skip', result, targetDir);
+    // Upsert workspace.yaml software_delivery defaults (WU-2006 hard cut)
+    upsertWorkspaceSoftwareDelivery(targetDir, buildSoftwareDeliveryConfig(options.gatePreset, gitConfigOverride, client, docsPaths, targetDir), result);
     // WU-1171: Create AGENTS.md (universal entry point for all agents)
     try {
         const agentsTemplate = loadTemplate('core/AGENTS.md.template');
@@ -964,6 +1074,56 @@ async function scaffoldClientFiles(targetDir, options, result, tokens, client) {
         await createFile(path.join(targetDir, '.aider.conf.yml'), AIDER_CONF_TEMPLATE, fileMode, result, targetDir);
     }
 }
+function resolveBootstrapProjectName(targetDir) {
+    const basename = path.basename(path.resolve(targetDir)).trim();
+    return basename.length > 0 ? basename : DEFAULT_PROJECT_NAME;
+}
+export async function runInitBootstrap(options) {
+    if (options.skipBootstrap) {
+        return {
+            skipped: true,
+            reason: BOOTSTRAP_SKIP_REASON_FLAG,
+            workspaceGenerated: false,
+            packInstalled: false,
+        };
+    }
+    const workspacePath = path.join(options.targetDir, WORKSPACE_FILENAME);
+    const hasExistingWorkspace = fs.existsSync(workspacePath);
+    if (hasExistingWorkspace && !options.force) {
+        return {
+            skipped: true,
+            reason: BOOTSTRAP_SKIP_REASON_EXISTING_WORKSPACE,
+            workspaceGenerated: false,
+            packInstalled: false,
+        };
+    }
+    const onboardModule = await import('./onboard.js');
+    const onboardResult = (await onboardModule.runOnboard({
+        targetDir: options.targetDir,
+        nonInteractive: true,
+        projectName: resolveBootstrapProjectName(options.targetDir),
+        domain: options.bootstrapDomain,
+        force: options.force,
+        skipPackInstall: options.skipBootstrapPackInstall,
+        skipDashboard: true,
+        fetchFn: options.fetchFn ?? globalThis.fetch,
+    }));
+    if (!onboardResult.success) {
+        const failureReason = onboardResult.errors.join('; ') || 'unknown onboarding error';
+        throw new Error(`${BOOTSTRAP_ERROR_PREFIX} ${failureReason}`);
+    }
+    if (!options.skipBootstrapPackInstall &&
+        options.bootstrapDomain !== BOOTSTRAP_CUSTOM_DOMAIN &&
+        onboardResult.packInstalled !== true) {
+        throw new Error(`${BOOTSTRAP_ERROR_PREFIX} failed to install ${options.bootstrapDomain} pack with integrity metadata. ` +
+            `Retry after fixing registry access or rerun with --skip-bootstrap-pack-install.`);
+    }
+    return {
+        skipped: false,
+        workspaceGenerated: onboardResult.workspaceGenerated === true,
+        packInstalled: onboardResult.packInstalled === true,
+    };
+}
 /**
  * CLI entry point
  * WU-1085: Updated to use parseInitOptions for proper --help support
@@ -972,8 +1132,14 @@ async function scaffoldClientFiles(targetDir, options, result, tokens, client) {
  */
 export async function main() {
     // WU-1378: Check for subcommands before parsing init options
+    const invokedBinary = path.basename(process.argv[1] ?? '', '.js');
     const subcommand = process.argv[2];
-    if (subcommand === 'commands') {
+    if (invokedBinary === CLOUD_CONNECT_BIN) {
+        const { runCloudConnectCli } = await import('./onboard.js');
+        await runCloudConnectCli();
+        return;
+    }
+    if (subcommand === INIT_SUBCOMMANDS.COMMANDS) {
         // Route to commands subcommand
         const { main: commandsMain } = await import('./commands.js');
         // Remove 'commands' from argv so the subcommand parser sees clean args
@@ -981,6 +1147,21 @@ export async function main() {
         await commandsMain();
         return;
     }
+    if (subcommand === LEGACY_SUBCOMMANDS.ONBOARD ||
+        subcommand === LEGACY_SUBCOMMANDS.WORKSPACE_INIT_COLON ||
+        subcommand === LEGACY_SUBCOMMANDS.WORKSPACE_INIT_DASH) {
+        throw new Error(`${LEGACY_SUBCOMMAND_ERROR_PREFIX} "${subcommand}". ${LEGACY_SUBCOMMAND_GUIDANCE}. ${LEGACY_SUBCOMMAND_HELP_HINT}.`);
+    }
+    if (subcommand === INIT_SUBCOMMANDS.CLOUD) {
+        const cloudSubcommand = process.argv[3];
+        if (cloudSubcommand !== CLOUD_SUBCOMMANDS.CONNECT) {
+            throw new Error(`${INIT_ERROR_PREFIX} Unknown cloud subcommand "${cloudSubcommand ?? ''}". ${INIT_CLOUD_CONNECT_HELP}`);
+        }
+        const { runCloudConnectCli } = await import('./onboard.js');
+        process.argv.splice(2, 2);
+        await runCloudConnectCli();
+        return;
+    }
     const opts = parseInitOptions();
     const targetDir = process.cwd();
     console.log('[lumenflow init] Scaffolding LumenFlow project...');
@@ -988,9 +1169,24 @@ export async function main() {
     console.log(`  Framework: ${opts.framework ?? 'none'}`);
     console.log(`  Client: ${opts.client ?? 'auto'}`);
     console.log(`  Gate preset: ${opts.preset ?? 'none (manual config)'}`);
+    console.log(`  Bootstrap domain: ${opts.bootstrapDomain}`);
+    console.log(`  Bootstrap pack install: ${opts.skipBootstrapPackInstall ? 'skipped (--skip-bootstrap-pack-install)' : 'required'}`);
     // WU-1968: Removed separate checkPrerequisites() call here.
     // runDoctorForInit() (called after scaffolding) already checks prerequisites
     // and displays results, avoiding duplicate output.
+    const bootstrapResult = await runInitBootstrap({
+        targetDir,
+        force: opts.force,
+        bootstrapDomain: opts.bootstrapDomain,
+        skipBootstrap: opts.skipBootstrap,
+        skipBootstrapPackInstall: opts.skipBootstrapPackInstall,
+    });
+    if (bootstrapResult.skipped) {
+        console.log(`  Bootstrap: skipped (${bootstrapResult.reason})`);
+    }
+    else {
+        console.log(`  Bootstrap: workspace=${bootstrapResult.workspaceGenerated ? 'created' : 'unchanged'}, pack=${bootstrapResult.packInstalled ? 'installed' : 'skipped'}`);
+    }
     const result = await scaffoldProject(targetDir, {
         force: opts.force,
         full: opts.full,
@@ -1038,7 +1234,7 @@ export async function main() {
     // WU-1576: Show enforcement hooks status -- vendor-agnostic (UnsafeAny adapter that produced files)
     console.log('\n[lumenflow init] Done! Next steps:');
     console.log('  1. Review AGENTS.md and LUMENFLOW.md for workflow documentation');
-    console.log(`  2. Edit ${CONFIG_FILE_NAME} to match your project structure`);
+    console.log(`  2. Review ${CONFIG_FILE_NAME} ${SOFTWARE_DELIVERY_KEY} settings for project defaults`);
     console.log('');
     console.log(`  ${buildInitLaneLifecycleMessage(LANE_LIFECYCLE_STATUS.UNCONFIGURED)}`);
     if (result.integrationFiles && result.integrationFiles.length > 0) {

package/dist/initiative-add-wu.js

@@ -384,7 +384,7 @@ export function buildAddWuMicroWorktreeOptions(wuArg, initId) {
         },
     };
 }
-async function main() {
+export async function main() {
     const args = createWUParser({
         name: 'initiative-add-wu',
         description: 'Link one or more WUs to an initiative bidirectionally',

package/dist/initiative-bulk-assign-wus.js

@@ -242,7 +242,7 @@ function printSummary(stats) {
 /**
  * Main function
  */
-async function main() {
+export async function main() {
     const args = createWUParser({
         name: 'initiative-bulk-assign-wus',
         description: 'Bulk-assign orphaned WUs to initiatives based on lane prefix rules',

package/dist/initiative-create.js

@@ -117,14 +117,14 @@ function createInitiativeYamlInWorktree(worktreePath, id, slug, title, options =
 }
 /**
  * Resolve lane lifecycle classification for initiative:create without mutating
- * .lumenflow.config.yaml.
+ * workspace.yaml.
  *
  * WU-1751: initiative:create guidance should be read-only.
  */
 export function resolveLaneLifecycleForInitiativeCreate(projectRoot) {
     return ensureLaneLifecycleForProject(projectRoot, { persist: false });
 }
-async function main() {
+export async function main() {
     const args = createWUParser({
         name: 'initiative-create',
         description: 'Create a new Initiative with micro-worktree isolation (race-safe)',

package/dist/initiative-edit.js

@@ -469,7 +469,7 @@ export function buildNoEditsMessage() {
 /**
  * Main entry point
  */
-async function main() {
+export async function main() {
     const opts = parseArgs();
     const { id } = opts;
     console.log(`${PREFIX} Starting Initiative edit for ${id}`);

package/dist/initiative-list.js

@@ -73,7 +73,7 @@ function truncate(str, maxLen) {
         return '';
     return str.length > maxLen ? `${str.substring(0, maxLen - 3)}...` : str;
 }
-async function main() {
+export async function main() {
     const args = createWUParser({
         name: 'initiative-list',
         description: 'List all initiatives with progress percentages',

package/dist/initiative-plan.js

@@ -252,7 +252,7 @@ export function getCommitMessage(initId, planUri) {
     const filename = planUri.replace(PLAN_URI_SCHEME, '');
     return `docs: link plan ${filename} to ${initId.toLowerCase()}`;
 }
-async function main() {
+export async function main() {
     const args = createWUParser({
         name: 'init-plan',
         description: 'Link a plan file to an initiative',
@@ -377,6 +377,4 @@ import { runCLI } from './cli-entry-point.js';
 if (import.meta.main) {
     void runCLI(main);
 }
-// Export for testing
-export { main };
 //# sourceMappingURL=initiative-plan.js.map

package/dist/initiative-status.js

@@ -40,11 +40,29 @@ function hasIncompletePhase(phases) {
         return normalizeLifecycleStatus(phase.status) !== WU_STATUS.DONE;
     });
 }
-export function deriveInitiativeLifecycleStatus(status, phases) {
+function hasAllLinkedWUsDone(progress) {
+    if (!progress) {
+        return false;
+    }
+    return progress.total > 0 && progress.done === progress.total;
+}
+function hasIncompleteLinkedWUs(progress) {
+    if (!progress) {
+        return false;
+    }
+    return progress.total > 0 && progress.done < progress.total;
+}
+export function deriveInitiativeLifecycleStatus(status, phases, progress) {
     const normalizedStatus = normalizeLifecycleStatus(status);
+    if (hasAllLinkedWUsDone(progress)) {
+        return WU_STATUS.DONE;
+    }
     if (normalizedStatus === WU_STATUS.DONE && hasIncompletePhase(phases)) {
         return WU_STATUS.IN_PROGRESS;
     }
+    if (normalizedStatus === WU_STATUS.DONE && hasIncompleteLinkedWUs(progress)) {
+        return WU_STATUS.IN_PROGRESS;
+    }
     return normalizedStatus || WU_STATUS.IN_PROGRESS;
 }
 function getWUBlockers(doc) {
@@ -54,6 +72,28 @@ function getWUBlockers(doc) {
     }
     return asStringArray(doc.dependencies);
 }
+function hasPhaseWUStatus(phaseWUs, status) {
+    return phaseWUs.some((wu) => normalizeLifecycleStatus(wu.doc.status) === status);
+}
+function areAllPhaseWUsDone(phaseWUs) {
+    return (phaseWUs.length > 0 &&
+        phaseWUs.every((wu) => normalizeLifecycleStatus(wu.doc.status) === WU_STATUS.DONE));
+}
+export function deriveInitiativePhaseStatus(status, phaseWUs) {
+    if (areAllPhaseWUsDone(phaseWUs)) {
+        return WU_STATUS.DONE;
+    }
+    if (hasPhaseWUStatus(phaseWUs, WU_STATUS.IN_PROGRESS)) {
+        return WU_STATUS.IN_PROGRESS;
+    }
+    if (hasPhaseWUStatus(phaseWUs, WU_STATUS.BLOCKED)) {
+        return WU_STATUS.BLOCKED;
+    }
+    if (hasPhaseWUStatus(phaseWUs, WU_STATUS.READY)) {
+        return WU_STATUS.READY;
+    }
+    return normalizeLifecycleStatus(status) || WU_STATUS.IN_PROGRESS;
+}
 function priorityRank(priority) {
     const p = String(priority || '').toUpperCase();
     const map = { P0: 0, P1: 1, P2: 2, P3: 3 };
@@ -75,7 +115,7 @@ function renderDetailed(initiative, useColor) {
     const wuById = new Map(wus.map((wu) => [wu.id, wu]));
     const phaseGroups = getInitiativePhases(id);
     const phases = toInitiativePhases(doc);
-    const status = deriveInitiativeLifecycleStatus(doc.status, phases);
+    const status = deriveInitiativeLifecycleStatus(doc.status, phases, progress);
     const docTitle = asString(doc.title);
     const rawStatus = asString(doc.status);
     const normalizedRawStatus = normalizeLifecycleStatus(rawStatus);
@@ -129,7 +169,7 @@ function renderDetailed(initiative, useColor) {
         console.log('\nPhases:');
         for (const phase of phases) {
             const phaseWUs = phaseGroups.get(phase.id) || [];
-            const phaseStatus = formatStatus(normalizeLifecycleStatus(phase.status), useColor);
+            const phaseStatus = formatStatus(deriveInitiativePhaseStatus(phase.status, phaseWUs), useColor);
             const phaseTitle = asString(phase.title) || `Phase ${phase.id}`;
             console.log(`  ${phase.id}. ${phaseTitle.padEnd(30)} [${phaseStatus}] ${phaseWUs.length} WUs`);
         }
@@ -169,7 +209,7 @@ function renderJSON(initiative) {
     const wus = getInitiativeWUs(id);
     const phaseGroups = getInitiativePhases(id);
     const phases = toInitiativePhases(doc);
-    const status = deriveInitiativeLifecycleStatus(doc.status, phases);
+    const status = deriveInitiativeLifecycleStatus(doc.status, phases, progress);
     const output = {
         id,
         slug: asString(doc.slug),
@@ -191,10 +231,11 @@ function renderJSON(initiative) {
         },
         phases: phases.map((phase) => {
             const phaseWUs = phaseGroups.get(phase.id) || [];
+            const phaseStatus = deriveInitiativePhaseStatus(phase.status, phaseWUs);
             return {
                 id: phase.id,
                 title: asString(phase.title),
-                status: normalizeLifecycleStatus(phase.status),
+                status: phaseStatus,
                 wuCount: phaseWUs.length,
                 wus: phaseWUs.map((w) => ({
                     id: w.id,
@@ -258,7 +299,7 @@ function truncate(str, maxLen) {
 function capitalizeFirst(str) {
     return str.charAt(0).toUpperCase() + str.slice(1).replace(/_/g, ' ');
 }
-async function main() {
+export async function main() {
     const args = createWUParser({
         name: 'initiative-status',
         description: 'Show detailed initiative view with phases and WUs',

package/dist/lane-edit.js

@@ -5,7 +5,7 @@
  * @file lane-edit.ts
  * WU-1854: Safe in-place lane definition editing via micro-worktree
  *
- * Enables editing lane definitions in .lumenflow.config.yaml without
+ * Enables editing lane definitions in workspace.yaml without
  * directly writing to main. Uses the micro-worktree isolation pattern
  * (WU-1262) to commit changes atomically.
  *
@@ -19,11 +19,13 @@
 import path from 'node:path';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import YAML from 'yaml';
-import { findProjectRoot } from '@lumenflow/core/config';
+import { findProjectRoot, WORKSPACE_CONFIG_FILE_NAME } from '@lumenflow/core/config';
+import { WORKSPACE_V2_KEYS } from '@lumenflow/core/config-schema';
 import { die } from '@lumenflow/core/error-handler';
-import { CONFIG_FILES, FILE_SYSTEM } from '@lumenflow/core/wu-constants';
+import { FILE_SYSTEM } from '@lumenflow/core/wu-constants';
 import { withMicroWorktree } from '@lumenflow/core/micro-worktree';
 import { runCLI } from './cli-entry-point.js';
+import { asRecord } from './object-guards.js';
 import { validateLaneArtifacts, classifyLaneLifecycleForProject, LANE_LIFECYCLE_STATUS, } from './lane-lifecycle-process.js';
 // ---------------------------------------------------------------------------
 // Constants
@@ -38,12 +40,13 @@ const ARG_REMOVE_PATH = '--remove-path';
 const ARG_DESCRIPTION = '--description';
 const ARG_HELP = '--help';
 const COMMIT_PREFIX = 'chore: lane:edit';
+const SOFTWARE_DELIVERY_KEY = WORKSPACE_V2_KEYS.SOFTWARE_DELIVERY;
 // ---------------------------------------------------------------------------
 // Help
 // ---------------------------------------------------------------------------
 const HELP_TEXT = `Usage: pnpm lane:edit --name <lane> [options]
 
-Edit a lane definition in .lumenflow.config.yaml via micro-worktree commit.
+Edit a lane definition in workspace.yaml via micro-worktree commit.
 
 Required:
   ${ARG_NAME} <name>          Target lane name (exact match)
@@ -135,11 +138,11 @@ export function parseLaneEditArgs(argv) {
 // Precondition validation
 // ---------------------------------------------------------------------------
 export function validateLaneEditPreconditions(projectRoot) {
-    const configPath = path.join(projectRoot, CONFIG_FILES.LUMENFLOW_CONFIG);
+    const configPath = path.join(projectRoot, WORKSPACE_CONFIG_FILE_NAME);
     if (!existsSync(configPath)) {
         return {
             ok: false,
-            error: `${LOG_PREFIX} Missing ${CONFIG_FILES.LUMENFLOW_CONFIG}. Run \`pnpm exec lumenflow init\` first.`,
+            error: `${LOG_PREFIX} Missing ${WORKSPACE_CONFIG_FILE_NAME}. Run \`pnpm workspace-init --yes\` first.`,
         };
     }
     const classification = classifyLaneLifecycleForProject(projectRoot);
@@ -226,11 +229,17 @@ export function applyLaneEdit(definitions, options) {
 // ---------------------------------------------------------------------------
 function readConfigDoc(configPath) {
     const content = readFileSync(configPath, FILE_SYSTEM.UTF8);
-    const parsed = YAML.parse(content);
-    return parsed && typeof parsed === 'object' ? parsed : {};
+    const workspace = asRecord(YAML.parse(content));
+    if (!workspace) {
+        return {};
+    }
+    return asRecord(workspace[SOFTWARE_DELIVERY_KEY]) ?? {};
 }
 function writeConfigDoc(configPath, config) {
-    const nextContent = YAML.stringify(config);
+    const content = readFileSync(configPath, FILE_SYSTEM.UTF8);
+    const workspace = asRecord(YAML.parse(content)) ?? {};
+    workspace[SOFTWARE_DELIVERY_KEY] = config;
+    const nextContent = YAML.stringify(workspace);
     writeFileSync(configPath, nextContent, FILE_SYSTEM.UTF8);
 }
 // ---------------------------------------------------------------------------
@@ -275,7 +284,7 @@ async function main() {
         logPrefix: LOG_PREFIX,
         pushOnly: true,
         async execute({ worktreePath }) {
-            const configRelPath = CONFIG_FILES.LUMENFLOW_CONFIG;
+            const configRelPath = WORKSPACE_CONFIG_FILE_NAME;
             const configPath = path.join(worktreePath, configRelPath);
             if (!existsSync(configPath)) {
                 die(`${LOG_PREFIX} Config file not found in micro-worktree: ${configRelPath}`);