@wpmoo/toolkit 0.9.24 → 0.9.26

package/dist/service-runtime-status.js

@@ -1,4 +1,6 @@
 import { execFile } from 'node:child_process';
+const odooHttpReadyUrl = 'http://127.0.0.1:8069';
+const odooHttpProbeTimeoutMs = 1_000;
 function run(command, args, options) {
     return new Promise((resolve, reject) => {
         execFile(command, args, { cwd: options.cwd }, (error, stdout) => {
@@ -10,11 +12,36 @@ function run(command, args, options) {
         });
     });
 }
+async function fetchOdooHttpReady() {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), odooHttpProbeTimeoutMs);
+    try {
+        return await fetch(odooHttpReadyUrl, { signal: controller.signal });
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
 export function renderServiceRuntimeStatusLine(status) {
-    if (status.kind === 'running')
+    if (status.kind === 'running' ||
+        status.kind === 'services-running' ||
+        status.kind === 'odoo-not-ready' ||
+        status.kind === 'fully-ready' ||
+        status.kind === 'db-ready') {
+        if (status.kind === 'db-ready') {
+            return 'Status: ● DB ready';
+        }
+        if (status.kind === 'odoo-not-ready') {
+            return 'Status: ● Odoo not ready';
+        }
+        if (status.kind === 'fully-ready') {
+            return 'Status: ● Fully ready';
+        }
         return 'Status: ● Services running';
-    if (status.kind === 'docker-not-running')
+    }
+    if (status.kind === 'docker-not-running') {
         return 'Status: ● Docker not running';
+    }
     return 'Status: ● Services stopped';
 }
 export async function getServiceRuntimeStatus(target, environmentStatus, runner = run) {
@@ -44,5 +71,40 @@ export async function getServiceRuntimeStatus(target, environmentStatus, runner
     catch {
         return { kind: 'stopped' };
     }
-    return result.stdout.trim() ? { kind: 'running' } : { kind: 'stopped' };
+    if (!result.stdout.trim()) {
+        return { kind: 'stopped' };
+    }
+    const runningServices = result.stdout
+        .trim()
+        .split('\n')
+        .map((service) => service.trim())
+        .filter(Boolean);
+    if (!runningServices.includes('db')) {
+        return { kind: 'services-running' };
+    }
+    const dbProbeArgs = [
+        'compose',
+        ...environmentStatus.composeFiles.flatMap((file) => ['-f', file]),
+        'exec',
+        '-T',
+        'db',
+        'pg_isready',
+        '-U',
+        'odoo',
+        '-d',
+        'postgres',
+    ];
+    try {
+        await runner('docker', dbProbeArgs, { cwd: target });
+    }
+    catch {
+        return { kind: 'services-running' };
+    }
+    try {
+        const response = await fetchOdooHttpReady();
+        return response.ok ? { kind: 'fully-ready' } : { kind: 'odoo-not-ready' };
+    }
+    catch {
+        return { kind: 'db-ready' };
+    }
 }

package/dist/templates.js

@@ -226,8 +226,8 @@ exposes them through \`/mnt/wpmoo-addons\`.
 \`./moo\` routes day-to-day service and module workflows to local scripts in
 \`./scripts/\` (for example \`start\`, \`logs\`, \`update\`, \`test\`, \`snapshot\`).
 \`./moo status\` runs local offline metadata checks without needing network access.
-\`./moo doctor\` remains the package fallback command and runs via
-\`npx --yes ${fallbackPackageSpec()} doctor\`.
+\`./moo doctor\` runs local checks first and uses the package fallback only for
+advanced usage (for example \`--help\`) via \`npx --yes ${fallbackPackageSpec()} doctor\`.
 
 ### Start And Inspect Services
 
@@ -449,7 +449,7 @@ usage() {
   case "$1" in
     "start") echo "Usage: ./moo start" ;;
     "stop") echo "Usage: ./moo stop" ;;
-    "logs") echo "Usage: ./moo logs [service]" ;;
+    "logs") echo "Usage: ./moo logs [service] [tail-lines]" ;;
     "restart") echo "Usage: ./moo restart" ;;
     "shell") echo "Usage: ./moo shell" ;;
     "psql") echo "Usage: ./moo psql [db]" ;;
@@ -601,6 +601,62 @@ allow_stage_lifecycle() {
   [[ "$value" == "1" ]]
 }
 
+allow_no_recent_snapshot() {
+  local value="\${WPMOO_ALLOW_NO_RECENT_SNAPSHOT:-$(env_file_value WPMOO_ALLOW_NO_RECENT_SNAPSHOT)}"
+  [[ "$value" == "1" ]]
+}
+
+allow_migrations() {
+  local value="\${WPMOO_ALLOW_MIGRATIONS:-$(env_file_value WPMOO_ALLOW_MIGRATIONS)}"
+  [[ "$value" == "1" ]]
+}
+
+has_recent_snapshot() {
+  local dir
+  for dir in backups backup snapshots; do
+    [[ -d "$dir" ]] || continue
+    if find "$dir" -type f \\( -name "*.dump" -o -name "*.sql" -o -name "*.sql.gz" -o -name "*.zip" -o -name "*.tar" -o -name "*.tar.gz" \\) -mtime -1 -print -quit 2>/dev/null | grep -q .; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+require_recent_snapshot_or_override() {
+  local command="$1"
+  local env_name
+  env_name="$(selected_env)"
+  if [[ "$env_name" == "stage" || "$env_name" == "prod" ]]; then
+    if ! allow_no_recent_snapshot && ! has_recent_snapshot; then
+      echo "Refusing destructive command '$command' in WPMOO_ENV=$env_name without a recent database snapshot. Create a snapshot first or set WPMOO_ALLOW_NO_RECENT_SNAPSHOT=1 to run it intentionally." >&2
+      exit 1
+    fi
+  fi
+}
+
+has_migration_risk() {
+  local base
+  for base in odoo/custom/src/private odoo/custom/src/oca odoo/custom/src/external; do
+    [[ -d "$base" ]] || continue
+    if find "$base" -type f \\( -path "*/migrations/*/pre-migration.py" -o -path "*/migrations/*/post-migration.py" -o -path "*/migrations/*/end-migration.py" -o -path "*/migration/*/pre-migration.py" -o -path "*/migration/*/post-migration.py" -o -path "*/migration/*/end-migration.py" -o -path "*/scripts/migrate.py" -o -path "*/scripts/migration.py" \\) -print -quit 2>/dev/null | grep -q .; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+require_migrations_allowed() {
+  local command="$1"
+  local env_name
+  env_name="$(selected_env)"
+  if [[ "$env_name" == "stage" || "$env_name" == "prod" ]]; then
+    if ! allow_migrations && has_migration_risk; then
+      echo "Refusing migration-risk command '$command' in WPMOO_ENV=$env_name. Review detected migration scripts or set WPMOO_ALLOW_MIGRATIONS=1 to run it intentionally." >&2
+      exit 1
+    fi
+  fi
+}
+
 require_stage_lifecycle_allowed() {
   local command="$1"
   local env_name
@@ -657,7 +713,14 @@ case "$command" in
     fi
     run_package_command "$command" "$@"
     ;;
-  "create"|"add-repo"|"remove-repo"|"add-module"|"remove-module"|"source"|"reset"|"doctor")
+  "doctor")
+    shift
+    if [[ "$#" -eq 0 && -x ./scripts/doctor.sh ]]; then
+      run_script ./scripts/doctor.sh
+    fi
+    run_package_command "$command" "$@"
+    ;;
+  "create"|"add-repo"|"remove-repo"|"add-module"|"remove-module"|"source"|"reset")
     run_package_command "$@"
     ;;
   "start")
@@ -672,7 +735,17 @@ case "$command" in
     ;;
   "logs")
     shift
-    service="$(optional_single_arg "$command" "odoo" "$@")"
+    if [[ "$#" -gt 2 || "\${1:-}" == -* || "\${2:-}" == -* ]]; then
+      fail_usage "$command"
+    fi
+    service="\${1:-odoo}"
+    if [[ "$#" -eq 2 ]]; then
+      if [[ ! "$2" =~ ^[1-9][0-9]*$ ]]; then
+        echo "Invalid logs tail count: expected a positive integer." >&2
+        exit 2
+      fi
+      run_script ./scripts/logs.sh "$service" "$2"
+    fi
     run_script ./scripts/logs.sh "$service"
     ;;
   "restart")
@@ -695,6 +768,7 @@ case "$command" in
     require_module_args "$command" "$@"
     require_stage_lifecycle_allowed "$command"
     require_prod_lifecycle_allowed "$command"
+    require_migrations_allowed "$command"
     run_script ./scripts/install.sh "$@"
     ;;
   "update")
@@ -702,18 +776,21 @@ case "$command" in
     require_module_args "$command" "$@"
     require_stage_lifecycle_allowed "$command"
     require_prod_lifecycle_allowed "$command"
+    require_migrations_allowed "$command"
     run_script ./scripts/update.sh "$@"
     ;;
   "test")
     shift
     validate_test_args "$@"
     require_prod_lifecycle_allowed "$command"
+    require_migrations_allowed "$command"
     run_script ./scripts/test.sh "$@"
     ;;
   "resetdb")
     shift
     positional_args "$command" 0 2 "$@"
     require_destructive_allowed "$command"
+    require_recent_snapshot_or_override "$command"
     run_script ./scripts/resetdb.sh "$@"
     ;;
   "snapshot")
@@ -732,6 +809,7 @@ case "$command" in
     restore_args+=("$@")
     if [[ "\${restore_args[0]:-}" != "--dry-run" ]]; then
       require_destructive_allowed "$command"
+      require_recent_snapshot_or_override "$command"
     fi
     run_script ./scripts/restore-snapshot.sh "\${restore_args[@]}"
     ;;
@@ -753,6 +831,91 @@ case "$command" in
 esac
 `;
 }
+export function renderDoctorScript() {
+    return `#!/usr/bin/env bash
+set -euo pipefail
+
+script_dir="$(cd -- "$(dirname -- "\${BASH_SOURCE[0]}")" && pwd)"
+root_dir="$(cd -- "$script_dir/.." && pwd)"
+cd "$root_dir"
+
+echo "WPMoo doctor"
+
+issues=()
+warnings=()
+
+required_files=(
+  "moo"
+)
+
+required_scripts=(
+  "up.sh"
+  "down.sh"
+  "logs.sh"
+  "restart.sh"
+  "shell.sh"
+  "psql.sh"
+  "install.sh"
+  "update.sh"
+  "test.sh"
+  "resetdb.sh"
+  "snapshot.sh"
+  "restore-snapshot.sh"
+  "lint.sh"
+  "pot.sh"
+  "status.sh"
+)
+
+for file in "\${required_files[@]}"; do
+  if [[ ! -f "$file" ]]; then
+    issues+=("missing required file: $file")
+  fi
+done
+
+for script in "\${required_scripts[@]}"; do
+  script_path="scripts/$script"
+  if [[ ! -f "$script_path" ]]; then
+    issues+=("missing required script: $script_path")
+    continue
+  fi
+  if [[ ! -x "$script_path" ]]; then
+    issues+=("not executable: $script_path")
+  fi
+done
+
+if [[ ! -d scripts ]]; then
+  issues+=("missing scripts directory")
+fi
+
+if [[ ! -d odoo/custom/src ]]; then
+  warnings+=("odoo/custom/src is missing; add source repositories before running module workflows.")
+fi
+
+if [[ ! -f .wpmoo/odoo.json ]]; then
+  warnings+=("missing .wpmoo/odoo.json; run ./moo reset to initialize environment metadata.")
+fi
+
+if (( \${#issues[@]} > 0 )); then
+  echo "Doctor checks found issues."
+  for issue in "\${issues[@]}"; do
+    echo " - $issue"
+  done
+  if (( \${#warnings[@]} > 0 )); then
+    for warning in "\${warnings[@]}"; do
+      echo " - warning: $warning"
+    done
+  fi
+  exit 1
+fi
+
+echo "Doctor checks passed."
+if (( \${#warnings[@]} > 0 )); then
+  for warning in "\${warnings[@]}"; do
+    echo " - warning: $warning"
+  done
+fi
+`;
+}
 export function renderStatusScript() {
     return `#!/usr/bin/env bash
 set -euo pipefail
@@ -1360,7 +1523,7 @@ Useful maintenance commands:
 Daily script delegation vs package fallback:
 - \`./moo start\`, \`logs\`, \`install\`, \`update\`, \`test\`, \`snapshot\`, and related runtime tasks delegate to local \`./scripts/*.sh\`.
 - \`./moo status\` runs local offline metadata checks through \`./scripts/status.sh\`.
-- \`./moo doctor\` remains a package fallback command routed to \`npx --yes ${fallbackPackageSpec()} doctor\`.
+- \`./moo doctor\` runs local checks first and uses package fallback for advanced usage, routed via \`npx --yes ${fallbackPackageSpec()} doctor\`.
 
 Only report completion after the relevant update/test/lint command exits cleanly.
 `;

package/package.json

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