@wpmoo/toolkit 0.9.3 → 0.9.5

package/dist/cli.js

@@ -14,6 +14,7 @@ import { isDailyActionCommand, runDailyAction } from './daily-actions.js';
 import { getDoctorReport, runDoctor } from './doctor.js';
 import { getOriginUrl, realGit } from './git.js';
 import { renderHelp } from './help.js';
+import { runLocalCockpit } from './local-cockpit.js';
 import { addModuleToSourceRepo, listModulesInSourceRepo, removeModuleFromSourceRepo, } from './module-actions.js';
 import { supportedOdooVersions } from './odoo-versions.js';
 import { renderRepositorySetupNote } from './prompt-copy.js';
@@ -21,6 +22,7 @@ import { promptRepositoryUrl } from './prompt-repositories.js';
 import { inferGitHubOwner, inferRepoPath, normalizeRepositoryUrl } from './repo-url.js';
 import { addModuleRepo, listModuleRepos, removeModuleRepo } from './repo-actions.js';
 import { renderSafeResetPreview, safeResetEnvironment } from './safe-reset.js';
+import { getServiceRuntimeStatus, renderServiceRuntimeStatusLine, } from './service-runtime-status.js';
 import { listSources, renderSourceList, sourceListJson, sourceSyncJson, syncSources, } from './source-actions.js';
 import { backupTargetPath, expectedTargetConfirmation, inspectEnvironmentTarget, renderExistingEnvironmentSummary, renderForeignEnvironmentTargetWarning, } from './environment-target-preflight.js';
 import { getGitHubPrerequisiteStatus, renderGitHubPrerequisiteGuidance, } from './github-prerequisites.js';
@@ -114,10 +116,25 @@ function jsonOption(values) {
 function printJson(value) {
     console.log(JSON.stringify(value));
 }
-function yellow(value) {
-    if (!process.stdout.isTTY || process.env.NO_COLOR !== undefined)
+function supportsAnsi() {
+    return Boolean(process.stdout.isTTY) && process.env.NO_COLOR === undefined;
+}
+function ansi(value, open, close) {
+    if (!supportsAnsi())
         return value;
-    return `\u001b[33m${value}\u001b[39m`;
+    return `${open}${value}${close}`;
+}
+function yellow(value) {
+    return ansi(value, '\u001B[33m', '\u001B[39m');
+}
+function cyan(value) {
+    return ansi(value, '\u001B[36m', '\u001B[39m');
+}
+function boldGreen(value) {
+    return ansi(value, '\u001B[1m\u001B[32m', '\u001B[39m\u001B[22m');
+}
+function dim(value) {
+    return ansi(value, '\u001B[2m', '\u001B[22m');
 }
 function shellQuote(value) {
     if (/^[A-Za-z0-9_./:-]+$/.test(value))
@@ -132,12 +149,22 @@ function renderedSourceRepoPath(target, sourceType, repoPath) {
 }
 function renderPostCreateGuidance(target, cwd) {
     const relativeTarget = relative(cwd, target) || '.';
-    return yellow([
-        'Environment is ready. Enter the development folder, then run the local WPMoo cockpit:',
+    const cdCommand = `cd ${shellQuote(relativeTarget)}`;
+    if (!supportsAnsi()) {
+        return [
+            'Environment is ready. Open it now, or copy these commands:',
+            '',
+            cdCommand,
+            './moo',
+        ].join('\n');
+    }
+    return [
+        boldGreen('✓ Environment is ready.'),
+        cyan('Open it now, or copy these commands:'),
         '',
-        `cd ${shellQuote(relativeTarget)}`,
-        './moo',
-    ].join('\n'));
+        yellow(cdCommand),
+        yellow('./moo'),
+    ].join('\n');
 }
 function validateRepoName(value) {
     const normalized = value.trim();
@@ -169,12 +196,16 @@ function renderStartupBanner(details, latestVersion) {
     const versionLine = startupVersionLine(latestVersion);
     return renderBanner(details?.(versionLine), details ? { version: versionLine } : undefined);
 }
-function renderCockpitStatusLines(status, lastStatus) {
-    return [renderStartupEnvironmentLine(status), lastStatus];
+function renderCockpitStatusLines(status, serviceStatus, lastStatus) {
+    return [renderStartupEnvironmentLine(status), renderServiceRuntimeStatusLine(serviceStatus), lastStatus];
 }
 function renderLastCommandStatus(command) {
     return `Last: ${command.label} ✓ completed`;
 }
+function renderLastCommandError(command, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return `Last: ${command.label} ✗ Error: ${message}`;
+}
 function clearCockpitScreen() {
     if (process.stdout.isTTY) {
         process.stdout.write('\u001B[2J\u001B[H');
@@ -219,8 +250,8 @@ async function showStartup(argv, skipUpdateCheck, details) {
     }
     console.log();
 }
-async function selectCockpitCommandFromMenu() {
-    const selection = await selectCockpitTopLevelMenu();
+async function selectCockpitCommandFromMenu(serviceStatus) {
+    const selection = await selectCockpitTopLevelMenu({ serviceStatus });
     if (selection.kind === 'exit') {
         return 'exit';
     }
@@ -260,7 +291,7 @@ async function resolveEnvironmentTargetFromPrompts(product, cancelAction) {
             message: 'This environment folder already exists. What do you want to do?',
             options: [
                 { value: 'update-existing', label: 'Update existing environment' },
-                { value: 'reinstall-environment', label: 'Reinstall environment from backup' },
+                { value: 'reinstall-environment', label: 'Back up existing environment folder and create a new one' },
                 { value: 'delete-environment', label: 'Delete environment' },
                 { value: 'cancel', label: 'Cancel' },
             ],
@@ -837,11 +868,11 @@ async function ensureGitHubRepositories(options, interactive) {
         throw new Error(`Dev environment repository is non-empty or could not be verified: ${blocked.map((repo) => repo.slug).join(', ')}`);
     }
     if (interactive && accessible.length > 0) {
-        notePrompt([
+        notePrompt(dim([
             'These GitHub repositories already exist and are accessible:',
             '',
             ...accessible.map((repository) => `- ${repository.label}: ${repository.slug}`),
-        ].join('\n'), 'Repository check');
+        ].join('\n')), 'Repository check');
     }
     if (missing.length === 0) {
         return;
@@ -922,7 +953,19 @@ async function finishCreateFlow(result, cwd, interactive) {
             console.log(`- ${command}`);
         return;
     }
-    notePrompt(renderPostCreateGuidance(options.target, cwd), 'Next steps');
+    notePrompt(renderPostCreateGuidance(options.target, cwd), 'Next steps', { indent: false });
+    if (interactive) {
+        const shouldOpenCockpit = await confirmPrompt({
+            message: 'Open the local WPMoo cockpit now?',
+            active: 'Y',
+            inactive: 'n',
+            initialValue: true,
+        });
+        if (shouldOpenCockpit === true) {
+            await runLocalCockpit(options.target);
+            return;
+        }
+    }
     outroPrompt(`Created Odoo dev overlay in ${options.target}. Review staged changes, then commit.`);
 }
 async function runCockpitCommand(command, cwd) {
@@ -1012,22 +1055,37 @@ export async function runCli(cliArgv = process.argv.slice(2), cwd = process.cwd(
             return;
         }
         let lastStatus = 'Last: Ready';
-        const initialStatus = await getEnvironmentStatus(cwd);
-        await showStartup(argv, skipUpdateCheck, () => renderCockpitStatusLines(initialStatus, lastStatus));
+        let status = await getEnvironmentStatus(cwd);
+        let serviceStatus = await getServiceRuntimeStatus(cwd, status);
+        await showStartup(argv, skipUpdateCheck, () => renderCockpitStatusLines(status, serviceStatus, lastStatus));
         while (true) {
             try {
-                const command = await selectCockpitCommandFromMenu();
+                const command = await selectCockpitCommandFromMenu(serviceStatus);
                 if (command === 'exit') {
                     return;
                 }
-                const outcome = await runCockpitCommand(command, cwd);
+                let outcome = 'continue';
+                let commandFailed = false;
+                try {
+                    outcome = await runCockpitCommand(command, cwd);
+                }
+                catch (error) {
+                    if (isMenuBackSignal(error)) {
+                        continue;
+                    }
+                    commandFailed = true;
+                    lastStatus = renderLastCommandError(command, error);
+                }
                 if (outcome === 'exit') {
                     return;
                 }
-                lastStatus = renderLastCommandStatus(command);
-                const status = await getEnvironmentStatus(cwd);
+                if (!commandFailed) {
+                    lastStatus = renderLastCommandStatus(command);
+                }
+                status = await getEnvironmentStatus(cwd);
+                serviceStatus = await getServiceRuntimeStatus(cwd, status);
                 clearCockpitScreen();
-                console.log(renderBanner(renderCockpitStatusLines(status, lastStatus), { version: startupVersionLine() }));
+                console.log(renderBanner(renderCockpitStatusLines(status, serviceStatus, lastStatus), { version: startupVersionLine() }));
                 console.log();
             }
             catch (error) {

package/dist/cockpit/menu.js

@@ -32,25 +32,51 @@ function categoryHeading(category) {
 function commandName(command) {
     return `${rgb(226, 184, 96, ` ${command.label.padEnd(topLevelCommandLabelWidth)}`)}${dim(`  ${command.description}`)}`;
 }
-function categoryChoices(category, index) {
+function disabledReason(command, serviceStatus) {
+    if (command.category !== 'services' || !serviceStatus)
+        return undefined;
+    if (serviceStatus.kind === 'docker-not-running')
+        return 'Docker not running.';
+    if (serviceStatus.kind === 'running' && command.id === 'start')
+        return 'Already running.';
+    if (serviceStatus.kind === 'stopped' && ['stop', 'restart', 'logs', 'shell'].includes(command.id)) {
+        return 'Services stopped.';
+    }
+    return undefined;
+}
+function disabledMenuReason(serviceStatus) {
+    if (serviceStatus?.kind === 'docker-not-running')
+        return 'Docker not running.';
+    if (serviceStatus?.kind === 'running')
+        return 'Already running.';
+    if (serviceStatus?.kind === 'stopped')
+        return 'Services stopped.';
+    return undefined;
+}
+function disabledError(serviceStatus) {
+    const reason = disabledMenuReason(serviceStatus);
+    return reason ? `This option is disabled and cannot be selected.\nReason: ${reason}` : undefined;
+}
+function categoryChoices(category, index, serviceStatus) {
     const choices = [
         promptSeparator(categoryHeading(category)),
         ...topLevelCommands
             .filter((command) => command.category === category)
-            .map((command) => ({
-            value: command,
-            name: commandName(command),
-            short: command.label,
-        })),
+            .map((command) => {
+            const reason = disabledReason(command, serviceStatus);
+            return {
+                value: command,
+                name: commandName(command),
+                short: command.label,
+                disabled: reason ? true : undefined,
+            };
+        }),
     ];
     if (index < topLevelCategoryOrder.length - 1) {
         choices.push(promptSeparator(' '));
     }
     return choices;
 }
-const topLevelChoices = [
-    ...topLevelCategoryOrder.flatMap(categoryChoices),
-];
 const minimumTopLevelPageSize = 8;
 const startupViewportReservedRows = 11;
 function topLevelPageSize(choiceCount) {
@@ -75,15 +101,29 @@ function menuDeps(deps = {}) {
 function isCockpitCommand(value) {
     return typeof value === 'object' && value !== null && 'id' in value && 'slashAlias' in value;
 }
+function topLevelChoices(serviceStatus) {
+    return topLevelCategoryOrder.flatMap((category, index) => categoryChoices(category, index, serviceStatus));
+}
+function defaultCommand(serviceStatus) {
+    if (serviceStatus?.kind === 'running') {
+        return cockpitCommands.find((command) => command.id === 'stop') ?? topLevelCommands[0];
+    }
+    if (serviceStatus?.kind === 'docker-not-running') {
+        return cockpitCommands.find((command) => command.id === 'status') ?? topLevelCommands[0];
+    }
+    return cockpitCommands.find((command) => command.id === 'start') ?? topLevelCommands[0];
+}
 export async function selectCockpitTopLevelMenu(options = {}) {
     const deps = menuDeps(options);
+    const choices = topLevelChoices(options.serviceStatus);
     const selected = await deps.select({
         message: '',
-        choices: [...topLevelChoices],
-        default: topLevelCommands[0],
-        pageSize: topLevelPageSize(topLevelChoices.length),
+        choices: [...choices],
+        default: defaultCommand(options.serviceStatus),
+        pageSize: topLevelPageSize(choices.length),
         loop: false,
         hideMessage: true,
+        disabledError: disabledError(options.serviceStatus),
     });
     deps.handleCancel(selected, 'exit');
     if (selected === 'exit') {

package/dist/local-cockpit.js

@@ -0,0 +1,15 @@
+import { spawn } from 'node:child_process';
+import { join } from 'node:path';
+export async function runLocalCockpit(target) {
+    const child = spawn(join(target, 'moo'), [], {
+        cwd: target,
+        stdio: 'inherit',
+    });
+    const exitCode = await new Promise((resolve, reject) => {
+        child.on('error', reject);
+        child.on('close', resolve);
+    });
+    if (exitCode !== 0) {
+        throw new Error(`Local WPMoo cockpit exited with code ${exitCode ?? 'unknown'}: ${join(target, 'moo')}`);
+    }
+}

package/dist/prompts/index.js

@@ -1,4 +1,5 @@
 import { emitKeypressEvents } from 'node:readline';
+import { styleText } from 'node:util';
 import inquirerSelect, { Separator as InquirerSeparator } from '@inquirer/select';
 import inquirerSearch from '@inquirer/search';
 import { confirm as inquirerConfirm, input as inquirerInput } from '@inquirer/prompts';
@@ -90,9 +91,10 @@ function asInquirerSelectConfig(options) {
         pageSize: options.pageSize,
         loop: options.loop,
         hideMessage: options.hideMessage,
+        disabledError: options.disabledError,
     };
 }
-function hiddenSelectTheme() {
+function hiddenSelectTheme(disabledError) {
     return {
         prefix: '',
         icon: {
@@ -101,19 +103,21 @@ function hiddenSelectTheme() {
         style: {
             message: () => '',
             highlight: (text) => text,
+            disabled: (text) => styleText('dim', text.replace(/ \(disabled\)$/u, ''), { validateStream: false }),
             keysHelpTip: () => '↑↓ navigate • ⏎ select • Ctrl+C exit',
         },
+        i18n: disabledError ? { disabledError } : undefined,
     };
 }
 function withHiddenSelectMessage(config) {
     if (!config.hideMessage) {
         return config;
     }
-    const { hideMessage: _hideMessage, ...inquirerConfig } = config;
+    const { disabledError, hideMessage: _hideMessage, ...inquirerConfig } = config;
     return {
         ...inquirerConfig,
         message: '',
-        theme: hiddenSelectTheme(),
+        theme: hiddenSelectTheme(disabledError),
     };
 }
 function asInquirerConfirmConfig(options) {
@@ -162,11 +166,12 @@ export function introPrompt(title) {
     console.log(title);
     console.log(rule);
 }
-export function notePrompt(message, title = 'Note') {
+export function notePrompt(message, title = 'Note', options = {}) {
     const lines = message.split('\n');
+    const prefix = options.indent === false ? '' : '  ';
     console.log(`[${title}]`);
     for (const line of lines) {
-        console.log(`  ${line}`);
+        console.log(`${prefix}${line}`);
     }
 }
 export function outroPrompt(message) {

package/dist/service-runtime-status.js

@@ -0,0 +1,48 @@
+import { execFile } from 'node:child_process';
+function run(command, args, options) {
+    return new Promise((resolve, reject) => {
+        execFile(command, args, { cwd: options.cwd }, (error, stdout) => {
+            if (error) {
+                reject(error);
+                return;
+            }
+            resolve({ stdout });
+        });
+    });
+}
+export function renderServiceRuntimeStatusLine(status) {
+    if (status.kind === 'running')
+        return 'Status: ● Services running';
+    if (status.kind === 'docker-not-running')
+        return 'Status: ● Docker not running';
+    return 'Status: ● Services stopped';
+}
+export async function getServiceRuntimeStatus(target, environmentStatus, runner = run) {
+    try {
+        await runner('docker', ['info', '--format', '{{.ServerVersion}}'], { cwd: target });
+    }
+    catch {
+        return { kind: 'docker-not-running' };
+    }
+    if (environmentStatus.kind !== 'environment' ||
+        environmentStatus.composeFiles.length === 0 ||
+        environmentStatus.composeErrors.length > 0) {
+        return { kind: 'stopped' };
+    }
+    const args = [
+        'compose',
+        ...environmentStatus.composeFiles.flatMap((file) => ['-f', file]),
+        'ps',
+        '--services',
+        '--filter',
+        'status=running',
+    ];
+    let result;
+    try {
+        result = await runner('docker', args, { cwd: target });
+    }
+    catch {
+        return { kind: 'stopped' };
+    }
+    return result.stdout.trim() ? { kind: 'running' } : { kind: 'stopped' };
+}

package/dist/templates.js

@@ -279,6 +279,10 @@ const ANSI_DIM = '\u001B[2m';
 const ANSI_INFO = '\u001B[38;2;139;166;190m';
 const ANSI_TAGLINE = '\u001B[38;2;120;157;181m';
 const ANSI_META = '\u001B[38;2;218;236;246m';
+const ANSI_SUCCESS = '\u001B[32m';
+const ANSI_ERROR = '\u001B[31m';
+const ANSI_WARNING = '\u001B[33m';
+const ANSI_DEFAULT_FOREGROUND = '\u001B[39m';
 const ANSI_RESET = '\u001B[0m';
 const BANNER_TAGLINE = 'Development, staging and production workflows for Odoo projects.';
 function gradientColor(column, width) {
@@ -307,15 +311,50 @@ function renderDimInfo(value) {
 function renderMetaInfo(value) {
     return `${ANSI_META}${value}${ANSI_RESET}`;
 }
+function renderSuccessInfo(value) {
+    return `${ANSI_SUCCESS}${value}${ANSI_DEFAULT_FOREGROUND}`;
+}
+function renderErrorInfo(value) {
+    return `${ANSI_ERROR}${value}${ANSI_DEFAULT_FOREGROUND}`;
+}
+function renderWarningInfo(value) {
+    return `${ANSI_WARNING}${value}${ANSI_DEFAULT_FOREGROUND}`;
+}
 function renderTaglineInfo(value) {
     return `${ANSI_TAGLINE}${value}${ANSI_RESET}`;
 }
 function renderBannerDetail(value) {
-    const match = /^(Environment|Last):(.*)$/u.exec(value);
+    const match = /^(Environment|Status|Last):(.*)$/u.exec(value);
     if (!match) {
         return renderDimInfo(value);
     }
-    return `${renderMetaInfo(`${match[1]}:`)}${renderDimInfo(match[2] ?? '')}`;
+    const label = match[1];
+    const detail = match[2] ?? '';
+    if (label === 'Status') {
+        const statusMatch = /^ (●) (.*)$/u.exec(detail);
+        if (statusMatch) {
+            const marker = statusMatch[1] ?? '';
+            const message = statusMatch[2] ?? '';
+            const renderMarker = message === 'Services running' ? renderSuccessInfo : renderWarningInfo;
+            return `${renderMetaInfo(`${label}:`)} ${renderMarker(marker)}${renderTaglineInfo(` ${message}`)}`;
+        }
+    }
+    if (label === 'Last') {
+        const completedMatch = /^(.*?)( ✓ completed)$/u.exec(detail);
+        if (completedMatch) {
+            return `${renderMetaInfo(`${label}:`)}${renderDimInfo(completedMatch[1] ?? '')}${renderSuccessInfo(completedMatch[2] ?? '')}`;
+        }
+        const errorMatch = /^(.*?)( ✗ Error)(: .*)?$/u.exec(detail);
+        if (errorMatch) {
+            return [
+                renderMetaInfo(`${label}:`),
+                renderDimInfo(errorMatch[1] ?? ''),
+                renderErrorInfo(errorMatch[2] ?? ''),
+                renderTaglineInfo(errorMatch[3] ?? ''),
+            ].join('');
+        }
+    }
+    return `${renderMetaInfo(`${label}:`)}${renderDimInfo(detail)}`;
 }
 export function renderBanner(details = [], options = {}) {
     const title = `${applyBannerGradient('WPMoo Toolkit')}${options.version ? `  ${renderDimInfo(options.version)}` : ''}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wpmoo/toolkit",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "WPMoo Toolkit for development, staging, and production lifecycle workflows.",
   "type": "module",
   "repository": {