@fecommunity/reactpress 4.0.0-beta.17 → 4.0.0-beta.18

package/out/bin/reactpress-theme-client.js

@@ -36,6 +36,10 @@ function runStartCommand() {
     return ['npm', ['run', 'start']];
 }
 function ensureBuilt() {
+    const { ensureBundledPlugins } = require('../core/services/local-site');
+    if (ensureBundledPlugins(originalCwd)) {
+        console.log('[ReactPress Client] Seeded bundled plugins into project');
+    }
     const adminSynced = ensureAdminStaticForTheme(originalCwd, clientDir);
     const apiProxyPatched = patchThemeApiProxyRoute(clientDir);
     const { activeTheme } = readActiveThemeManifest(originalCwd);

package/out/bin/reactpress.js

@@ -39,9 +39,10 @@ const LEGACY_COMMANDS = new Set([
 function attachLogsOptions(cmd) {
     return cmd
         .option('--tail <n>', t('cli.logs.tailOption'), '50')
-        .option('--source <name>', t('cli.logs.sourceOption'), 'error')
+        .option('--source <name>', t('cli.logs.sourceOption'))
         .option('--grep <pattern>', t('cli.logs.grepOption'))
-        .option('--list', t('cli.logs.listOption'));
+        .option('--list', t('cli.logs.listOption'))
+        .option('-f, --follow', t('cli.logs.followOption'));
 }
 function createLogsAction() {
     return async (directory, options) => {

package/out/core/services/admin-static.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveBundledAdminDistDir = resolveBundledAdminDistDir;
 exports.resolveWebPackageRoot = resolveWebPackageRoot;
+exports.adminSourceIsNewerThanTheme = adminSourceIsNewerThanTheme;
 exports.ensureAdminRewritesInNextConfig = ensureAdminRewritesInNextConfig;
 exports.ensureAdminStaticForTheme = ensureAdminStaticForTheme;
 exports.shouldRebuildThemeAfterAdminSync = shouldRebuildThemeAfterAdminSync;
@@ -26,6 +27,45 @@ function resolveWebPackageRoot(projectRoot) {
     }
     return null;
 }
+function readAdminMainAssetId(indexHtmlPath) {
+    try {
+        const html = fs_extra_1.default.readFileSync(indexHtmlPath, 'utf8');
+        return html.match(/assets\/(index-[^"]+\.js)/)?.[1] ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+function resolveAdminDistSource(projectRoot) {
+    const bundled = resolveBundledAdminDistDir();
+    const webRoot = resolveWebPackageRoot(projectRoot);
+    const webDist = webRoot ? node_path_1.default.join(webRoot, 'dist') : null;
+    const webIndex = webDist ? node_path_1.default.join(webDist, 'index.html') : null;
+    if (webIndex && fs_extra_1.default.existsSync(webIndex)) {
+        if (!bundled)
+            return webDist;
+        const bundledIndex = node_path_1.default.join(bundled, 'index.html');
+        const webMtime = fs_extra_1.default.statSync(webIndex).mtimeMs;
+        const bundledMtime = fs_extra_1.default.statSync(bundledIndex).mtimeMs;
+        return webMtime >= bundledMtime ? webDist : bundled;
+    }
+    return bundled;
+}
+/** True when CLI/web admin-dist is newer than the theme's copied public/admin bundle. */
+function adminSourceIsNewerThanTheme(projectRoot, themeDir) {
+    const source = resolveAdminDistSource(projectRoot);
+    const sourceIndex = source ? node_path_1.default.join(source, 'index.html') : null;
+    const themeAdminIndex = node_path_1.default.join(themeDir, 'public', 'admin', 'index.html');
+    if (!sourceIndex || !fs_extra_1.default.existsSync(sourceIndex))
+        return false;
+    if (!fs_extra_1.default.existsSync(themeAdminIndex))
+        return true;
+    const sourceId = readAdminMainAssetId(sourceIndex);
+    const themeId = readAdminMainAssetId(themeAdminIndex);
+    if (sourceId && themeId)
+        return sourceId !== themeId;
+    return fs_extra_1.default.statSync(sourceIndex).mtimeMs > fs_extra_1.default.statSync(themeAdminIndex).mtimeMs;
+}
 function syncDirToPublicAdmin(sourceDist, themeDir) {
     const target = node_path_1.default.join(themeDir, 'public', 'admin');
     fs_extra_1.default.removeSync(target);
@@ -78,40 +118,53 @@ function ensureAdminRewritesInNextConfig(themeDir) {
 function finalizeAdminThemeSetup(themeDir) {
     return ensureAdminRewritesInNextConfig(themeDir);
 }
+function syncAdminFromWeb(projectRoot, themeDir) {
+    const webRoot = resolveWebPackageRoot(projectRoot);
+    if (!webRoot)
+        return false;
+    const webDist = node_path_1.default.join(webRoot, 'dist', 'index.html');
+    if (!fs_extra_1.default.existsSync(webDist)) {
+        console.log('[ReactPress Client] Building admin SPA (web/)…');
+        const buildWeb = (0, node_child_process_1.spawnSync)('pnpm', ['run', 'build'], { cwd: webRoot, stdio: 'inherit' });
+        if (buildWeb.status !== 0)
+            process.exit(buildWeb.status || 1);
+    }
+    const syncScript = node_path_1.default.join(webRoot, 'bin', 'reactpress-web.js');
+    const publicAdmin = node_path_1.default.join(themeDir, 'public', 'admin');
+    console.log('[ReactPress Client] Syncing admin static → theme public/admin…');
+    const sync = (0, node_child_process_1.spawnSync)(process.execPath, [syncScript, 'sync-public', publicAdmin], {
+        stdio: 'inherit',
+        cwd: webRoot,
+    });
+    if (sync.status !== 0)
+        process.exit(sync.status || 1);
+    return finalizeAdminThemeSetup(themeDir) || true;
+}
+function syncAdminFromSource(sourceDist, themeDir) {
+    console.log('[ReactPress Client] Syncing bundled admin static → theme public/admin…');
+    syncDirToPublicAdmin(sourceDist, themeDir);
+    return finalizeAdminThemeSetup(themeDir) || true;
+}
 /** Returns true when admin static or rewrites were newly applied (theme rebuild recommended). */
 function ensureAdminStaticForTheme(projectRoot, themeDir) {
     const adminIndex = node_path_1.default.join(themeDir, 'public', 'admin', 'index.html');
-    if (fs_extra_1.default.existsSync(adminIndex)) {
+    const needsResync = !fs_extra_1.default.existsSync(adminIndex) || adminSourceIsNewerThanTheme(projectRoot, themeDir);
+    if (!needsResync) {
         return finalizeAdminThemeSetup(themeDir);
     }
-    const webRoot = resolveWebPackageRoot(projectRoot);
-    if (webRoot) {
-        const webDist = node_path_1.default.join(webRoot, 'dist', 'index.html');
-        if (!fs_extra_1.default.existsSync(webDist)) {
-            console.log('[ReactPress Client] Building admin SPA (web/)…');
-            const buildWeb = (0, node_child_process_1.spawnSync)('pnpm', ['run', 'build'], { cwd: webRoot, stdio: 'inherit' });
-            if (buildWeb.status !== 0)
-                process.exit(buildWeb.status || 1);
+    const source = resolveAdminDistSource(projectRoot);
+    if (source && fs_extra_1.default.existsSync(node_path_1.default.join(source, 'index.html'))) {
+        const webRoot = resolveWebPackageRoot(projectRoot);
+        if (webRoot && node_path_1.default.resolve(source) === node_path_1.default.resolve(node_path_1.default.join(webRoot, 'dist'))) {
+            return syncAdminFromWeb(projectRoot, themeDir);
         }
-        const syncScript = node_path_1.default.join(webRoot, 'bin', 'reactpress-web.js');
-        const publicAdmin = node_path_1.default.join(themeDir, 'public', 'admin');
-        console.log('[ReactPress Client] Syncing admin static → theme public/admin…');
-        const sync = (0, node_child_process_1.spawnSync)(process.execPath, [syncScript, 'sync-public', publicAdmin], {
-            stdio: 'inherit',
-            cwd: webRoot,
-        });
-        if (sync.status !== 0)
-            process.exit(sync.status || 1);
-        return finalizeAdminThemeSetup(themeDir) || true;
+        return syncAdminFromSource(source, themeDir);
     }
-    const bundledDist = resolveBundledAdminDistDir();
-    if (!bundledDist) {
-        console.warn('[ReactPress Client] Admin static missing and bundled admin-dist not found');
-        return false;
+    if (syncAdminFromWeb(projectRoot, themeDir)) {
+        return true;
     }
-    console.log('[ReactPress Client] Syncing bundled admin static → theme public/admin…');
-    syncDirToPublicAdmin(bundledDist, themeDir);
-    return finalizeAdminThemeSetup(themeDir) || true;
+    console.warn('[ReactPress Client] Admin static missing and bundled admin-dist not found');
+    return false;
 }
 function shouldRebuildThemeAfterAdminSync(themeDir) {
     const adminIndex = node_path_1.default.join(themeDir, 'public', 'admin', 'index.html');

package/out/lib/bootstrap.js

@@ -43,6 +43,15 @@ async function ensureProjectEnvironment(projectRoot = (0, root_1.ensureOriginalC
     applyZeroDependencyDefaults();
     const root = node_path_1.default.resolve(projectRoot);
     (0, cli_context_1.setProjectCwd)(root);
+    try {
+        const { ensureBundledPlugins } = require('../core/services/local-site');
+        if (ensureBundledPlugins(root)) {
+            console.log(`[reactpress] ${(0, i18n_1.t)('init.pluginsSeeded')}`);
+        }
+    }
+    catch {
+        // bundled plugins are optional; ignore when CLI core is unavailable
+    }
     if (!(await (0, config_1.isReactPressProject)(root))) {
         const result = await (0, init_1.initProject)({ directory: root, force: false });
         if (!result.ok) {

package/out/lib/i18n/strings.js

@@ -76,12 +76,13 @@ const STRINGS = {
         'cli.doctor.logs.sourceOption': 'Log source: error, request, response, or all',
         'cli.doctor.logs.grepOption': 'Filter log lines by regex',
         'cli.doctor.logs.listOption': 'List available log files only',
-        'cli.logs.description': 'View recent API logs (error, request, response)',
+        'cli.logs.description': 'View API logs (PM2 process output or structured error/request/response)',
         'cli.logs.descriptionAlias': 'View API logs (alias of reactpress logs)',
         'cli.logs.tailOption': 'Number of lines to show per log file',
-        'cli.logs.sourceOption': 'Log source: error, request, response, or all',
+        'cli.logs.sourceOption': 'Log source: process (PM2), error, request, response, or all',
         'cli.logs.grepOption': 'Filter log lines by regex',
         'cli.logs.listOption': 'List available log files only',
+        'cli.logs.followOption': 'Stream logs continuously (PM2 when supervised, otherwise tail -f)',
         'cli.stop.description': 'Stop API and site services started by init',
         'cli.db.description': 'Database operations',
         'cli.db.backup': 'Backup current project database with mysqldump',
@@ -433,15 +434,19 @@ const STRINGS = {
         'doctor.logs.subtitle': 'API log viewer',
         'doctor.logs.dir': 'Log dir   {path}',
         'doctor.logs.empty': 'No API log files found yet.',
-        'doctor.logs.emptyHint': 'Start the API with reactpress init — logs are written to .reactpress/logs/server/',
+        'doctor.logs.emptyHint': 'Start the API with reactpress init — logs are written to .reactpress/logs/server/ (PM2 output: pm2-out.log / pm2-error.log)',
         'doctor.logs.listHeader': 'Available log files',
         'doctor.logs.fileHeader': '{file} (showing {count} line(s))',
         'doctor.logs.noMatchingLines': 'No matching log lines.',
         'doctor.logs.badPattern': 'Invalid grep pattern: {pattern}',
         'doctor.logs.noPid': 'No API pid file at {path}',
+        'doctor.logs.activePid': 'API listening on port {port} (pid {pid})',
+        'doctor.logs.pm2Supervised': 'API supervised by PM2 (pid {pid})',
+        'doctor.logs.pm2Unavailable': 'PM2 is not available for live log streaming.',
+        'doctor.logs.followWindows': 'Live follow is not supported here. Open: {path}',
         'doctor.logs.pidRunning': 'API pid {pid} (recorded in {path})',
         'doctor.logs.pidStale': 'Stale pid {pid} in {path} — process not running',
-        'doctor.logs.moreHint': 'Use --tail, --source, --grep, or --list for more control (see reactpress logs --help)',
+        'doctor.logs.moreHint': 'Use --tail, --source, --grep, --follow, or --list for more control (see reactpress logs --help)',
         'status.title': 'ReactPress project status',
         'status.dir': 'Project     {path}',
         'status.apiSource': 'API source  {source}',
@@ -752,12 +757,13 @@ const STRINGS = {
         'cli.doctor.logs.sourceOption': '日志类型：error、request、response 或 all',
         'cli.doctor.logs.grepOption': '用正则过滤日志行',
         'cli.doctor.logs.listOption': '仅列出可用日志文件',
-        'cli.logs.description': '查看 API 日志（error / request / response）',
+        'cli.logs.description': '查看 API 日志（PM2 进程输出或结构化 error/request/response）',
         'cli.logs.descriptionAlias': '查看 API 日志（同 reactpress logs）',
         'cli.logs.tailOption': '每个日志文件显示的行数',
-        'cli.logs.sourceOption': '日志类型：error、request、response 或 all',
+        'cli.logs.sourceOption': '日志类型：process（PM2）、error、request、response 或 all',
         'cli.logs.grepOption': '用正则过滤日志行',
         'cli.logs.listOption': '仅列出可用日志文件',
+        'cli.logs.followOption': '持续输出日志（PM2 托管时用 pm2 logs，否则 tail -f）',
         'cli.stop.description': '停止 init 启动的 API 与站点服务',
         'cli.db.description': '数据库运维',
         'cli.db.backup': '使用 mysqldump 备份当前项目数据库',
@@ -1108,15 +1114,19 @@ const STRINGS = {
         'doctor.logs.subtitle': 'API 日志查看',
         'doctor.logs.dir': '日志目录  {path}',
         'doctor.logs.empty': '尚未找到 API 日志文件。',
-        'doctor.logs.emptyHint': '运行 reactpress init 启动 API 后，日志会写入 .reactpress/logs/server/',
+        'doctor.logs.emptyHint': '运行 reactpress init 启动 API 后，日志写入 .reactpress/logs/server/（PM2 输出：pm2-out.log / pm2-error.log）',
         'doctor.logs.listHeader': '可用日志文件',
         'doctor.logs.fileHeader': '{file}（显示 {count} 行）',
         'doctor.logs.noMatchingLines': '没有匹配的日志行。',
         'doctor.logs.badPattern': 'grep 正则无效：{pattern}',
         'doctor.logs.noPid': '未找到 API pid 文件：{path}',
+        'doctor.logs.activePid': 'API 正在监听端口 {port}（pid {pid}）',
+        'doctor.logs.pm2Supervised': 'API 由 PM2 托管（pid {pid}）',
+        'doctor.logs.pm2Unavailable': '无法使用 PM2 实时输出日志。',
+        'doctor.logs.followWindows': '当前环境不支持持续跟踪，请直接打开：{path}',
         'doctor.logs.pidRunning': 'API 进程 pid {pid}（记录在 {path}）',
         'doctor.logs.pidStale': 'pid 文件 {path} 中的 {pid} 已失效（进程未运行）',
-        'doctor.logs.moreHint': '可用 --tail、--source、--grep、--list 进一步筛选（见 reactpress logs --help）',
+        'doctor.logs.moreHint': '可用 --tail、--source、--grep、--follow、--list 进一步筛选（见 reactpress logs --help）',
         'status.title': 'ReactPress 项目状态',
         'status.dir': '项目目录    {path}',
         'status.apiSource': 'API 来源    {source}',

package/out/lib/lifecycle.js

@@ -80,6 +80,8 @@ async function startApiWithPm2(projectRoot, { wait = true } = {}) {
     const serverDir = getServerDir(projectRoot);
     const serverLogDir = path.join(projectRoot, '.reactpress', 'logs', 'server');
     fs.mkdirSync(serverLogDir, { recursive: true });
+    const pm2OutLog = path.join(serverLogDir, 'pm2-out.log');
+    const pm2ErrLog = path.join(serverLogDir, 'pm2-error.log');
     const started = runPm2(projectRoot, [
         'start',
         serverBin,
@@ -87,6 +89,10 @@ async function startApiWithPm2(projectRoot, { wait = true } = {}) {
         PM2_API_APP,
         '--cwd',
         serverDir,
+        '--output',
+        pm2OutLog,
+        '--error',
+        pm2ErrLog,
         '--max-memory-restart',
         getPm2ServerMemoryRestart(),
         '--update-env',
@@ -103,6 +109,9 @@ async function startApiWithPm2(projectRoot, { wait = true } = {}) {
         return startApiDetached(projectRoot, { wait });
     }
     const pid = getPm2AppPid(projectRoot, PM2_API_APP);
+    if (pid) {
+        writePid(projectRoot, pid);
+    }
     console.log(t('lifecycle.apiStartedBg', { pid: pid ?? PM2_API_APP }));
     if (!wait)
         return 0;

package/out/lib/pm2-runtime.js

@@ -69,6 +69,20 @@ function getPm2AppPid(projectRoot, name) {
     const app = getPm2App(projectRoot, name);
     return typeof app?.pid === 'number' ? app.pid : null;
 }
+function getPm2AppLogPaths(projectRoot, name = PM2_API_APP) {
+    const serverLogDir = path.join(projectRoot, '.reactpress', 'logs', 'server');
+    const defaults = {
+        out: path.join(serverLogDir, 'pm2-out.log'),
+        err: path.join(serverLogDir, 'pm2-error.log'),
+    };
+    const app = getPm2App(projectRoot, name);
+    if (!app)
+        return defaults;
+    return {
+        out: app.pm2_env?.pm_out_log_path || defaults.out,
+        err: app.pm2_env?.pm_err_log_path || defaults.err,
+    };
+}
 function stopPm2Apps(projectRoot, names) {
     const bin = resolvePm2Bin(projectRoot);
     if (!bin)
@@ -90,6 +104,7 @@ module.exports = {
     getPm2App,
     isPm2AppOnline,
     getPm2AppPid,
+    getPm2AppLogPaths,
     stopPm2Apps,
 };
 //# sourceMappingURL=pm2-runtime.js.map

package/out/lib/project-logs.js

@@ -3,35 +3,259 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const fs = require('fs');
 const path = require('path');
+const { spawnSync } = require('child_process');
 const { brand, divider, gradientText, palette, sectionHeader } = require('../ui/theme');
 const { getServerDir, getPidFile } = require('./paths');
 const { readPid, isProcessRunning } = require('./process');
+const { loadServerSiteUrl } = require('./http');
+const { getPm2App, PM2_API_APP, isPm2AppOnline, getPm2AppLogPaths, resolvePm2Bin, } = require('./pm2-runtime');
 const { t } = require('./i18n');
 const LOG_SOURCES = ['error', 'request', 'response'];
+const PROCESS_LOG_SOURCES = ['pm2-out', 'pm2-error'];
+const PM2_LOG_FILES = {
+    'pm2-out': 'pm2-out.log',
+    'pm2-error': 'pm2-error.log',
+};
+function measureLogDir(logDir) {
+    if (!fs.existsSync(logDir))
+        return -1;
+    let total = listLogFiles(logDir, 'all').reduce((sum, file) => sum + file.size, 0);
+    for (const filename of Object.values(PM2_LOG_FILES)) {
+        const filePath = path.join(logDir, filename);
+        try {
+            if (fs.existsSync(filePath)) {
+                total += fs.statSync(filePath).size;
+            }
+        }
+        catch {
+            // ignore
+        }
+    }
+    return total;
+}
+function getPm2ServerLogDir(projectRoot) {
+    try {
+        const app = getPm2App(projectRoot, PM2_API_APP);
+        const dir = app?.pm2_env?.env?.REACTPRESS_SERVER_LOG_DIR;
+        if (typeof dir === 'string' && dir.trim()) {
+            return path.resolve(dir.trim());
+        }
+    }
+    catch {
+        // ignore
+    }
+    return null;
+}
+function parseUrlPort(urlString) {
+    try {
+        const url = new URL(urlString);
+        const port = Number(url.port);
+        if (port > 0)
+            return port;
+        return url.protocol === 'https:' ? 443 : 80;
+    }
+    catch {
+        return null;
+    }
+}
+function resolveListeningPid(port) {
+    if (!port || process.platform === 'win32')
+        return null;
+    const result = spawnSync('lsof', ['-nP', `-iTCP:${port}`, '-sTCP:LISTEN', '-t'], {
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+    });
+    if (result.status !== 0 || !result.stdout.trim())
+        return null;
+    const pids = result.stdout
+        .trim()
+        .split('\n')
+        .map((line) => Number.parseInt(line.trim(), 10))
+        .filter((pid) => Number.isFinite(pid));
+    return pids[0] ?? null;
+}
+function resolveLogDirFromPid(pid) {
+    if (!pid || process.platform === 'win32')
+        return null;
+    const result = spawnSync('lsof', ['-Fn', '-p', String(pid)], {
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+    });
+    if (result.status !== 0)
+        return null;
+    for (const line of result.stdout.split('\n')) {
+        if (!line.startsWith('n') || !line.includes('.log'))
+            continue;
+        const logPath = line.slice(1);
+        const match = logPath.match(/^(.*\/logs)\/(?:error|request|response)\//);
+        if (match)
+            return match[1];
+    }
+    return null;
+}
+function resolveActiveServerLogDir(projectRoot) {
+    const port = parseUrlPort(loadServerSiteUrl(projectRoot));
+    if (!port)
+        return null;
+    const pid = resolveListeningPid(port);
+    if (!pid)
+        return null;
+    return resolveLogDirFromPid(pid);
+}
+function collectLogDirCandidates(projectRoot) {
+    const candidates = [
+        path.join(projectRoot, '.reactpress', 'logs', 'server'),
+        path.join(getServerDir(projectRoot), 'logs'),
+    ];
+    const pm2Dir = getPm2ServerLogDir(projectRoot);
+    if (pm2Dir)
+        candidates.push(pm2Dir);
+    const activeDir = resolveActiveServerLogDir(projectRoot);
+    if (activeDir)
+        candidates.push(activeDir);
+    return [...new Set(candidates.map((dir) => path.resolve(dir)))];
+}
 function getProjectServerLogDir(projectRoot) {
     const preferred = path.join(projectRoot, '.reactpress', 'logs', 'server');
-    if (fs.existsSync(preferred)) {
-        return preferred;
-    }
     const bundled = path.join(getServerDir(projectRoot), 'logs');
-    if (fs.existsSync(bundled)) {
-        return bundled;
+    const pm2Dir = getPm2ServerLogDir(projectRoot);
+    const activeDir = resolveActiveServerLogDir(projectRoot);
+    const localCandidates = [preferred, bundled];
+    if (pm2Dir)
+        localCandidates.push(pm2Dir);
+    let bestLocal = preferred;
+    let bestLocalScore = -1;
+    for (const dir of [...new Set(localCandidates.map((d) => path.resolve(d)))]) {
+        const score = measureLogDir(dir);
+        if (score > bestLocalScore) {
+            bestLocalScore = score;
+            bestLocal = dir;
+        }
     }
-    return preferred;
+    if (bestLocalScore > 0) {
+        return bestLocal;
+    }
+    if (activeDir && fs.existsSync(activeDir) && measureLogDir(activeDir) > 0) {
+        return activeDir;
+    }
+    return bestLocal;
 }
 function normalizeSource(source) {
     const value = String(source || 'error').toLowerCase();
     if (value === 'all')
         return 'all';
+    if (value === 'process' || value === 'pm2')
+        return 'process';
     if (LOG_SOURCES.includes(value))
         return value;
     return 'error';
 }
-function listLogFiles(logDir, source = 'error') {
+function measureStructuredLogDir(logDir) {
+    if (!fs.existsSync(logDir))
+        return 0;
+    let total = 0;
+    for (const name of LOG_SOURCES) {
+        const dir = path.join(logDir, name);
+        if (!fs.existsSync(dir))
+            continue;
+        for (const entry of fs.readdirSync(dir)) {
+            if (!entry.endsWith('.log'))
+                continue;
+            try {
+                total += fs.statSync(path.join(dir, entry)).size;
+            }
+            catch {
+                // ignore
+            }
+        }
+    }
+    return total;
+}
+function resolveLogSource(projectRoot, sourceOption) {
+    if (sourceOption != null && String(sourceOption).trim() !== '') {
+        return normalizeSource(sourceOption);
+    }
+    const logDir = path.join(projectRoot, '.reactpress', 'logs', 'server');
+    if (measureStructuredLogDir(logDir) > 0) {
+        return 'error';
+    }
+    if (isPm2AppOnline(projectRoot, PM2_API_APP)) {
+        return 'process';
+    }
+    return 'error';
+}
+function listProcessLogFiles(projectRoot, logDir, source = 'process') {
+    const normalized = normalizeSource(source);
+    const names = normalized === 'all'
+        ? PROCESS_LOG_SOURCES
+        : normalized === 'process'
+            ? PROCESS_LOG_SOURCES
+            : PROCESS_LOG_SOURCES.includes(normalized)
+                ? [normalized]
+                : [];
+    if (!names.length)
+        return [];
+    const pm2Paths = getPm2AppLogPaths(projectRoot, PM2_API_APP);
+    const pathBySource = {
+        'pm2-out': pm2Paths.out,
+        'pm2-error': pm2Paths.err,
+    };
+    const files = [];
+    for (const name of names) {
+        const localPath = path.join(logDir, PM2_LOG_FILES[name]);
+        const candidates = [];
+        if (fs.existsSync(localPath)) {
+            candidates.push(localPath);
+        }
+        const remotePath = pathBySource[name];
+        if (remotePath &&
+            path.resolve(remotePath) !== path.resolve(localPath) &&
+            fs.existsSync(remotePath)) {
+            candidates.push(remotePath);
+        }
+        const seen = new Set();
+        for (const fullPath of candidates) {
+            const resolved = path.resolve(fullPath);
+            if (seen.has(resolved))
+                continue;
+            seen.add(resolved);
+            let stat;
+            try {
+                stat = fs.statSync(resolved);
+            }
+            catch {
+                continue;
+            }
+            if (!stat.isFile())
+                continue;
+            files.push({
+                source: name,
+                path: resolved,
+                name: path.basename(resolved),
+                mtimeMs: stat.mtimeMs,
+                size: stat.size,
+            });
+            break;
+        }
+    }
+    files.sort((a, b) => b.mtimeMs - a.mtimeMs);
+    return files;
+}
+function listLogFiles(logDir, source = 'error', projectRoot = null) {
     const normalized = normalizeSource(source);
-    const sources = normalized === 'all' ? LOG_SOURCES : [normalized];
+    if (normalized === 'process' || PROCESS_LOG_SOURCES.includes(normalized)) {
+        return listProcessLogFiles(projectRoot || '', logDir, normalized);
+    }
+    const sources = normalized === 'all'
+        ? [...PROCESS_LOG_SOURCES, ...LOG_SOURCES]
+        : [normalized];
     const files = [];
+    if (normalized === 'all' && projectRoot) {
+        files.push(...listProcessLogFiles(projectRoot, logDir, 'process'));
+    }
     for (const name of sources) {
+        if (PROCESS_LOG_SOURCES.includes(name))
+            continue;
         const dir = path.join(logDir, name);
         if (!fs.existsSync(dir))
             continue;
@@ -104,9 +328,20 @@ function formatTimestamp(ms) {
     return new Date(ms).toISOString().replace('T', ' ').slice(0, 19);
 }
 function printProcessHint(projectRoot) {
+    if (isPm2AppOnline(projectRoot, PM2_API_APP)) {
+        const pid = getPm2App(projectRoot, PM2_API_APP)?.pid;
+        console.log(`  ${brand.dim(t('doctor.logs.pm2Supervised', { pid: pid ?? PM2_API_APP }))}`);
+        return;
+    }
     const pid = readPid(projectRoot);
     const pidFile = getPidFile(projectRoot);
     if (!pid) {
+        const port = parseUrlPort(loadServerSiteUrl(projectRoot));
+        const activePid = port ? resolveListeningPid(port) : null;
+        if (activePid && isProcessRunning(activePid)) {
+            console.log(`  ${brand.dim(t('doctor.logs.activePid', { pid: activePid, port }))}`);
+            return;
+        }
         console.log(`  ${brand.dim(t('doctor.logs.noPid', { path: pidFile }))}`);
         return;
     }
@@ -115,11 +350,69 @@ function printProcessHint(projectRoot) {
         ? t('doctor.logs.pidRunning', { pid, path: pidFile })
         : t('doctor.logs.pidStale', { pid, path: pidFile }))}`);
 }
+function pickPrimaryLogFile(files, source) {
+    if (!files.length)
+        return null;
+    if (source === 'process') {
+        return (files.find((file) => file.source === 'pm2-error') ||
+            files.find((file) => file.source === 'pm2-out') ||
+            files[0]);
+    }
+    const grouped = new Map();
+    for (const file of files) {
+        if (!grouped.has(file.source))
+            grouped.set(file.source, file);
+    }
+    const order = source === 'all' ? [...PROCESS_LOG_SOURCES, ...LOG_SOURCES] : [source];
+    for (const name of order) {
+        const file = grouped.get(name);
+        if (file)
+            return file;
+    }
+    return files[0];
+}
+async function runFollowLogs(projectRoot, { tail, source, logDir, files }) {
+    const usePm2Stream = source === 'process' && isPm2AppOnline(projectRoot, PM2_API_APP);
+    if (usePm2Stream) {
+        const bin = resolvePm2Bin(projectRoot);
+        if (!bin) {
+            console.error(`  ${brand.warn(t('doctor.logs.pm2Unavailable'))}`);
+            return 1;
+        }
+        const { spawn } = require('child_process');
+        await new Promise((resolve) => {
+            const child = spawn(bin, ['logs', PM2_API_APP, '--lines', String(tail)], {
+                stdio: 'inherit',
+            });
+            child.on('exit', (code) => resolve(code ?? 0));
+        });
+        return 0;
+    }
+    const primary = pickPrimaryLogFile(files, source);
+    if (!primary) {
+        console.log(`  ${brand.warn(t('doctor.logs.empty'))}`);
+        console.log('');
+        return 1;
+    }
+    if (process.platform === 'win32') {
+        console.log(`  ${brand.dim(t('doctor.logs.followWindows', { path: primary.path }))}`);
+        console.log('');
+        return 0;
+    }
+    const { spawn } = require('child_process');
+    await new Promise((resolve) => {
+        const child = spawn('tail', ['-n', String(tail), '-f', primary.path], {
+            stdio: 'inherit',
+        });
+        child.on('exit', (code) => resolve(code ?? 0));
+    });
+    return 0;
+}
 async function runDoctorLogs(projectRoot, options = {}) {
     const tail = Math.max(1, Math.min(parseInt(String(options.tail ?? '50'), 10) || 50, 5000));
-    const source = normalizeSource(options.source);
+    const source = resolveLogSource(projectRoot, options.source);
     const logDir = getProjectServerLogDir(projectRoot);
-    const files = listLogFiles(logDir, source);
+    const files = listLogFiles(logDir, source, projectRoot);
     const w = 56;
     console.log('');
     console.log(`  ${gradientText(t('logs.title'), [palette.primary, palette.accent], { bold: true })}  ${brand.dim(t('logs.subtitle'))}`);
@@ -127,6 +420,9 @@ async function runDoctorLogs(projectRoot, options = {}) {
     console.log(`  ${brand.dim(t('doctor.logs.dir', { path: logDir }))}`);
     printProcessHint(projectRoot);
     console.log(`  ${divider(w)}`);
+    if (options.follow) {
+        return runFollowLogs(projectRoot, { tail, source, logDir, files });
+    }
     if (options.list) {
         if (!files.length) {
             console.log(`  ${brand.warn(t('doctor.logs.empty'))}`);
@@ -153,8 +449,13 @@ async function runDoctorLogs(projectRoot, options = {}) {
         if (!grouped.has(file.source))
             grouped.set(file.source, file);
     }
+    const displayOrder = source === 'all'
+        ? [...PROCESS_LOG_SOURCES, ...LOG_SOURCES]
+        : source === 'process'
+            ? PROCESS_LOG_SOURCES
+            : [source];
     let printed = 0;
-    for (const name of source === 'all' ? LOG_SOURCES : [source]) {
+    for (const name of displayOrder) {
         const file = grouped.get(name);
         if (!file)
             continue;
@@ -171,7 +472,7 @@ async function runDoctorLogs(projectRoot, options = {}) {
             continue;
         }
         for (const line of lines) {
-            const isError = /\[ERROR\]/i.test(line) || name === 'error';
+            const isError = /\[ERROR\]/i.test(line) || name === 'error' || name === 'pm2-error';
             console.log(`    ${isError ? brand.warn(line) : brand.dim(line)}`);
         }
         printed += lines.length;
@@ -188,7 +489,12 @@ async function runDoctorLogs(projectRoot, options = {}) {
 }
 module.exports = {
     LOG_SOURCES,
+    PROCESS_LOG_SOURCES,
     getProjectServerLogDir,
+    collectLogDirCandidates,
+    measureLogDir,
+    resolveActiveServerLogDir,
+    resolveLogSource,
     listLogFiles,
     readTailLines,
     filterLines,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress",
-  "version": "4.0.0-beta.17",
+  "version": "4.0.0-beta.18",
   "description": "ReactPress CLI — publishing platform for modern developers. CMS, Admin, API, and Next.js themes in one command. Self-hosted, MIT. `npx @fecommunity/reactpress init`",
   "author": "fecommunity",
   "license": "MIT",

package/server/bin/reactpress-server.js

@@ -196,6 +196,23 @@ function startWithNode() {
     console.log(`[ReactPress Server] Using existing REACTPRESS_ORIGINAL_CWD: ${process.env.REACTPRESS_ORIGINAL_CWD}`);
   }
 
+  const siteRoot = process.env.REACTPRESS_ORIGINAL_CWD;
+  for (const localSiteModule of [
+    path.join(serverDir, '..', 'cli', 'out', 'core', 'services', 'local-site.js'),
+    path.join(serverDir, '..', 'out', 'core', 'services', 'local-site.js'),
+  ]) {
+    if (!siteRoot || !fs.existsSync(localSiteModule)) continue;
+    try {
+      const { ensureBundledPlugins } = require(localSiteModule);
+      if (ensureBundledPlugins(siteRoot)) {
+        console.log('[ReactPress Server] Seeded bundled plugins into project');
+      }
+    } catch {
+      // ignore — plugins seeding is best-effort
+    }
+    break;
+  }
+
   // Change to the server directory
   process.chdir(serverDir);
 

package/server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@fecommunity/reactpress-server",
-  "version": "4.0.0-beta.16",
+  "version": "4.0.0-beta.18",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@fecommunity/reactpress-server",
-      "version": "4.0.0-beta.16",
+      "version": "4.0.0-beta.18",
       "deprecated": "Bundled in @fecommunity/reactpress CLI from v3.1. Run `npx @fecommunity/reactpress init` for new projects.",
       "license": "MIT",
       "dependencies": {
@@ -91,7 +91,7 @@
     },
     "../toolkit": {
       "name": "@fecommunity/reactpress-toolkit",
-      "version": "4.0.0-beta.16",
+      "version": "4.0.0-beta.18",
       "dependencies": {
         "ajv": "^8.17.1",
         "axios": "^1.12.2",

package/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress-server",
-  "version": "4.0.0-beta.17",
+  "version": "4.0.0-beta.18",
   "deprecated": "Bundled in @fecommunity/reactpress CLI from v3.1. Run `npx @fecommunity/reactpress init` for new projects.",
   "description": "ReactPress NestJS REST API (deprecated). Bundled in @fecommunity/reactpress CLI from v3.1. Headless CMS for articles, media, plugins, and themes",
   "author": "fecommunity",

package/toolkit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress-toolkit",
-  "version": "4.0.0-beta.17",
+  "version": "4.0.0-beta.18",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {