@lark-apaas/fullstack-cli 1.1.28-alpha.2 → 1.1.28-alpha.21

package/dist/index.js

@@ -2377,12 +2377,15 @@ var syncConfig = {
       type: "directory",
       overwrite: true
     },
-    // 2. 覆写 nest-cli.json 配置，禁止用户修改
+    // 2. 智能合并 nest-cli.json 配置（保留用户自定义的 assets、plugins 等）
     {
       from: "templates/nest-cli.json",
       to: "nest-cli.json",
-      type: "file",
-      overwrite: true
+      type: "merge-json",
+      arrayMerge: {
+        "compilerOptions.assets": { key: "include" },
+        "compilerOptions.plugins": { key: "name" }
+      }
     },
     // // 2. 追加内容到 .gitignore
     // {
@@ -2427,6 +2430,13 @@ var syncConfig = {
       type: "add-line",
       to: ".gitignore",
       line: ".agent/"
+    },
+    // 8. 同步 .spark_project 配置文件（总是覆盖）
+    {
+      from: "templates/.spark_project",
+      to: ".spark_project",
+      type: "file",
+      overwrite: true
     }
   ],
   // 文件权限设置
@@ -2468,6 +2478,52 @@ function removeLineFromFile(filePath, pattern) {
   return true;
 }
 
