@lark-apaas/miaoda-cli 0.1.17-alpha.ddef3e9 → 0.1.17-beta.45b48d2

package/dist/cli/handlers/app/init.js

@@ -10,6 +10,7 @@ const index_1 = require("../../../services/app/init/index");
 const coding_steering_1 = require("../../../utils/coding-steering");
 const logger_1 = require("../../../utils/logger");
 const githooks_1 = require("../../../utils/githooks");
+const logs_dir_1 = require("../../../utils/logs-dir");
 const error_1 = require("../../../utils/error");
 const output_1 = require("../../../utils/output");
 /**
@@ -66,6 +67,9 @@ async function handleAppInit(opts) {
     const version = opts.conf?.version;
     const projectName = node_path_1.default.basename(targetDir);
     const tplResult = (0, index_1.renderTemplate)({ stack, version, targetDir, projectName });
+    // 先建 logs/,防止 user 跑 dev 之前 AI/工具 redirect 到 logs/*.log 因为父目录不存在直接挂
+    // (dev.js / dev-local.js 自己也建 logs/,但只在它启动后;启动前的 shell redirect 会先于此)
+    (0, logs_dir_1.ensureLogsDir)(targetDir);
     // skills 同步软失败：拉不到 coding-steering 包不该阻断 writeSparkMeta /
     // activateGitHooks（之前会让 .spark/meta.json 没写，下次 init 半渲染状态又得重跑全套）。
     // 按运行环境（SANDBOX_ID）分流 outputLayout，不绑 stack:

package/dist/cli/handlers/app/sync.js

@@ -16,6 +16,7 @@ const sync_configs_1 = require("../../../config/sync-configs");
 const sync_rule_1 = require("../../../utils/sync-rule");
 const platform_sync_1 = require("../../../utils/platform-sync");
 const githooks_1 = require("../../../utils/githooks");
+const logs_dir_1 = require("../../../utils/logs-dir");
 const install_1 = require("../../../services/app/init/install");
 const spark_meta_1 = require("../../../utils/spark-meta");
 const error_1 = require("../../../utils/error");
@@ -81,6 +82,10 @@ async function handleAppSync(opts) {
     }
     // 2. activate git hooks（template 自带 .githooks/pre-commit，core.hooksPath 一次性设置）
     const hookActivation = (0, githooks_1.activateGitHooks)(targetDir);
+    // logs/ 兜底:dev.js / dev-local.js 启动后才 mkdir,启动前任何想 redirect 到 logs/*.log 的
+    // shell 命令都会因父目录不存在直接 ENOENT 挂掉。sync 也建一次,长期使用的 user app 老仓库
+    // 第一次升级也能拿到这个目录。
+    (0, logs_dir_1.ensureLogsDir)(targetDir);
     // 3. snapshot 当前 user app 装的管控包版本，供 install 后 diff 用
     const beforeSpecs = snapshotManagedDepSpecs(targetDir);
     // 4. npm install —— 跟 init 一样软失败,install 挂了不该阻断 emit / sync 总结输出。

package/dist/utils/logs-dir.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureLogsDir = ensureLogsDir;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+/**
+ * 确保 user app 根下存在 `logs/` 目录（幂等）。
+ *
+ * 模板的 dev.js / dev-local.js 自己也会 mkdir LOG_DIR,但只在进程启动后才执行 —— AI / 用户
+ * 在 dev 启动前跑 `npm run dev > logs/dev.log 2>&1` 这种 shell redirect 时,shell 先 open
+ * 目标文件,父目录不存在直接 ENOENT,子进程根本不会启动。init / sync 落地阶段先把空目录建出来,
+ * 避免这种「目录不存在导致 redirect 失败」的低级问题。
+ */
+function ensureLogsDir(targetDir) {
+    node_fs_1.default.mkdirSync(node_path_1.default.join(targetDir, 'logs'), { recursive: true });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-cli",
-  "version": "0.1.17-alpha.ddef3e9",
+  "version": "0.1.17-beta.45b48d2",
   "description": "Miaoda 平台命令行工具，面向 Agent 调用",
   "type": "commonjs",
   "bin": {

package/upgrade/templates/design-stack/templates/.githooks/pre-commit

@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
 [ "$SKIP_GIT_HOOKS" = "1" ] && exit 0
+
 export PATH="node_modules/.bin:$PATH"
 npm run precommit

package/upgrade/templates/design-stack/templates/scripts/dev-local.js

@@ -8,7 +8,8 @@
 //   2. action-plugin init —— 装 user app 在 package.json.actionPlugins 里声明的插件
 //   3. skills sync —— 同步当前 stack 的 agent skills
 //   4. dotenv 加载 .env / .env.local 到 process.env（含 SUDA_WEBUSER 适配）
-//   5. 起单进程 dev server（design-stack 单进程，无 server/client 拆分）
+//   5. 起单进程 dev server（design-stack 单进程，无 server/client 拆分），
+//      stdout/stderr 整体 tee 到 logs/dev.std.log
 //
 // 设计同 nestjs-react-fullstack/dev-local.js,SDK 包不需要自己 require('dotenv'),
 // env 加载收敛在启动脚本单点。SUDA_WEBUSER 适配同 nrf 那份。
@@ -27,6 +28,10 @@ function warn(msg) {
 if (!process.env.MIAODA_APP_TYPE) process.env.MIAODA_APP_TYPE = '4';
 process.env.MIAODA_LOCAL_DEV = '1';
 
+// 先建 logs/,防止任何步骤(尤其是 spawn 子进程前的 shell redirect)因父目录不存在挂掉
+const LOG_DIR = process.env.LOG_DIR || 'logs';
+fs.mkdirSync(LOG_DIR, { recursive: true });
+
 console.log('[dev-local] (1/5) env pull...');
 const hasLarkCli = spawnSync('command', ['-v', 'lark-cli'], { shell: true, stdio: 'ignore' }).status === 0;
 if (hasLarkCli) {
@@ -84,10 +89,55 @@ if (process.env.SUDA_WEBUSER) {
   }
 }
 
+const devLogPath = path.join(LOG_DIR, 'dev.std.log');
 console.log('[dev-local] (5/5) npm run dev');
-const child = spawn('npm', ['run', 'dev'], { stdio: 'inherit', env: process.env });
-child.on('exit', (code) => process.exit(code ?? 0));
+console.log(`[dev-local] 日志: ${devLogPath}`);
+
+const logFd = fs.openSync(devLogPath, 'a');
+const child = spawn('npm', ['run', 'dev'], {
+  stdio: ['ignore', 'pipe', 'pipe'],
+  env: process.env,
+});
+
+const tee = (src) =>
+  src.on('data', (chunk) => {
+    try {
+      process.stdout.write(chunk);
+    } catch {
+      /* terminal gone */
+    }
+    try {
+      fs.writeSync(logFd, chunk);
+    } catch {
+      /* log fd closed */
+    }
+  });
+tee(child.stdout);
+tee(child.stderr);
+
+// 外部 SIGTERM/SIGHUP 转发给 npm,避免本进程死了 nest 变孤儿
+// (SIGINT 在 TTY 下 shell 直接发给整个前台进程组,不需要转发)
+const forward = (sig) => () => {
+  try {
+    child.kill(sig);
+  } catch {
+    /* already gone */
+  }
+};
+process.on('SIGTERM', forward('SIGTERM'));
+process.on('SIGHUP', forward('SIGHUP'));
+
+// 'close' 而非 'exit':等 child 的 stdio stream drain 完才触发,
+// 保证 tee 把最后一批 chunk 写进 logFd 再关闭,不丢尾。
+child.on('close', (code) => {
+  try {
+    fs.closeSync(logFd);
+  } catch {
+    /* already closed */
+  }
+  process.exit(code ?? 0);
+});
 child.on('error', (err) => {
-  console.error(err);
+  console.error('[dev-local] 启动失败:', err.message);
   process.exit(1);
 });

package/upgrade/templates/design-stack/templates/scripts/hooks/run-precommit.js

@@ -6,6 +6,10 @@ const { spawnSync } = require('node:child_process');
 
 const SEP = '  ' + '─'.repeat(36);
 
+// package-lock.json 锁内网镜像源 → 线上构建无法访问,改用公共镜像源。
+// 后续如有其它内网域名需要拦截,在这里加 pattern 即可。
+const INTERNAL_REGISTRY_PATTERNS = [/bnpm\.byted\.org/];
+
 function failAndExit(step, body) {
   process.stderr.write('\n✗ pre-commit failed: ' + step + '\n');
   process.stderr.write(SEP + '\n');
@@ -17,6 +21,37 @@ function failAndExit(step, body) {
   process.exit(1);
 }
 
+function checkLockfileRegistry() {
+  const res = spawnSync(
+    'git',
+    ['diff', '--cached', '--diff-filter=ACMR', '--', 'package-lock.json'],
+    { stdio: ['ignore', 'pipe', 'pipe'], env: process.env },
+  );
+  // git 不可用 / 不在 git 仓库 → 静默放行,交给 lint 步骤报错
+  if (res.error || res.status !== 0) return;
+  const diff = res.stdout ? res.stdout.toString() : '';
+  // 只看本次新增行(`+` 开头但排除 `+++` 文件头)
+  const hit = diff
+    .split('\n')
+    .some(
+      (line) =>
+        line.startsWith('+') &&
+        !line.startsWith('+++') &&
+        INTERNAL_REGISTRY_PATTERNS.some((p) => p.test(line)),
+    );
+  if (!hit) return;
+  failAndExit(
+    'package-lock.json 使用了内网镜像源',
+    [
+      '线上构建环境无法访问内网镜像源，将导致部署阶段 npm install 失败。',
+      '请使用公共镜像源重新生成 lockfile：',
+      '',
+      '  rm -rf node_modules package-lock.json',
+      '  npm install --registry=https://registry.npmmirror.com',
+    ].join('\n'),
+  );
+}
+
 function runLint() {
   const cwd = process.cwd();
   const res = spawnSync('npm', ['run', 'lint'], {
@@ -34,4 +69,5 @@ function runLint() {
   }
 }
 
+checkLockfileRegistry();
 runLint();

package/upgrade/templates/nestjs-react-fullstack/templates/.githooks/pre-commit

@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
 [ "$SKIP_GIT_HOOKS" = "1" ] && exit 0
+
 export PATH="node_modules/.bin:$PATH"
 npm run precommit

package/upgrade/templates/nestjs-react-fullstack/templates/.spark_project

@@ -1,5 +1,5 @@
 run = ["npm", "run", "dev"] # 默认 spark-cli dev
-hidden = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", "tmp", ".spark_project", ".playwright-cli"]
+hidden = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", ".claude", "tmp", ".spark_project", ".playwright-cli"]
 lint = ["npm", "run", "lint"]
 test = ["npm", "run", "test"]
 genDbSchema = ["npm", "run", "gen:db-schema"]
@@ -13,4 +13,4 @@ run = ["npm", "run", "start"]
 [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"]
+pathPatterns = [".config", ".git", "scripts", "node_modules", "dist", ".spark", ".agent", ".agents", ".claude", "tmp", ".spark_project", ".playwright-cli"]

package/upgrade/templates/nestjs-react-fullstack/templates/scripts/dev-local.js

@@ -8,7 +8,9 @@
 //   2. action-plugin init —— 装 user app 在 package.json.actionPlugins 里声明的插件
 //   3. skills sync —— 同步当前 stack 的 agent skills
 //   4. dotenv 加载 .env / .env.local 到 process.env（含 SUDA_WEBUSER 适配）
-//   5. 并发起 dev:server + dev:client（子进程继承 process.env）
+//   5. concurrently 并发起 dev:server + dev:client,整体 stdout/stderr tee 到
+//      logs/dev.std.log;server / client 输出靠 concurrently 自带 [server]/[client]
+//      前缀区分,`grep '\[server\]' logs/dev.std.log` 拿单边日志
 //
 // 关键设计：本脚本在 spawn 子进程之前先把 .env / .env.local 加载到 process.env，
 // 然后 spawn 的 server / client 进程通过 env 继承直接拿到——SDK（fullstack-nestjs-core
@@ -34,6 +36,10 @@ function warn(msg) {
 if (!process.env.MIAODA_APP_TYPE) process.env.MIAODA_APP_TYPE = '3';
 process.env.MIAODA_LOCAL_DEV = '1';
 
+// 先建 logs/,防止任何步骤(尤其是 spawn 子进程前的 shell redirect)因父目录不存在挂掉
+const LOG_DIR = process.env.LOG_DIR || 'logs';
+fs.mkdirSync(LOG_DIR, { recursive: true });
+
 // 1. env pull
 console.log('[dev-local] (1/5) env pull...');
 const hasLarkCli = spawnSync('command', ['-v', 'lark-cli'], { shell: true, stdio: 'ignore' }).status === 0;
@@ -98,8 +104,12 @@ if (process.env.SUDA_WEBUSER) {
   }
 }
 
-// 5. 并发起前后端 dev server
+// 5. 并发起前后端 dev server,整体 tee 到 logs/dev.std.log
+const devLogPath = path.join(LOG_DIR, 'dev.std.log');
 console.log('[dev-local] (5/5) 并发起 dev:server + dev:client');
+console.log(`[dev-local] 日志: ${devLogPath}`);
+
+const logFd = fs.openSync(devLogPath, 'a');
 const child = spawn(
   'npx',
   [
@@ -113,10 +123,49 @@ const child = spawn(
     'npm run dev:server',
     'npm run dev:client',
   ],
-  { stdio: 'inherit', env: process.env },
+  { stdio: ['ignore', 'pipe', 'pipe'], env: process.env },
 );
-child.on('exit', (code) => process.exit(code ?? 0));
+
+const tee = (src) =>
+  src.on('data', (chunk) => {
+    try {
+      process.stdout.write(chunk);
+    } catch {
+      /* terminal gone */
+    }
+    try {
+      fs.writeSync(logFd, chunk);
+    } catch {
+      /* log fd closed */
+    }
+  });
+tee(child.stdout);
+tee(child.stderr);
+
+// 外部 SIGTERM/SIGHUP 转发给 concurrently,避免本进程死了 server/client 变孤儿
+// (SIGINT 在 TTY 下 shell 直接发给整个前台进程组,不需要转发)
+const forward = (sig) => () => {
+  try {
+    child.kill(sig);
+  } catch {
+    /* already gone */
+  }
+};
+process.on('SIGTERM', forward('SIGTERM'));
+process.on('SIGHUP', forward('SIGHUP'));
+
+// 'close' 而非 'exit':等 child 的 stdio stream drain 完才触发,
+// 保证 tee 把最后一批 chunk 写进 logFd 再关闭,不丢尾。
+child.on('close', (code) => {
+  try {
+    fs.closeSync(logFd);
+  } catch {
+    /* already closed */
+  }
+  process.exit(code ?? 0);
+});
 child.on('error', (err) => {
-  console.error(err);
+  console.error('[dev-local] 启动失败:', err.message);
+  console.error('[dev-local] 如缺 concurrently,运行: npm install');
   process.exit(1);
 });

package/upgrade/templates/nestjs-react-fullstack/templates/scripts/hooks/run-precommit.js

@@ -6,6 +6,10 @@ const { spawnSync } = require('node:child_process');
 
 const SEP = '  ' + '─'.repeat(36);
 
+// package-lock.json 锁内网镜像源 → 线上构建无法访问,改用公共镜像源。
+// 后续如有其它内网域名需要拦截,在这里加 pattern 即可。
+const INTERNAL_REGISTRY_PATTERNS = [/bnpm\.byted\.org/];
+
 function failAndExit(step, body) {
   process.stderr.write('\n✗ pre-commit failed: ' + step + '\n');
   process.stderr.write(SEP + '\n');
@@ -17,6 +21,37 @@ function failAndExit(step, body) {
   process.exit(1);
 }
 
+function checkLockfileRegistry() {
+  const res = spawnSync(
+    'git',
+    ['diff', '--cached', '--diff-filter=ACMR', '--', 'package-lock.json'],
+    { stdio: ['ignore', 'pipe', 'pipe'], env: process.env },
+  );
+  // git 不可用 / 不在 git 仓库 → 静默放行,交给 lint 步骤报错
+  if (res.error || res.status !== 0) return;
+  const diff = res.stdout ? res.stdout.toString() : '';
+  // 只看本次新增行(`+` 开头但排除 `+++` 文件头)
+  const hit = diff
+    .split('\n')
+    .some(
+      (line) =>
+        line.startsWith('+') &&
+        !line.startsWith('+++') &&
+        INTERNAL_REGISTRY_PATTERNS.some((p) => p.test(line)),
+    );
+  if (!hit) return;
+  failAndExit(
+    'package-lock.json 使用了内网镜像源',
+    [
+      '线上构建环境无法访问内网镜像源，将导致部署阶段 npm install 失败。',
+      '请使用公共镜像源重新生成 lockfile：',
+      '',
+      '  rm -rf node_modules package-lock.json',
+      '  npm install --registry=https://registry.npmmirror.com',
+    ].join('\n'),
+  );
+}
+
 function runLint() {
   const cwd = process.cwd();
   const res = spawnSync('npm', ['run', 'lint'], {
@@ -34,4 +69,5 @@ function runLint() {
   }
 }
 
+checkLockfileRegistry();
 runLint();