@fecommunity/reactpress 3.0.1 → 3.0.2

package/README.md

@@ -1,47 +1,93 @@
-# @fecommunity/reactpress-cli
+# @fecommunity/reactpress
 
-零配置一键初始化与管理 ReactPress CMS & 博客服务器。内置 NestJS 服务端，无需单独克隆 [fecommunity/reactpress](https://github.com/fecommunity/reactpress)。
+ReactPress 3.x 主包：一条命令完成站点初始化、本地开发、构建与生产部署。内置 NestJS API（站点项目无 `server/` 时自动使用 bundle），Monorepo 贡献者可使用仓库内 `server/` 源码联调。
 
-完整文档与贡献指南见：[github.com/fecommunity/reactpress-cli](https://github.com/fecommunity/reactpress-cli)
+[![npm version](https://img.shields.io/npm/v/@fecommunity/reactpress.svg)](https://www.npmjs.com/package/@fecommunity/reactpress)
+[![License: MIT](https://img.shields.io/npm/l/@fecommunity/reactpress.svg)](https://github.com/fecommunity/reactpress/blob/master/cli/LICENSE)
+
+完整文档：[github.com/fecommunity/reactpress](https://github.com/fecommunity/reactpress) · 中文说明见仓库 [README-zh_CN.md](https://github.com/fecommunity/reactpress/blob/master/README-zh_CN.md)
 
 ## 安装
 
 ```bash
-npm install -g @fecommunity/reactpress-cli
+npm install -g @fecommunity/reactpress@3
 ```
 
-全局命令为 `reactpress-cli`（与 npm 包名无关）。
+全局命令为 **`reactpress`**（推荐）。
 
-> npm 上的无作用域包名 `reactpress-cli` 已被占用，本包发布为 `@fecommunity/reactpress-cli`。
+> **兼容**：仍提供 `reactpress-cli` 别名，会映射到 `reactpress server *` 并打印弃用提示，**3.1 将移除**。旧包名 `@fecommunity/reactpress-cli` 请迁移到本包。
 
 ## 快速开始
 
+### 新建站点（零配置）
+
 ```bash
 mkdir my-blog && cd my-blog
-reactpress-cli init
-reactpress-cli start
+reactpress init
+reactpress dev
 ```
 
-浏览器访问 `http://localhost:3002`（API 文档：`/api`）。
+| 服务 | 默认地址 |
+|------|----------|
+| 前台 | http://localhost:3001 |
+| 后台 | http://localhost:3001/admin |
+| API / Swagger | http://localhost:3002/api |
+
+### 在本仓库（Monorepo）开发
+
+```bash
+git clone https://github.com/fecommunity/reactpress.git
+cd reactpress
+pnpm install
+pnpm init          # 生成 .env、.reactpress/config.json
+pnpm dev           # 等价于 reactpress dev
+```
 
 ## 常用命令
 
 | 命令 | 说明 |
 |------|------|
-| `reactpress-cli init [dir]` | 初始化项目 |
-| `reactpress-cli start` | 启动服务（自动准备数据库） |
-| `reactpress-cli stop` | 停止服务 |
-| `reactpress-cli restart` | 重启服务 |
-| `reactpress-cli status` | 查看状态 |
-| `reactpress-cli config [key] [value]` | 查看/修改配置 |
-| `reactpress-cli config server.port 3003 --apply` | 改端口并重启 |
+| `reactpress` | 交互式菜单 |
+| `reactpress init [dir]` | 初始化项目（`-f` 强制） |
+| `reactpress dev` | 环境检查 → 构建 toolkit → API + 前台 |
+| `reactpress dev --api-only` | 仅 API |
+| `reactpress dev --client-only` | 仅前台（需 API 已运行） |
+| `reactpress build -t <target>` | 构建：`toolkit` \| `server` \| `client` \| `docs` \| `all` |
+| `reactpress server start` | 后台启动 API（`--bg` 不等待健康检查） |
+| `reactpress server stop` / `restart` / `status` | API 生命周期 |
+| `reactpress start` | 生产：API + 前台 |
+| `reactpress status` | 统一状态（配置、端口、健康检查） |
+| `reactpress doctor` | 环境诊断 |
+| `reactpress docker up` / `down` / `start` / `status` / `logs` | Docker MySQL 与编排 |
+| `reactpress db backup` | 数据库备份（`mysqldump`） |
+| `reactpress publish` | Monorepo 发包向导（维护者） |
+
+站点级配置（`reactpress-cli` 时代）仍通过项目内 **`pnpm exec reactpress-cli config`** 或 `.reactpress/config.json` 管理；3.x 主路径为 `reactpress` + 根目录 `.env`。
+
+## 环境要求
+
+- **Node.js** ≥ 18
+- **pnpm** ≥ 8（Monorepo / `pnpm dev`）
+- **MySQL**：Docker（`reactpress docker up`）或 `.env` / `.reactpress/config.json` 中的外部库
+
+## 故障排查
+
+| 现象 | 处理 |
+|------|------|
+| `Missing script: build:toolkit` | 勿将 `REACTPRESS_ORIGINAL_CWD` 指到全局 npm 安装目录；在项目根执行，或 `unset REACTPRESS_ORIGINAL_CWD` 后重试 |
+| 误用 bundle API、未走 Monorepo `server/` | 确保在含 `pnpm-workspace.yaml` 的仓库根目录运行；升级至最新 `@fecommunity/reactpress` |
+| 端口占用 | `reactpress doctor` 或修改 `.env` 中 `SERVER_PORT` / `CLIENT_PORT` |
+
+## 相关包
 
-## 要求
+| 包 | 用途 |
+|----|------|
+| `@fecommunity/reactpress-client` | 仅部署 Next.js 前台 |
+| `@fecommunity/reactpress-toolkit` | OpenAPI 生成的 TS SDK |
+| `@fecommunity/reactpress-template-*` | 项目模板 |
 
-- Node.js 18+
-- macOS / Linux / Windows
-- 默认使用 Docker 运行嵌入式 MySQL；也可在 `.reactpress/config.json` 中配置外部数据库
+`@fecommunity/reactpress-server`、独立安装 `@fecommunity/reactpress-cli` 已弃用，请使用本包。
 
 ## 许可证
 
-MIT © FECommunity
+MIT © [FECommunity](https://github.com/fecommunity)

package/bin/reactpress.js

@@ -8,7 +8,8 @@
 const { Command } = require('commander');
 const path = require('path');
 const chalk = require('chalk');
-const { ensureOriginalCwd, getMonorepoRoot } = require('../lib/root');
+const { ensureOriginalCwd } = require('../lib/root');
+const { getCliPackageRoot } = require('../lib/paths');
 const { ensureProjectEnvironment, initMonorepoProject } = require('../lib/bootstrap');
 const { runDev } = require('../lib/dev');
 const { runApiDev } = require('../lib/api-dev');
@@ -24,7 +25,7 @@ const { getClientBin } = require('../lib/paths');
 const { runInteractiveLoop } = require('../ui/interactive');
 const { t } = require('../lib/i18n');
 
-const rootPkg = require(path.join(getMonorepoRoot(), 'package.json'));
+const rootPkg = require(path.join(getCliPackageRoot(), 'package.json'));
 
 const program = new Command();
 
@@ -62,7 +63,7 @@ program
     const projectRoot = ensureOriginalCwd();
     try {
       if (options.clientOnly) {
-        await runNodeScript(getClientBin(), [], { cwd: projectRoot });
+        await runNodeScript(getClientBin(projectRoot), [], { cwd: projectRoot });
         return;
       }
       if (options.apiOnly) {
@@ -121,7 +122,8 @@ clientCmd
   .option('--pm2', t('cli.client.start.pm2'))
   .action(async (options) => {
     const args = options.pm2 ? ['--pm2'] : [];
-    await runNodeScript(getClientBin(), args, { cwd: ensureOriginalCwd() });
+    const projectRoot = ensureOriginalCwd();
+    await runNodeScript(getClientBin(projectRoot), args, { cwd: projectRoot });
   });
 
 program

package/lib/api-dev.js

@@ -2,7 +2,7 @@ const { spawn, spawnSync } = require('child_process');
 const path = require('path');
 const { ensureProjectEnvironment } = require('./bootstrap');
 const { isUsingMonorepoServer } = require('./paths');
-const { getMonorepoRoot } = require('./root');
+const { ensureOriginalCwd } = require('./root');
 const { t } = require('./i18n');
 
 let apiChild;
@@ -11,7 +11,7 @@ function stopApiDev(projectRoot) {
   if (apiChild && !apiChild.killed) {
     apiChild.kill('SIGTERM');
   }
-  if (!isUsingMonorepoServer()) {
+  if (!isUsingMonorepoServer(projectRoot)) {
     spawnSync('pnpm', ['exec', 'reactpress-cli', 'stop'], {
       cwd: projectRoot,
       stdio: 'inherit',
@@ -20,7 +20,7 @@ function stopApiDev(projectRoot) {
 }
 
 function startApiDev(projectRoot) {
-  if (isUsingMonorepoServer()) {
+  if (isUsingMonorepoServer(projectRoot)) {
     console.log(t('apiDev.modeServer'));
     apiChild = spawn('pnpm', ['run', '--dir', './server', 'dev'], {
       cwd: projectRoot,
@@ -54,7 +54,7 @@ function startApiDev(projectRoot) {
   }
 }
 
-async function runApiDev(projectRoot = process.env.REACTPRESS_ORIGINAL_CWD || getMonorepoRoot()) {
+async function runApiDev(projectRoot = ensureOriginalCwd()) {
   try {
     await ensureProjectEnvironment(projectRoot);
   } catch (err) {

package/lib/bootstrap.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { pathToFileURL } = require('url');
-const { getMonorepoRoot, isMonorepoCheckout } = require('./root');
+const { ensureOriginalCwd, isMonorepoCheckout } = require('./root');
 const { getCliPackageRoot } = require('./paths');
 const { t } = require('./i18n');
 
@@ -68,7 +68,7 @@ async function initMonorepoProject(projectRoot, { force = false } = {}) {
   };
 }
 
-async function ensureProjectEnvironment(projectRoot = getMonorepoRoot()) {
+async function ensureProjectEnvironment(projectRoot = ensureOriginalCwd()) {
   const root = path.resolve(projectRoot);
   const { setProjectCwd } = await importCliModule('utils/cli-context.js');
   setProjectCwd(root);

package/lib/build.js

@@ -1,3 +1,5 @@
+const fs = require('fs');
+const path = require('path');
 const chalk = require('chalk');
 const { runSync } = require('./spawn');
 const { ensureOriginalCwd } = require('./root');
@@ -22,6 +24,60 @@ const TARGETS = Object.keys(BUILD_STEPS);
 
 const buildChildEnv = { REACTPRESS_BUILD_ACTIVE: '1' };
 
+function readPackageScripts(packageJsonPath) {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+    return pkg.scripts || {};
+  } catch {
+    return {};
+  }
+}
+
+/** Prefer workspace package scripts over root package.json aliases. */
+function resolveBuildInvocation(script, projectRoot) {
+  const root = path.resolve(projectRoot);
+
+  if (script === 'build:toolkit') {
+    const toolkitDir = path.join(root, 'toolkit');
+    if (fs.existsSync(path.join(toolkitDir, 'package.json'))) {
+      return { command: 'pnpm', args: ['run', 'build'], cwd: toolkitDir };
+    }
+    const rootScripts = readPackageScripts(path.join(root, 'package.json'));
+    if (rootScripts['build:toolkit']) {
+      return { command: 'pnpm', args: ['run', 'build:toolkit'], cwd: root };
+    }
+    return null;
+  }
+
+  if (script === 'build:server') {
+    const serverDir = path.join(root, 'server');
+    if (fs.existsSync(path.join(serverDir, 'package.json'))) {
+      return { command: 'pnpm', args: ['run', 'build'], cwd: serverDir };
+    }
+  }
+
+  if (script === 'build:client') {
+    const clientDir = path.join(root, 'client');
+    if (fs.existsSync(path.join(clientDir, 'package.json'))) {
+      return { command: 'pnpm', args: ['run', 'build'], cwd: clientDir };
+    }
+  }
+
+  if (script === 'build:docs') {
+    const docsDir = path.join(root, 'docs');
+    if (fs.existsSync(path.join(docsDir, 'package.json'))) {
+      return { command: 'pnpm', args: ['run', 'build'], cwd: docsDir };
+    }
+  }
+
+  const rootScripts = readPackageScripts(path.join(root, 'package.json'));
+  if (rootScripts[script]) {
+    return { command: 'pnpm', args: ['run', script], cwd: root };
+  }
+
+  return null;
+}
+
 async function runBuild(target = 'all', projectRoot = ensureOriginalCwd()) {
   if (process.env.REACTPRESS_BUILD_ACTIVE === '1') {
     throw new Error(t('build.recursive'));
@@ -55,8 +111,18 @@ async function runBuild(target = 'all', projectRoot = ensureOriginalCwd()) {
     const stepStarted = Date.now();
 
     console.log(t('build.step', { current, total, label }));
+
+    const invocation = resolveBuildInvocation(script, projectRoot);
+    if (!invocation) {
+      console.log(chalk.yellow(t('build.stepSkipped', { label })));
+      continue;
+    }
+
     try {
-      runSync('pnpm', ['run', script], { cwd: projectRoot, env: buildChildEnv });
+      runSync(invocation.command, invocation.args, {
+        cwd: invocation.cwd,
+        env: buildChildEnv,
+      });
     } catch (err) {
       console.error(chalk.red(t('build.stepFailed', { current, total, label })));
       throw err;
@@ -72,4 +138,9 @@ async function runBuild(target = 'all', projectRoot = ensureOriginalCwd()) {
   }
 }
 
-module.exports = { runBuild, TARGETS, BUILD_STEPS };
+module.exports = {
+  runBuild,
+  TARGETS,
+  BUILD_STEPS,
+  resolveBuildInvocation,
+};

package/lib/i18n/strings.js

@@ -203,6 +203,7 @@ const STRINGS = {
     'build.plan': '[reactpress] Production build — {total} step(s): toolkit → server → client',
     'build.step': '[reactpress] [{current}/{total}] {label}…',
     'build.stepDone': '[reactpress] [{current}/{total}] {label} ✓ ({seconds}s)',
+    'build.stepSkipped': '[reactpress] Skipped {label} (not part of this project layout)',
     'build.done': '[reactpress] Build finished in {seconds}s',
     'build.label.toolkit': 'Toolkit',
     'build.label.server': 'API (server)',
@@ -494,6 +495,7 @@ const STRINGS = {
     'build.plan': '[reactpress] 生产构建 — 共 {total} 步：toolkit → server → client',
     'build.step': '[reactpress] [{current}/{total}] {label}…',
     'build.stepDone': '[reactpress] [{current}/{total}] {label} ✓ ({seconds}s)',
+    'build.stepSkipped': '[reactpress] 已跳过 {label}（当前项目无对应源码包）',
     'build.done': '[reactpress] 构建完成，耗时 {seconds}s',
     'build.label.toolkit': 'Toolkit',
     'build.label.server': 'API (server)',

package/lib/lifecycle.js

@@ -8,7 +8,7 @@ const {
   getPidFile,
 } = require('./paths');
 const { readPid, isProcessRunning, clearPidFile, writePid } = require('./process');
-const { getMonorepoRoot } = require('./root');
+const { ensureOriginalCwd } = require('./root');
 const { t } = require('./i18n');
 
 async function ensureConfig(projectRoot) {
@@ -46,7 +46,7 @@ async function startApi(projectRoot, { wait = true } = {}) {
   }
   clearPidFile(projectRoot);
 
-  if (!isUsingMonorepoServer()) {
+  if (!isUsingMonorepoServer(projectRoot)) {
     console.warn(t('lifecycle.noServerSrc'));
     const start = spawnSync('pnpm', ['exec', 'reactpress-cli', 'start'], {
       cwd: projectRoot,
@@ -56,8 +56,8 @@ async function startApi(projectRoot, { wait = true } = {}) {
   }
 
   console.log(t('lifecycle.startingLocalApi'));
-  const child = spawn(process.execPath, [getServerBin()], {
-    cwd: getServerDir(),
+  const child = spawn(process.execPath, [getServerBin(projectRoot)], {
+    cwd: getServerDir(projectRoot),
     detached: true,
     stdio: 'ignore',
     env: {
@@ -90,7 +90,7 @@ async function statusApi(projectRoot) {
   const { isHttpResponding } = require('./http');
   const httpOk = await isHttpResponding(serverUrl);
 
-  const source = isUsingMonorepoServer()
+  const source = isUsingMonorepoServer(projectRoot)
     ? t('lifecycle.source.monorepo')
     : t('lifecycle.source.bundle');
 
@@ -119,7 +119,7 @@ async function statusApi(projectRoot) {
   );
 }
 
-async function runLifecycleCommand(command, projectRoot = process.env.REACTPRESS_ORIGINAL_CWD || getMonorepoRoot()) {
+async function runLifecycleCommand(command, projectRoot = ensureOriginalCwd()) {
   switch (command) {
     case 'start':
       return startApi(projectRoot, { wait: true });
@@ -127,7 +127,7 @@ async function runLifecycleCommand(command, projectRoot = process.env.REACTPRESS
       return startApi(projectRoot, { wait: false });
     case 'stop':
       stopApi(projectRoot);
-      if (!isUsingMonorepoServer()) {
+      if (!isUsingMonorepoServer(projectRoot)) {
         spawnSync('pnpm', ['exec', 'reactpress-cli', 'stop'], {
           cwd: projectRoot,
           stdio: 'inherit',
@@ -136,7 +136,7 @@ async function runLifecycleCommand(command, projectRoot = process.env.REACTPRESS
       return 0;
     case 'restart':
       stopApi(projectRoot);
-      if (!isUsingMonorepoServer()) {
+      if (!isUsingMonorepoServer(projectRoot)) {
         spawnSync('pnpm', ['exec', 'reactpress-cli', 'restart'], {
           cwd: projectRoot,
           stdio: 'inherit',

package/lib/paths.js

@@ -1,13 +1,19 @@
 const fs = require('fs');
 const path = require('path');
-const { getMonorepoRoot } = require('./root');
+const { ensureOriginalCwd, getMonorepoRoot } = require('./root');
 
-function getMonorepoServerDir() {
-  return path.join(getMonorepoRoot(), 'server');
+function resolveProjectRoot(projectRoot) {
+  return path.resolve(projectRoot || ensureOriginalCwd());
 }
 
-function hasMonorepoServerSource() {
-  return fs.existsSync(path.join(getMonorepoServerDir(), 'src', 'main.ts'));
+function getMonorepoServerDir(projectRoot) {
+  return path.join(resolveProjectRoot(projectRoot), 'server');
+}
+
+function hasMonorepoServerSource(projectRoot) {
+  return fs.existsSync(
+    path.join(getMonorepoServerDir(projectRoot), 'src', 'main.ts')
+  );
 }
 
 function getCliPackageRoot() {
@@ -28,39 +34,53 @@ function getBundledServerDir() {
   return path.join(getCliPackageRoot(), 'server');
 }
 
-function getServerDir() {
-  if (hasMonorepoServerSource()) {
-    return getMonorepoServerDir();
+function getServerDir(projectRoot) {
+  if (hasMonorepoServerSource(projectRoot)) {
+    return getMonorepoServerDir(projectRoot);
   }
   return getBundledServerDir();
 }
 
-function getServerBin() {
-  return path.join(getServerDir(), 'bin', 'reactpress-server.js');
+function getServerBin(projectRoot) {
+  return path.join(getServerDir(projectRoot), 'bin', 'reactpress-server.js');
 }
 
-function getSwaggerPath() {
-  return path.join(getServerDir(), 'public', 'swagger.json');
+function getSwaggerPath(projectRoot) {
+  return path.join(getServerDir(projectRoot), 'public', 'swagger.json');
 }
 
-function getServerMain() {
-  return path.join(getServerDir(), 'dist', 'main.js');
+function getServerMain(projectRoot) {
+  return path.join(getServerDir(projectRoot), 'dist', 'main.js');
 }
 
-function isUsingMonorepoServer() {
-  return hasMonorepoServerSource();
+function isUsingMonorepoServer(projectRoot) {
+  return hasMonorepoServerSource(projectRoot);
 }
 
-function getClientBin() {
-  return path.join(getMonorepoRoot(), 'client', 'bin', 'reactpress-client.js');
+function getClientBin(projectRoot) {
+  const binPath = path.join(
+    resolveProjectRoot(projectRoot),
+    'client',
+    'bin',
+    'reactpress-client.js'
+  );
+  if (!fs.existsSync(binPath)) {
+    const err = new Error(
+      `Client entry not found: ${binPath}. Run from a ReactPress monorepo root or use reactpress-cli for site-only projects.`
+    );
+    err.code = 'REACTPRESS_CLIENT_NOT_FOUND';
+    throw err;
+  }
+  return binPath;
 }
 
 function getPidFile(projectRoot) {
-  return path.join(projectRoot, '.reactpress', 'server.pid');
+  return path.join(resolveProjectRoot(projectRoot), '.reactpress', 'server.pid');
 }
 
 module.exports = {
   getMonorepoRoot,
+  resolveProjectRoot,
   getMonorepoServerDir,
   hasMonorepoServerSource,
   isUsingMonorepoServer,

package/lib/pm2.js

@@ -5,9 +5,9 @@ const { t } = require('./i18n');
 
 function startApiWithPm2(projectRoot = ensureOriginalCwd()) {
   return new Promise((resolve, reject) => {
-    const child = spawn(process.execPath, [getServerBin(), '--pm2'], {
+    const child = spawn(process.execPath, [getServerBin(projectRoot), '--pm2'], {
       stdio: 'inherit',
-      cwd: getServerDir(),
+      cwd: getServerDir(projectRoot),
       env: {
         ...process.env,
         REACTPRESS_ORIGINAL_CWD: projectRoot,

package/lib/publish.js

@@ -389,6 +389,15 @@ function buildPackage(pkg) {
         execSync('pnpm run prebuild && pnpm run build', { cwd: path.join(process.cwd(), pkg.path), stdio: 'inherit' });
       } else if (pkg.path === 'toolkit') {
         execSync('pnpm run build', { cwd: path.join(process.cwd(), pkg.path), stdio: 'inherit' });
+      } else if (pkg.path === 'cli') {
+        execSync('node scripts/sync-bundled-core.mjs', {
+          cwd: path.join(process.cwd(), pkg.path),
+          stdio: 'inherit',
+        });
+        execSync('node scripts/install-bundled-runtime.mjs', {
+          cwd: path.join(process.cwd(), pkg.path),
+          stdio: 'inherit',
+        });
       } else if (pkg.path === 'templates/hello-world' || pkg.path === 'templates/twentytwentyfive') {
         // Templates don't need to be built, just validate package.json
         console.log(chalk.gray('  Templates do not require building, skipping...'));

package/lib/root.js

@@ -1,6 +1,8 @@
 const fs = require('fs');
 const path = require('path');
 
+const CLI_PACKAGE_NAME = '@fecommunity/reactpress';
+
 /**
  * Install root: monorepo checkout (repo root) or published @fecommunity/reactpress package root.
  * cli/lib -> ../.. when pnpm-workspace.yaml exists; published lib/ -> .. only.
@@ -14,8 +16,51 @@ function getMonorepoRoot() {
   return packageRoot;
 }
 
+function isPublishedCliRoot(dir) {
+  const resolved = path.resolve(dir);
+  try {
+    const pkg = JSON.parse(
+      fs.readFileSync(path.join(resolved, 'package.json'), 'utf8')
+    );
+    if (pkg.name !== CLI_PACKAGE_NAME) return false;
+  } catch {
+    return false;
+  }
+  return !fs.existsSync(path.join(resolved, 'pnpm-workspace.yaml'));
+}
+
+function isProjectRoot(dir) {
+  const resolved = path.resolve(dir);
+  if (isPublishedCliRoot(resolved)) return false;
+  return (
+    fs.existsSync(path.join(resolved, '.reactpress', 'config.json')) ||
+    fs.existsSync(path.join(resolved, 'pnpm-workspace.yaml')) ||
+    fs.existsSync(path.join(resolved, 'server', 'src', 'main.ts')) ||
+    fs.existsSync(path.join(resolved, 'toolkit', 'package.json'))
+  );
+}
+
+function findProjectRoot(startDir = process.cwd()) {
+  let dir = path.resolve(startDir);
+  while (true) {
+    if (isProjectRoot(dir)) return dir;
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return null;
+}
+
 function getProjectRoot() {
-  return path.resolve(process.env.REACTPRESS_ORIGINAL_CWD || process.cwd());
+  const envRoot = process.env.REACTPRESS_ORIGINAL_CWD;
+  if (envRoot) {
+    const resolved = path.resolve(envRoot);
+    if (isProjectRoot(resolved)) return resolved;
+  }
+  const discovered = findProjectRoot(process.cwd());
+  if (discovered) return discovered;
+  if (envRoot) return path.resolve(envRoot);
+  return path.resolve(process.cwd());
 }
 
 function ensureOriginalCwd() {
@@ -24,10 +69,11 @@ function ensureOriginalCwd() {
   return root;
 }
 
-function isMonorepoCheckout(cwd = getMonorepoRoot()) {
+function isMonorepoCheckout(cwd) {
+  const resolved = path.resolve(cwd || process.cwd());
   return (
-    fs.existsSync(path.join(cwd, 'pnpm-workspace.yaml')) ||
-    fs.existsSync(path.join(cwd, 'server', 'src', 'main.ts'))
+    fs.existsSync(path.join(resolved, 'pnpm-workspace.yaml')) ||
+    fs.existsSync(path.join(resolved, 'server', 'src', 'main.ts'))
   );
 }
 
@@ -36,4 +82,7 @@ module.exports = {
   getProjectRoot,
   ensureOriginalCwd,
   isMonorepoCheckout,
+  isProjectRoot,
+  findProjectRoot,
+  isPublishedCliRoot,
 };

package/lib/spawn.js

@@ -1,19 +1,23 @@
 const { spawn, spawnSync } = require('child_process');
 const path = require('path');
 const chalk = require('chalk');
-const { getMonorepoRoot } = require('./root');
+const { ensureOriginalCwd } = require('./root');
 const { getCliPackageRoot } = require('./paths');
 const { t, resolveLocale } = require('./i18n');
 
+function resolveSpawnCwd(options = {}) {
+  return options.cwd ? path.resolve(options.cwd) : ensureOriginalCwd();
+}
+
 function runSync(command, args, options = {}) {
+  const cwd = resolveSpawnCwd(options);
   const result = spawnSync(command, args, {
-    cwd: options.cwd || getMonorepoRoot(),
+    cwd,
     stdio: 'inherit',
     env: {
       ...process.env,
       REACTPRESS_LANG: process.env.REACTPRESS_LANG || resolveLocale(),
-      REACTPRESS_ORIGINAL_CWD:
-        options.cwd || process.env.REACTPRESS_ORIGINAL_CWD || process.cwd(),
+      REACTPRESS_ORIGINAL_CWD: cwd,
       ...options.env,
     },
     shell: options.shell ?? false,
@@ -29,15 +33,15 @@ function runSync(command, args, options = {}) {
 }
 
 function runNodeScript(scriptPath, args = [], options = {}) {
+  const cwd = resolveSpawnCwd(options);
   return new Promise((resolve, reject) => {
     const child = spawn(process.execPath, [scriptPath, ...args], {
       stdio: 'inherit',
-      cwd: options.cwd || getMonorepoRoot(),
+      cwd,
       env: {
         ...process.env,
         REACTPRESS_LANG: process.env.REACTPRESS_LANG || resolveLocale(),
-        REACTPRESS_ORIGINAL_CWD:
-          options.cwd || process.env.REACTPRESS_ORIGINAL_CWD || process.cwd(),
+        REACTPRESS_ORIGINAL_CWD: cwd,
         ...options.env,
       },
     });
@@ -58,15 +62,15 @@ function runNodeScript(scriptPath, args = [], options = {}) {
 }
 
 function spawnDetached(scriptPath, args = [], options = {}) {
+  const cwd = resolveSpawnCwd(options);
   const child = spawn(process.execPath, [scriptPath, ...args], {
     stdio: options.stdio ?? 'ignore',
     detached: true,
-    cwd: options.cwd,
+    cwd,
     env: {
       ...process.env,
       REACTPRESS_LANG: process.env.REACTPRESS_LANG || resolveLocale(),
-      REACTPRESS_ORIGINAL_CWD:
-        options.cwd || process.env.REACTPRESS_ORIGINAL_CWD || process.cwd(),
+      REACTPRESS_ORIGINAL_CWD: cwd,
       ...options.env,
     },
   });

package/lib/status.js

@@ -37,7 +37,7 @@ async function printUnifiedStatus(projectRoot = ensureOriginalCwd()) {
     checkHealth(healthUrl),
   ]);
 
-  const apiSource = isUsingMonorepoServer()
+  const apiSource = isUsingMonorepoServer(projectRoot)
     ? t('status.apiSource.monorepo')
     : t('status.apiSource.bundle');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecommunity/reactpress",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "ReactPress 3.0 — zero-config CMS: one package, one reactpress command",
   "author": "fecommunity",
   "license": "MIT",

package/templates/env.default

@@ -1,4 +1,4 @@
-# ReactPress — auto-generated by reactpress-cli (do not edit DB_* unless you know what you are doing)
+# ReactPress — auto-generated by reactpress init (do not edit DB_* unless you know what you are doing)
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_USER=reactpress

package/templates/package.json

@@ -4,7 +4,8 @@
   "version": "1.0.0",
   "description": "ReactPress CMS & Blog site",
   "scripts": {
-    "start": "reactpress-cli start",
-    "stop": "reactpress-cli stop"
+    "dev": "reactpress dev",
+    "start": "reactpress server start",
+    "stop": "reactpress server stop"
   }
 }

package/ui/banner.js

@@ -1,11 +1,11 @@
 const chalk = require('chalk');
 const { brand } = require('./theme');
-const { getMonorepoRoot } = require('../lib/root');
 const path = require('path');
+const { getCliPackageRoot } = require('../lib/paths');
 const { t } = require('../lib/i18n');
 
 function printBanner() {
-  const version = require(path.join(getMonorepoRoot(), 'package.json')).version;
+  const version = require(path.join(getCliPackageRoot(), 'package.json')).version;
   console.log('');
   console.log(brand.primary('  ╭─────────────────────────────────────────╮'));
   console.log(

package/ui/interactive.js

@@ -64,7 +64,7 @@ async function runMenuAction(action, projectRoot) {
       await runApiDev(projectRoot);
       return false;
     case 'dev:client':
-      await runNodeScript(getClientBin(), [], { cwd: projectRoot });
+      await runNodeScript(getClientBin(projectRoot), [], { cwd: projectRoot });
       return false;
     case 'server:start': {
       const code = await runLifecycleCommand('start', projectRoot);