+// src/utils/merge-json.ts
+function isPlainObject(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function mergeArrayByKey(userArr, templateArr, key) {
+  const result = [...userArr];
+  for (const templateItem of templateArr) {
+    if (!isPlainObject(templateItem)) continue;
+    const templateKey = templateItem[key];
+    const existingIndex = result.findIndex(
+      (item) => isPlainObject(item) && item[key] === templateKey
+    );
+    if (existingIndex >= 0) {
+      result[existingIndex] = templateItem;
+    } else {
+      result.push(templateItem);
+    }
+  }
+  return result;
+}
+function deepMergeJson(user, template, arrayMerge = {}, currentPath = "") {
+  const result = { ...user };
+  for (const key of Object.keys(template)) {
+    const fullPath = currentPath ? `${currentPath}.${key}` : key;
+    const templateValue = template[key];
+    const userValue = user[key];
+    if (Array.isArray(templateValue)) {
+      const mergeConfig = arrayMerge[fullPath];
+      if (mergeConfig && Array.isArray(userValue)) {
+        result[key] = mergeArrayByKey(userValue, templateValue, mergeConfig.key);
+      } else {
+        result[key] = templateValue;
+      }
+    } else if (isPlainObject(templateValue)) {
+      if (isPlainObject(userValue)) {
+        result[key] = deepMergeJson(userValue, templateValue, arrayMerge, fullPath);
+      } else {
+        result[key] = templateValue;
+      }
+    } else {
+      result[key] = templateValue;
+    }
+  }
+  return result;
+}
+
 // src/commands/sync/run.handler.ts
 async function run2(options) {
   const userProjectRoot = process.env.INIT_CWD || process.cwd();
@@ -2530,6 +2586,12 @@ async function syncRule(rule, pluginRoot, userProjectRoot) {
     addLineToFile(destPath2, rule.line);
     return;
   }
+  if (rule.type === "merge-json") {
+    const srcPath2 = path4.join(pluginRoot, rule.from);
+    const destPath2 = path4.join(userProjectRoot, rule.to);
+    mergeJsonFile(srcPath2, destPath2, rule.arrayMerge);
+    return;
+  }
   if (!("from" in rule)) {
     return;
   }
@@ -2672,6 +2734,33 @@ function addLineToFile(filePath, line) {
   fs6.appendFileSync(filePath, appendContent);
   console.log(`[fullstack-cli] \u2713 ${fileName} (added: ${line})`);
 }
+function mergeJsonFile(src, dest, arrayMerge) {
+  const fileName = path4.basename(dest);
+  if (!fs6.existsSync(src)) {
+    console.warn(`[fullstack-cli] Source not found: ${src}`);
+    return;
+  }
+  const templateContent = JSON.parse(fs6.readFileSync(src, "utf-8"));
+  if (!fs6.existsSync(dest)) {
+    const destDir = path4.dirname(dest);
+    if (!fs6.existsSync(destDir)) {
+      fs6.mkdirSync(destDir, { recursive: true });
+    }
+    fs6.writeFileSync(dest, JSON.stringify(templateContent, null, 2) + "\n");
+    console.log(`[fullstack-cli] \u2713 ${fileName} (created)`);
+    return;
+  }
+  const userContent = JSON.parse(fs6.readFileSync(dest, "utf-8"));
+  const merged = deepMergeJson(userContent, templateContent, arrayMerge ?? {});
+  const userStr = JSON.stringify(userContent, null, 2);
+  const mergedStr = JSON.stringify(merged, null, 2);
+  if (userStr === mergedStr) {
+    console.log(`[fullstack-cli] \u25CB ${fileName} (already up to date)`);
+    return;
+  }
+  fs6.writeFileSync(dest, mergedStr + "\n");
+  console.log(`[fullstack-cli] \u2713 ${fileName} (merged)`);
+}
 
 // src/commands/sync/index.ts
 var syncCommand = {
@@ -2928,7 +3017,7 @@ function getUpgradeFilesToStage(disableGenOpenapi = true) {
   const syncConfig2 = genSyncConfig({ disableGenOpenapi });
   const filesToStage = /* @__PURE__ */ new Set();
   syncConfig2.sync.forEach((rule) => {
-    if (rule.type === "file" || rule.type === "directory") {
+    if (rule.type === "file" || rule.type === "directory" || rule.type === "merge-json") {
       filesToStage.add(rule.to);
     } else if (rule.type === "remove-line" || rule.type === "add-line") {
       filesToStage.add(rule.to);
@@ -7166,6 +7255,12 @@ var SCENE_CONFIGS = {
     buildRequestBody: () => ({ commitID: "" })
   }
 };
+var UPLOAD_STATIC_DEFAULTS = {
+  staticDir: "shared/static",
+  tosutilPath: "tosutil",
+  endpoint: "tos-cn-beijing.volces.com",
+  region: "cn-beijing"
+};
 
 // src/commands/build/api-client.ts
 async function genArtifactUploadCredential(appId, body) {
@@ -7181,17 +7276,20 @@ async function genArtifactUploadCredential(appId, body) {
 }
 async function getDefaultBucketId(appId) {
   const client = getHttpClient();
-  const url = `/b/${appId}/get_published_v2`;
-  const response = await client.get(url);
+  const url = `/v1/app/${appId}/storage/inner/staticBucket`;
+  const response = await client.post(url, {});
   if (!response.ok || response.status !== 200) {
     throw new Error(
-      `get_published_v2 \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
+      `getOrCreateStaticBucket \u8BF7\u6C42\u5931\u8D25: ${response.status} ${response.statusText}`
     );
   }
   const data = await response.json();
-  const bucketId = data?.data?.app_runtime_extra?.bucket?.default_bucket_id;
+  if (data.status_code !== "0") {
+    throw new Error(`getOrCreateStaticBucket \u8FD4\u56DE\u5F02\u5E38, status_code: ${data.status_code}`);
+  }
+  const bucketId = data?.data?.bucketID;
   if (!bucketId) {
-    throw new Error(`\u672A\u627E\u5230\u5E94\u7528 ${appId} \u7684\u9ED8\u8BA4\u5B58\u50A8\u6876`);
+    throw new Error(`\u672A\u627E\u5230\u5E94\u7528 ${appId} \u7684\u9759\u6001\u8D44\u6E90\u5B58\u50A8\u6876`);
   }
   return bucketId;
 }
@@ -7253,7 +7351,7 @@ function camelToKebab(str) {
 // src/commands/build/upload-static.handler.ts
 import * as fs25 from "fs";
 import * as path21 from "path";
-import { execSync as execSync3 } from "child_process";
+import { execFileSync } from "child_process";
 function readCredentialsFromEnv() {
   const uploadPrefix = process.env.STATIC_UPLOAD_PREFIX;
   const uploadID = process.env.STATIC_UPLOAD_ID;
@@ -7271,10 +7369,10 @@ async function uploadStatic(options) {
   try {
     const {
       appId,
-      staticDir = "shared/static",
-      tosutilPath = "/workspace/tosutil",
-      endpoint = "tos-cn-beijing.volces.com",
-      region = "cn-beijing"
+      staticDir = UPLOAD_STATIC_DEFAULTS.staticDir,
+      tosutilPath = UPLOAD_STATIC_DEFAULTS.tosutilPath,
+      endpoint = UPLOAD_STATIC_DEFAULTS.endpoint,
+      region = UPLOAD_STATIC_DEFAULTS.region
     } = options;
     const resolvedStaticDir = path21.resolve(staticDir);
     if (!fs25.existsSync(resolvedStaticDir)) {
@@ -7285,9 +7383,10 @@ async function uploadStatic(options) {
       console.error(`${LOG_PREFIX} \u76EE\u5F55\u4E3A\u7A7A: ${resolvedStaticDir}\uFF0C\u8DF3\u8FC7\u4E0A\u4F20`);
       return;
     }
-    if (!fs25.existsSync(tosutilPath)) {
+    const resolvedTosutil = resolveTosutilPath(tosutilPath);
+    if (!resolvedTosutil) {
       throw new Error(
-        `tosutil \u4E0D\u5B58\u5728: ${tosutilPath}\u3002\u8BF7\u786E\u4FDD\u6D41\u6C34\u7EBF\u5DF2\u5728"\u4EA7\u7269\u6253\u5305\u4E0A\u4F20"\u6B65\u9AA4\u4E2D\u4E0B\u8F7D tosutil\u3002`
+        `tosutil \u4E0D\u5B58\u5728: ${tosutilPath}\u3002\u8BF7\u786E\u4FDD tosutil \u5DF2\u5B89\u88C5\u5728\u7CFB\u7EDF PATH \u4E2D\u6216\u901A\u8FC7 --tosutil-path \u6307\u5B9A\u8DEF\u5F84\u3002`
       );
     }
     let uploadPrefix;
@@ -7310,7 +7409,7 @@ async function uploadStatic(options) {
     }
     console.error(`${LOG_PREFIX} \u4E0A\u4F20\u76EE\u6807: ${uploadPrefix}`);
     console.error(`${LOG_PREFIX} \u914D\u7F6E tosutil...`);
-    configureTosutil(tosutilPath, {
+    configureTosutil(resolvedTosutil, {
       endpoint,
       region,
       accessKeyID,
@@ -7318,7 +7417,7 @@ async function uploadStatic(options) {
       sessionToken
     });
     console.error(`${LOG_PREFIX} \u4E0A\u4F20 ${resolvedStaticDir} -> ${uploadPrefix}`);
-    uploadToTos(tosutilPath, resolvedStaticDir, uploadPrefix);
+    uploadToTos(resolvedTosutil, resolvedStaticDir, uploadPrefix);
     console.error(`${LOG_PREFIX} tosutil \u4E0A\u4F20\u5B8C\u6210`);
     console.error(`${LOG_PREFIX} \u8C03\u7528 callbackStatic (uploadID: ${uploadID})...`);
     const callbackResp = await uploadStaticAttachmentCallback(appId, bucketId, { uploadID });
@@ -7334,6 +7433,17 @@ async function uploadStatic(options) {
     process.exit(1);
   }
 }
+function resolveTosutilPath(tosutilPath) {
+  if (path21.isAbsolute(tosutilPath)) {
+    return fs25.existsSync(tosutilPath) ? tosutilPath : null;
+  }
+  try {
+    const resolved = execFileSync("which", [tosutilPath], { encoding: "utf-8" }).trim();
+    return resolved || null;
+  } catch {
+    return null;
+  }
+}
 async function fetchPreUpload(appId, bucketId) {
   const response = await preUploadStaticAttachment(appId, bucketId);
   if (response.status_code !== "0") {
@@ -7350,14 +7460,16 @@ async function fetchPreUpload(appId, bucketId) {
 }
 function configureTosutil(tosutilPath, config) {
   const { endpoint, region, accessKeyID, secretAccessKey, sessionToken } = config;
-  execSync3(
-    `${tosutilPath} config -e ${endpoint} -i ${accessKeyID} -k ${secretAccessKey} -t ${sessionToken} -re ${region}`,
+  execFileSync(
+    tosutilPath,
+    ["config", "-e", endpoint, "-i", accessKeyID, "-k", secretAccessKey, "-t", sessionToken, "-re", region],
     { stdio: "pipe" }
   );
 }
 function uploadToTos(tosutilPath, sourceDir, destUrl) {
-  execSync3(
-    `${tosutilPath} cp "${sourceDir}" "${destUrl}" -r -flat -j 5 -p 3 -ps 10485760 -f`,
+  execFileSync(
+    tosutilPath,
+    ["cp", sourceDir, destUrl, "-r", "-flat", "-j", "5", "-p", "3", "-ps", "10485760", "-f"],
     { stdio: "inherit" }
   );
 }
@@ -7374,6 +7486,9 @@ function isDirEmpty(dirPath) {
 
 // src/commands/build/pre-upload-static.handler.ts
 var LOG_PREFIX2 = "[pre-upload-static]";
+function shellEscape(value) {
+  return value.replace(/["\\`$]/g, "\\$&");
+}
 async function preUploadStatic(options) {
   try {
     const { appId } = options;
@@ -7386,8 +7501,8 @@ async function preUploadStatic(options) {
       console.error(`${LOG_PREFIX2} preUploadStatic \u8FD4\u56DE\u5F02\u5E38, status_code: ${response.status_code}`);
       return;
     }
-    const { downloadUrlPrefix, uploadPrefix, uploadID, uploadCredential } = response.data || {};
-    if (!downloadUrlPrefix || !uploadPrefix || !uploadID) {
+    const { downloadURLPrefix, uploadPrefix, uploadID, uploadCredential } = response.data || {};
+    if (!downloadURLPrefix || !uploadPrefix || !uploadID) {
       console.error(`${LOG_PREFIX2} preUploadStatic \u8FD4\u56DE\u6570\u636E\u4E0D\u5B8C\u6574`);
       return;
     }
@@ -7395,13 +7510,13 @@ async function preUploadStatic(options) {
       console.error(`${LOG_PREFIX2} preUploadStatic \u8FD4\u56DE\u7684\u51ED\u8BC1\u5B57\u6BB5\u4E0D\u5B8C\u6574`);
       return;
     }
-    console.log(`export STATIC_ASSETS_BASE_URL="${downloadUrlPrefix}"`);
-    console.log(`export STATIC_UPLOAD_PREFIX="${uploadPrefix}"`);
-    console.log(`export STATIC_UPLOAD_ID="${uploadID}"`);
-    console.log(`export STATIC_UPLOAD_AK="${uploadCredential.AccessKeyID}"`);
-    console.log(`export STATIC_UPLOAD_SK="${uploadCredential.SecretAccessKey}"`);
-    console.log(`export STATIC_UPLOAD_TOKEN="${uploadCredential.SessionToken}"`);
-    console.log(`export STATIC_UPLOAD_BUCKET_ID="${bucketId}"`);
+    console.log(`export STATIC_ASSETS_BASE_URL="${shellEscape(downloadURLPrefix)}"`);
+    console.log(`export STATIC_UPLOAD_PREFIX="${shellEscape(uploadPrefix)}"`);
+    console.log(`export STATIC_UPLOAD_ID="${shellEscape(uploadID)}"`);
+    console.log(`export STATIC_UPLOAD_AK="${shellEscape(uploadCredential.AccessKeyID)}"`);
+    console.log(`export STATIC_UPLOAD_SK="${shellEscape(uploadCredential.SecretAccessKey)}"`);
+    console.log(`export STATIC_UPLOAD_TOKEN="${shellEscape(uploadCredential.SessionToken)}"`);
+    console.log(`export STATIC_UPLOAD_BUCKET_ID="${shellEscape(bucketId)}"`);
     console.error(`${LOG_PREFIX2} \u73AF\u5883\u53D8\u91CF\u5DF2\u8F93\u51FA`);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -7423,7 +7538,7 @@ var uploadStaticCommand = {
   name: "upload-static",
   description: "Upload shared/static files to TOS",
   register(program) {
-    program.command(this.name).description(this.description).requiredOption("--app-id <id>", "Application ID").option("--static-dir <dir>", "Static files directory", "shared/static").option("--tosutil-path <path>", "Path to tosutil binary", "/workspace/tosutil").option("--endpoint <endpoint>", "TOS endpoint", "tos-cn-beijing.volces.com").option("--region <region>", "TOS region", "cn-beijing").action(async (options) => {
+    program.command(this.name).description(this.description).requiredOption("--app-id <id>", "Application ID").option("--static-dir <dir>", "Static files directory", UPLOAD_STATIC_DEFAULTS.staticDir).option("--tosutil-path <path>", "Path to tosutil binary", UPLOAD_STATIC_DEFAULTS.tosutilPath).option("--endpoint <endpoint>", "TOS endpoint", UPLOAD_STATIC_DEFAULTS.endpoint).option("--region <region>", "TOS region", UPLOAD_STATIC_DEFAULTS.region).action(async (options) => {
       await uploadStatic(options);
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.28-alpha.2",
+  "version": "1.1.28-alpha.21",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",

package/templates/.spark_project

@@ -0,0 +1,16 @@
+run = ["npm", "run", "dev"] # 默认 spark-cli dev
+hidden = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", "tmp", ".spark_project", ".playwright-cli"]
+lint = ["npm", "run", "lint"]
+test = ["npm", "run", "test"]
+genDbSchema = ["npm", "run", "gen:db-schema"]
+genOpenApiClient = ["npm", "run", "gen:openapi"]
+
+[deployment]
+build = ["npm", "run", "build"]
+run = ["npm", "run", "start"]
+
+[files]
+[files.restrict]
+pathPatterns = ["client/src/api/gen", "package.json", ".spark_project", ".gitignore"]
+[files.hidden]
+pathPatterns = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", "tmp", ".spark_project", ".playwright-cli"]

package/templates/scripts/build.sh

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 ROOT_DIR="$(pwd)"
-OUT_DIR="$ROOT_DIR/dist/server"
+DIST_DIR="$ROOT_DIR/dist"
 
 # 记录总开始时间
 TOTAL_START=$(node -e "console.log(Date.now())")
@@ -78,20 +78,26 @@ print_time $STEP_START
 echo ""
 
 # ==================== 步骤 4 ====================
-echo "📦 [4/5] 准备 server 依赖产物"
+echo "📦 [4/5] 准备产物"
 STEP_START=$(node -e "console.log(Date.now())")
 
-mkdir -p "$OUT_DIR/dist/client"
+# 拷贝 run.sh 到 dist/（prod 从 dist/ 启动，确保 cwd 一致性）
+cp "$ROOT_DIR/scripts/run.sh" "$DIST_DIR/"
 
-# 拷贝 HTML
-cp "$ROOT_DIR/dist/client/"*.html "$OUT_DIR/dist/client/" || true
+# 拷贝 .env 文件（如果存在）
+if [ -f "$ROOT_DIR/.env" ]; then
+  cp "$ROOT_DIR/.env" "$DIST_DIR/"
+fi
 
-# 拷贝 run.sh 文件
-cp "$ROOT_DIR/scripts/run.sh" "$OUT_DIR/"
+# 移动 client 下的 HTML 文件到 dist/dist/client，保证 views 路径在 dev/prod 下一致
+if [ -d "$DIST_DIR/client" ]; then
+  mkdir -p "$DIST_DIR/dist/client"
+  find "$DIST_DIR/client" -maxdepth 1 -name "*.html" -exec mv {} "$DIST_DIR/dist/client/" \;
+fi
 
 # 清理无用文件
-rm -rf "$ROOT_DIR/dist/scripts"
-rm -rf "$ROOT_DIR/dist/tsconfig.node.tsbuildinfo"
+rm -rf "$DIST_DIR/scripts"
+rm -rf "$DIST_DIR/tsconfig.node.tsbuildinfo"
 
 print_time $STEP_START
 echo ""
@@ -111,8 +117,8 @@ echo "构建完成"
 print_time $TOTAL_START
 
 # 输出产物信息
-DIST_SIZE=$(du -sh "$OUT_DIR" | cut -f1)
-NODE_MODULES_SIZE=$(du -sh "$ROOT_DIR/dist/node_modules" | cut -f1)
+DIST_SIZE=$(du -sh "$DIST_DIR" | cut -f1)
+NODE_MODULES_SIZE=$(du -sh "$DIST_DIR/node_modules" | cut -f1)
 echo ""
 echo "📊 构建产物统计:"
 echo "   产物大小:        $DIST_SIZE"

package/templates/scripts/dev.js

@@ -0,0 +1,275 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const { spawn, execSync } = require('child_process');
+const readline = require('readline');
+
+// ── Project root ──────────────────────────────────────────────────────────────
+const PROJECT_ROOT = path.resolve(__dirname, '..');
+process.chdir(PROJECT_ROOT);
+
+// ── Load .env ─────────────────────────────────────────────────────────────────
+function loadEnv() {
+  const envPath = path.join(PROJECT_ROOT, '.env');
+  if (!fs.existsSync(envPath)) return;
+  const lines = fs.readFileSync(envPath, 'utf8').split('\n');
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith('#')) continue;
+    const eqIdx = trimmed.indexOf('=');
+    if (eqIdx === -1) continue;
+    const key = trimmed.slice(0, eqIdx).trim();
+    const value = trimmed.slice(eqIdx + 1).trim();
+    if (!(key in process.env)) {
+      process.env[key] = value;
+    }
+  }
+}
+loadEnv();
+
+// ── Configuration ─────────────────────────────────────────────────────────────
+const LOG_DIR = process.env.LOG_DIR || 'logs';
+const MAX_RESTART_COUNT = parseInt(process.env.MAX_RESTART_COUNT, 10) || 10;
+const RESTART_DELAY = parseInt(process.env.RESTART_DELAY, 10) || 2;
+const MAX_DELAY = 60;
+const SERVER_PORT = process.env.SERVER_PORT || '3000';
+const CLIENT_DEV_PORT = process.env.CLIENT_DEV_PORT || '8080';
+
+fs.mkdirSync(LOG_DIR, { recursive: true });
+
+// ── Logging infrastructure ────────────────────────────────────────────────────
+const devStdLogPath = path.join(LOG_DIR, 'dev.std.log');
+const devLogPath = path.join(LOG_DIR, 'dev.log');
+const devStdLogFd = fs.openSync(devStdLogPath, 'a');
+const devLogFd = fs.openSync(devLogPath, 'a');
+
+function timestamp() {
+  const now = new Date();
+  return (
+    now.getFullYear() + '-' +
+    String(now.getMonth() + 1).padStart(2, '0') + '-' +
+    String(now.getDate()).padStart(2, '0') + ' ' +
+    String(now.getHours()).padStart(2, '0') + ':' +
+    String(now.getMinutes()).padStart(2, '0') + ':' +
+    String(now.getSeconds()).padStart(2, '0')
+  );
+}
+
+/** Write to terminal + dev.std.log */
+function writeOutput(msg) {
+  try { process.stdout.write(msg); } catch {}
+  try { fs.writeSync(devStdLogFd, msg); } catch {}
+}
+
+/** Structured event log → terminal + dev.std.log + dev.log */
+function logEvent(level, name, message) {
+  const msg = `[${timestamp()}] [${level}] [${name}] ${message}\n`;
+  writeOutput(msg);
+  try { fs.writeSync(devLogFd, msg); } catch {}
+}
+
+// ── Process group management ──────────────────────────────────────────────────
+function killProcessGroup(pid, signal) {
+  try {
+    process.kill(-pid, signal);
+  } catch {}
+}
+
+function killOrphansByPort(port) {
+  try {
+    const pids = execSync(`lsof -ti :${port}`, { encoding: 'utf8', timeout: 5000 }).trim();
+    if (pids) {
+      const pidList = pids.split('\n').filter(Boolean);
+      for (const p of pidList) {
+        try { process.kill(parseInt(p, 10), 'SIGKILL'); } catch {}
+      }
+      return pidList;
+    }
+  } catch {}
+  return [];
+}
+
+// ── Process supervision ───────────────────────────────────────────────────────
+let stopping = false;
+const managedProcesses = []; // { name, pid, child }
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+/**
+ * Start and supervise a process with auto-restart and log piping.
+ * Returns a promise that resolves when the process loop ends.
+ */
+function startProcess({ name, command, args, cleanupPort }) {
+  const logFilePath = path.join(LOG_DIR, `${name}.std.log`);
+  const logFd = fs.openSync(logFilePath, 'a');
+
+  const entry = { name, pid: null, child: null };
+  managedProcesses.push(entry);
+
+  const run = async () => {
+    let restartCount = 0;
+
+    while (!stopping) {
+      const child = spawn(command, args, {
+        detached: true,
+        stdio: ['ignore', 'pipe', 'pipe'],
+        shell: true,
+        cwd: PROJECT_ROOT,
+        env: { ...process.env },
+      });
+
+      entry.pid = child.pid;
+      entry.child = child;
+
+      logEvent('INFO', name, `Process started (PGID: ${child.pid}): ${command} ${args.join(' ')}`);
+
+      // Pipe stdout and stderr through readline for timestamped logging
+      const pipeLines = (stream) => {
+        const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+        rl.on('line', (line) => {
+          const msg = `[${timestamp()}] [${name}] ${line}\n`;
+          try { fs.writeSync(logFd, msg); } catch {}
+          writeOutput(msg);
+        });
+      };
+      if (child.stdout) pipeLines(child.stdout);
+      if (child.stderr) pipeLines(child.stderr);
+
+      // Wait for the direct child to exit.
+      // NOTE: must use 'exit', not 'close'. With shell:true, grandchild processes
+      // (e.g. nest's server) inherit stdout pipes. 'close' won't fire until ALL
+      // pipe holders exit, causing dev.js to hang when npm/nest dies but server survives.
+      const exitCode = await new Promise((resolve) => {
+        child.on('exit', (code) => resolve(code ?? 1));
+        child.on('error', () => resolve(1));
+      });
+
+      // Kill the entire process group
+      if (entry.pid) {
+        killProcessGroup(entry.pid, 'SIGTERM');
+        await sleep(2000);
+        killProcessGroup(entry.pid, 'SIGKILL');
+      }
+      entry.pid = null;
+      entry.child = null;
+
+      // Port cleanup fallback
+      if (cleanupPort) {
+        const orphans = killOrphansByPort(cleanupPort);
+        if (orphans.length > 0) {
+          logEvent('WARN', name, `Killed orphan processes on port ${cleanupPort}: ${orphans.join(' ')}`);
+          await sleep(500);
+        }
+      }
+
+      if (stopping) break;
+
+      restartCount++;
+      if (restartCount >= MAX_RESTART_COUNT) {
+        logEvent('ERROR', name, `Max restart count (${MAX_RESTART_COUNT}) reached, giving up`);
+        break;
+      }
+
+      const delay = Math.min(RESTART_DELAY * (1 << (restartCount - 1)), MAX_DELAY);
+      logEvent('WARN', name, `Process exited with code ${exitCode}, restarting (${restartCount}/${MAX_RESTART_COUNT}) in ${delay}s...`);
+      await sleep(delay * 1000);
+    }
+
+    try { fs.closeSync(logFd); } catch {}
+  };
+
+  return run();
+}
+
+// ── Cleanup ───────────────────────────────────────────────────────────────────
+let cleanupDone = false;
+
+async function cleanup() {
+  if (cleanupDone) return;
+  cleanupDone = true;
+  stopping = true;
+
+  logEvent('INFO', 'main', 'Shutting down all processes...');
+
+  // Kill all managed process groups
+  for (const entry of managedProcesses) {
+    if (entry.pid) {
+      logEvent('INFO', 'main', `Stopping process group (PGID: ${entry.pid})`);
+      killProcessGroup(entry.pid, 'SIGTERM');
+    }
+  }
+
+  // Wait for graceful shutdown
+  await sleep(2000);
+
+  // Force kill any remaining
+  for (const entry of managedProcesses) {
+    if (entry.pid) {
+      logEvent('WARN', 'main', `Force killing process group (PGID: ${entry.pid})`);
+      killProcessGroup(entry.pid, 'SIGKILL');
+    }
+  }
+
+  // Port cleanup fallback
+  killOrphansByPort(SERVER_PORT);
+  killOrphansByPort(CLIENT_DEV_PORT);
+
+  logEvent('INFO', 'main', 'All processes stopped');
+
+  try { fs.closeSync(devStdLogFd); } catch {}
+  try { fs.closeSync(devLogFd); } catch {}
+
+  process.exit(0);
+}
+
+process.on('SIGTERM', cleanup);
+process.on('SIGINT', cleanup);
+process.on('SIGHUP', cleanup);
+
+// ── Main ──────────────────────────────────────────────────────────────────────
+async function main() {
+  logEvent('INFO', 'main', '========== Dev session started ==========');
+
+  // Initialize action plugins
+  writeOutput('\n🔌 Initializing action plugins...\n');
+  try {
+    execSync('fullstack-cli action-plugin init', { cwd: PROJECT_ROOT, stdio: 'inherit' });
+    writeOutput('✅ Action plugins initialized\n\n');
+  } catch {
+    writeOutput('⚠️  Action plugin initialization failed, continuing anyway...\n\n');
+  }
+
+  // Start server and client
+  const serverPromise = startProcess({
+    name: 'server',
+    command: 'npm',
+    args: ['run', 'dev:server'],
+    cleanupPort: SERVER_PORT,
+  });
+
+  const clientPromise = startProcess({
+    name: 'client',
+    command: 'npm',
+    args: ['run', 'dev:client'],
+    cleanupPort: CLIENT_DEV_PORT,
+  });
+
+  writeOutput(`📋 Dev processes running. Press Ctrl+C to stop.\n`);
+  writeOutput(`📄 Logs: ${devStdLogPath}\n\n`);
+
+  // Wait for both (they loop until stopping or max restarts)
+  await Promise.all([serverPromise, clientPromise]);
+
+  if (!cleanupDone) {
+    await cleanup();
+  }
+}
+
+main().catch((err) => {
+  console.error('Fatal error:', err);
+  process.exit(1);
+});

package/templates/scripts/dev.sh

@@ -1,245 +1,2 @@
 #!/usr/bin/env bash
-# This file is auto-generated by @lark-apaas/fullstack-cli
-
-set -uo pipefail
-
-# Ensure the script always runs from the project root
-cd "$(dirname "${BASH_SOURCE[0]}")/.."
-
-# Configuration
-LOG_DIR=${LOG_DIR:-logs}
-DEV_LOG="${LOG_DIR}/dev.log"
-MAX_RESTART_COUNT=${MAX_RESTART_COUNT:-10}
-RESTART_DELAY=${RESTART_DELAY:-2}
-
-# Process tracking
-SERVER_PID=""
-CLIENT_PID=""
-PARENT_PID=$$
-STOP_FLAG_FILE="/tmp/dev_sh_stop_$$"
-CLEANUP_DONE=false
-
-mkdir -p "${LOG_DIR}"
-
-# Redirect all stdout/stderr to both terminal and log file
-DEV_STD_LOG="${LOG_DIR}/dev.std.log"
-exec > >(tee -a "$DEV_STD_LOG") 2>&1
-
-# Log event to dev.log with timestamp
-log_event() {
-  local level=$1
-  local process_name=$2
-  local message=$3
-  local msg="[$(date '+%Y-%m-%d %H:%M:%S')] [${level}] [${process_name}] ${message}"
-  echo "$msg"
-  echo "$msg" >> "${DEV_LOG}"
-}
-
-# Check if PID is valid (positive integer and process exists)
-is_valid_pid() {
-  local pid=$1
-  [[ -n "$pid" ]] && [[ "$pid" =~ ^[0-9]+$ ]] && [[ "$pid" -gt 0 ]] && kill -0 "$pid" 2>/dev/null
-}
-
-# Check if parent process is still alive
-is_parent_alive() {
-  kill -0 "$PARENT_PID" 2>/dev/null
-}
-
-# Check if should stop (parent exited or stop flag exists)
-should_stop() {
-  [[ -f "$STOP_FLAG_FILE" ]] || ! is_parent_alive
-}
-
-# Kill entire process tree (process and all descendants)
-kill_tree() {
-  local pid=$1
-  local signal=${2:-TERM}
-
-  # Get all descendant PIDs
-  local children
-  children=$(pgrep -P "$pid" 2>/dev/null) || true
-
-  # Recursively kill children first
-  for child in $children; do
-    kill_tree "$child" "$signal"
-  done
-
-  # Kill the process itself
-  if kill -0 "$pid" 2>/dev/null; then
-    kill -"$signal" "$pid" 2>/dev/null || true
-  fi
-}
-
-# Start a process with supervision
-# $1: name
-# $2: command
-# $3: cleanup port for orphan processes (optional)
-start_supervised_process() {
-  local name=$1
-  local cmd=$2
-  local cleanup_port=${3:-""}
-  local log_file="${LOG_DIR}/${name}.std.log"
-
-  (
-    local restart_count=0
-    local child_pid=""
-    local max_delay=60  # Maximum delay in seconds
-
-    # Handle signals to kill child process tree
-    trap 'if [[ -n "$child_pid" ]]; then kill_tree "$child_pid" TERM; fi' TERM INT
-
-    while true; do
-      # Check if we should stop (parent exited or stop flag)
-      if should_stop; then
-        log_event "INFO" "$name" "Process stopped (parent exited or user requested)"
-        break
-      fi
-
-      # Start command in background and capture output with timestamps
-      eval "$cmd" > >(
-        while IFS= read -r line; do
-          local msg="[$(date '+%Y-%m-%d %H:%M:%S')] [${name}] ${line}"
-          echo "$msg"
-          echo "$msg" >> "$log_file"
-        done
-      ) 2>&1 &
-      child_pid=$!
-
-      log_event "INFO" "$name" "Process started (PID: ${child_pid}): ${cmd}"
-
-      # Wait for child to exit
-      set +e
-      wait "$child_pid"
-      exit_code=$?
-      set -e
-
-      # Kill entire process tree to avoid orphans
-      if [[ -n "$child_pid" ]]; then
-        kill_tree "$child_pid" TERM
-        sleep 0.5
-        kill_tree "$child_pid" KILL
-      fi
-      child_pid=""
-
-      # Cleanup orphan processes by port (for processes that escaped kill_tree)
-      if [[ -n "$cleanup_port" ]]; then
-        local orphan_pids
-        orphan_pids=$(lsof -ti ":${cleanup_port}" 2>/dev/null) || true
-        if [[ -n "$orphan_pids" ]]; then
-          log_event "WARN" "$name" "Killing orphan processes on port ${cleanup_port}: $(echo $orphan_pids | tr '\n' ' ')"
-          echo "$orphan_pids" | xargs kill -9 2>/dev/null || true
-          sleep 0.5
-        fi
-      fi
-
-      # Check if we should stop (parent exited or stop flag)
-      if should_stop; then
-        log_event "INFO" "$name" "Process stopped (parent exited or user requested)"
-        break
-      fi
-
-      # Process exited unexpectedly, restart
-      restart_count=$((restart_count + 1))
-
-      if [[ $restart_count -ge $MAX_RESTART_COUNT ]]; then
-        log_event "ERROR" "$name" "Max restart count (${MAX_RESTART_COUNT}) reached, giving up"
-        break
-      fi
-
-      # Exponential backoff: delay = RESTART_DELAY * 2^(restart_count-1), capped at max_delay
-      local delay=$((RESTART_DELAY * (1 << (restart_count - 1))))
-      if [[ $delay -gt $max_delay ]]; then
-        delay=$max_delay
-      fi
-
-      log_event "WARN" "$name" "Process exited with code ${exit_code}, restarting (${restart_count}/${MAX_RESTART_COUNT}) in ${delay}s..."
-      sleep "$delay"
-    done
-  ) &
-}
-
-# Cleanup function
-cleanup() {
-  # Prevent multiple cleanup calls
-  if [[ "$CLEANUP_DONE" == "true" ]]; then
-    return
-  fi
-  CLEANUP_DONE=true
-
-  log_event "INFO" "main" "Shutting down all processes..."
-
-  # Create stop flag to signal child processes
-  touch "$STOP_FLAG_FILE"
-
-  # Kill entire process trees (TERM first)
-  for pid in $SERVER_PID $CLIENT_PID; do
-    if is_valid_pid "$pid"; then
-      log_event "INFO" "main" "Stopping process tree (PID: ${pid})"
-      kill_tree "$pid" TERM
-    fi
-  done
-
-  # Kill any remaining background jobs
-  local bg_pids
-  bg_pids=$(jobs -p 2>/dev/null) || true
-  if [[ -n "$bg_pids" ]]; then
-    for pid in $bg_pids; do
-      kill_tree "$pid" TERM
-    done
-  fi
-
-  # Wait for processes to terminate
-  sleep 1
-
-  # Force kill if still running
-  for pid in $SERVER_PID $CLIENT_PID; do
-    if is_valid_pid "$pid"; then
-      log_event "WARN" "main" "Force killing process tree (PID: ${pid})"
-      kill_tree "$pid" KILL
-    fi
-  done
-
-  # Cleanup stop flag
-  rm -f "$STOP_FLAG_FILE"
-
-  log_event "INFO" "main" "All processes stopped"
-}
-
-# Set up signal handlers
-trap cleanup EXIT INT TERM HUP
-
-# Remove any stale stop flag
-rm -f "$STOP_FLAG_FILE"
-
-# Initialize dev.log
-echo "" >> "${DEV_LOG}"
-log_event "INFO" "main" "========== Dev session started =========="
-
-# Initialize action plugins before starting dev servers
-echo "🔌 Initializing action plugins..."
-if fullstack-cli action-plugin init; then
-  echo "✅ Action plugins initialized"
-else
-  echo "⚠️  Action plugin initialization failed, continuing anyway..."
-fi
-echo ""
-
-# Start server (cleanup orphan processes on SERVER_PORT)
-start_supervised_process "server" "npm run dev:server" "${SERVER_PORT:-3000}"
-SERVER_PID=$!
-log_event "INFO" "server" "Supervisor started with PID ${SERVER_PID}"
-
-# Start client (cleanup orphan processes on CLIENT_DEV_PORT)
-start_supervised_process "client" "npm run dev:client" "${CLIENT_DEV_PORT:-8080}"
-CLIENT_PID=$!
-log_event "INFO" "client" "Supervisor started with PID ${CLIENT_PID}"
-
-log_event "INFO" "main" "All processes started, monitoring..."
-echo ""
-echo "📋 Dev processes running. Press Ctrl+C to stop."
-echo "📄 Logs: ${DEV_STD_LOG}"
-echo ""
-
-# Wait for all background processes
-wait
+exec node "$(dirname "$0")/dev.js" "$@"

package/templates/scripts/prune-smart.js

@@ -6,11 +6,12 @@ const fs = require('fs');
 const path = require('path');
 
 const ROOT_DIR = path.resolve(__dirname, '..');
-const DIST_SERVER_DIR = path.join(ROOT_DIR, 'dist/server');
+const DIST_DIR = path.join(ROOT_DIR, 'dist');
+const DIST_SERVER_DIR = path.join(DIST_DIR, 'server');
 const ROOT_PACKAGE_JSON = path.join(ROOT_DIR, 'package.json');
 const ROOT_NODE_MODULES = path.join(ROOT_DIR, 'node_modules');
-const OUT_NODE_MODULES = path.join(ROOT_DIR, 'dist/node_modules');
-const OUT_PACKAGE_JSON = path.join(DIST_SERVER_DIR, 'package.json');
+const OUT_NODE_MODULES = path.join(DIST_DIR, 'node_modules');
+const OUT_PACKAGE_JSON = path.join(DIST_DIR, 'package.json');
 
 // Server 入口文件
 const SERVER_ENTRY = path.join(DIST_SERVER_DIR, 'main.js');
@@ -294,9 +295,6 @@ async function smartPrune() {
     version: originalPackage.version,
     private: true,
     dependencies: prunedDependencies,
-    scripts: {
-      start: originalPackage.scripts?.start || 'node main.js'
-    },
     engines: originalPackage.engines
   };
 

package/templates/scripts/run.sh

@@ -2,4 +2,7 @@
 # This file is auto-generated by @lark-apaas/fullstack-cli
 
 # 生产环境下，启动服务
-npm run start
+# 从 dist/ 根目录执行，确保 process.cwd() 与 dev 模式一致
+# dev: cwd = 项目根, shared/ client/ 可达
+# prod: cwd = dist/,  shared/ client/ 可达
+NODE_ENV=production node server/main.js