@coze-arch/cli 0.0.36-alpha.dd2af3 → 0.0.36-alpha.fd6b86

package/lib/__templates__/nextjs/scripts/dev.sh

@@ -14,9 +14,6 @@ DEPLOY_RUN_PORT="${DEPLOY_RUN_PORT:-${PORT}}"
 
 cd "${COZE_WORKSPACE_PATH}"
 
-LOG_DIR="${COZE_LOG_DIR:-${COZE_WORKSPACE_PATH}/logs}"
-LOG_SERVER_FILE="${LOG_DIR}/server.log"
-
 kill_port_if_listening() {
     local pids
     pids=$(ss -H -lntp 2>/dev/null | awk -v port="${DEPLOY_RUN_PORT}" '$4 ~ ":"port"$"' | grep -o 'pid=[0-9]*' | cut -d= -f2 | paste -sd' ' - || true)
@@ -35,14 +32,89 @@ kill_port_if_listening() {
     fi
 }
 
+<% if (process.env.NODE_ENV === 'test') { %>
+echo "Clearing port ${DEPLOY_RUN_PORT} before start."
+kill_port_if_listening
+echo "Starting HTTP service on port ${DEPLOY_RUN_PORT} for dev..."
+
+# 测试环境保持服务为前台进程，便于 e2e 收集输出并停止进程。
+exec env PORT="${DEPLOY_RUN_PORT}" pnpm tsx watch src/server.ts
+<% } else { %>
+LOG_DIR="${COZE_LOG_DIR:-${COZE_WORKSPACE_PATH}/logs}"
+LOG_FILE="${LOG_DIR}/server.log"
+PID_FILE="${LOG_DIR}/server.pid"
+
+# coze-daemon 会在 runtime shell 退出时清理原进程组。
+# 通过 Node detached spawn 创建独立 session/进程组，并将 stdio 直接写入日志。
+spawn_detached() {
+  local cwd="$1"
+  local log_file="$2"
+  shift 2
+
+  node - "$cwd" "$log_file" "$@" <<'NODE'
+const fs = require('node:fs');
+const { spawn } = require('node:child_process');
+
+const [cwd, logFile, command, ...args] = process.argv.slice(2);
+if (!cwd || !logFile || !command) {
+  throw new Error('spawn_detached 缺少 cwd、log_file 或 command');
+}
+
+const logFd = fs.openSync(logFile, 'a');
+try {
+  const child = spawn(command, args, {
+    cwd,
+    detached: true,
+    env: process.env,
+    stdio: ['ignore', logFd, logFd],
+  });
+  child.unref();
+  process.stdout.write(String(child.pid));
+} finally {
+  fs.closeSync(logFd);
+}
+NODE
+}
+
+stop_detached() {
+  local pid="${1:-}"
+  if [[ -z "${pid}" ]]; then
+    return
+  fi
+
+  kill -TERM -- "-${pid}" 2>/dev/null || kill -TERM "${pid}" 2>/dev/null || true
+  sleep 1
+  kill -KILL -- "-${pid}" 2>/dev/null || true
+}
+
+# 监听端口的是孙进程（pnpm -> tsx -> node），只清端口会漏掉上层 pnpm/tsx，
+# 所以先按上次记录的 PID 把整个进程组回收掉。
+if [[ -f "${PID_FILE}" ]]; then
+  stop_detached "$(cat "${PID_FILE}" 2>/dev/null || true)"
+  rm -f "${PID_FILE}"
+fi
+
 echo "Clearing port ${DEPLOY_RUN_PORT} before start."
 kill_port_if_listening
 echo "Starting HTTP service on port ${DEPLOY_RUN_PORT} for dev..."
 
 mkdir -p "${LOG_DIR}"
-: > "${LOG_SERVER_FILE}"
+: > "${LOG_FILE}"
 
-# 保持服务为前台进程，让外层 coze-dev dev 的 PID 在整个服务生命周期内有效。
-# 同时通过 tee 将同一份输出写入 logs/server.log。
-exec env PORT="${DEPLOY_RUN_PORT}" pnpm tsx watch src/server.ts \
-  > >(tee -a "${LOG_SERVER_FILE}") 2>&1
+export PORT="${DEPLOY_RUN_PORT}"
+server_pid="$(spawn_detached "${COZE_WORKSPACE_PATH}" "${LOG_FILE}" \
+  "$(command -v pnpm)" tsx watch src/server.ts)"
+echo "${server_pid}" > "${PID_FILE}"
+
+sleep 1
+if [[ -z "${server_pid}" ]] || ! kill -0 "${server_pid}" 2>/dev/null; then
+  echo "Dev server failed to start. See ${LOG_FILE}." >&2
+  tail -n 20 "${LOG_FILE}" >&2 || true
+  rm -f "${PID_FILE}"
+  exit 1
+fi
+
+echo "Dev server started (PID: ${server_pid})."
+echo "Log file: ${LOG_FILE}"
+echo "PID file: ${PID_FILE}"
+<% } %>

package/lib/__templates__/nuxt-vue/scripts/dev.sh

@@ -32,8 +32,89 @@ kill_port_if_listening() {
     fi
 }
 
+<% if (process.env.NODE_ENV === 'test') { %>
+echo "Clearing port ${DEPLOY_RUN_PORT} before start."
+kill_port_if_listening
+echo "Starting Nuxt dev server on port ${DEPLOY_RUN_PORT}..."
+
+# 测试环境保持服务为前台进程，便于 e2e 收集输出并停止进程。
+exec env PORT="${DEPLOY_RUN_PORT}" pnpm nuxt dev
+<% } else { %>
+LOG_DIR="${COZE_LOG_DIR:-${COZE_WORKSPACE_PATH}/logs}"
+LOG_FILE="${LOG_DIR}/server.log"
+PID_FILE="${LOG_DIR}/server.pid"
+
+# coze-daemon 会在 runtime shell 退出时清理原进程组。
+# 通过 Node detached spawn 创建独立 session/进程组，并将 stdio 直接写入日志。
+spawn_detached() {
+  local cwd="$1"
+  local log_file="$2"
+  shift 2
+
+  node - "$cwd" "$log_file" "$@" <<'NODE'
+const fs = require('node:fs');
+const { spawn } = require('node:child_process');
+
+const [cwd, logFile, command, ...args] = process.argv.slice(2);
+if (!cwd || !logFile || !command) {
+  throw new Error('spawn_detached 缺少 cwd、log_file 或 command');
+}
+
+const logFd = fs.openSync(logFile, 'a');
+try {
+  const child = spawn(command, args, {
+    cwd,
+    detached: true,
+    env: process.env,
+    stdio: ['ignore', logFd, logFd],
+  });
+  child.unref();
+  process.stdout.write(String(child.pid));
+} finally {
+  fs.closeSync(logFd);
+}
+NODE
+}
+
+stop_detached() {
+  local pid="${1:-}"
+  if [[ -z "${pid}" ]]; then
+    return
+  fi
+
+  kill -TERM -- "-${pid}" 2>/dev/null || kill -TERM "${pid}" 2>/dev/null || true
+  sleep 1
+  kill -KILL -- "-${pid}" 2>/dev/null || true
+}
+
+# 监听端口的是孙进程（pnpm -> nuxt -> node），只清端口会漏掉上层 pnpm/nuxt，
+# 所以先按上次记录的 PID 把整个进程组回收掉。
+if [[ -f "${PID_FILE}" ]]; then
+  stop_detached "$(cat "${PID_FILE}" 2>/dev/null || true)"
+  rm -f "${PID_FILE}"
+fi
+
 echo "Clearing port ${DEPLOY_RUN_PORT} before start."
 kill_port_if_listening
 echo "Starting Nuxt dev server on port ${DEPLOY_RUN_PORT}..."
 
-PORT=${DEPLOY_RUN_PORT} pnpm nuxt dev
+mkdir -p "${LOG_DIR}"
+: > "${LOG_FILE}"
+
+export PORT="${DEPLOY_RUN_PORT}"
+server_pid="$(spawn_detached "${COZE_WORKSPACE_PATH}" "${LOG_FILE}" \
+  "$(command -v pnpm)" nuxt dev)"
+echo "${server_pid}" > "${PID_FILE}"
+
+sleep 1
+if [[ -z "${server_pid}" ]] || ! kill -0 "${server_pid}" 2>/dev/null; then
+  echo "Dev server failed to start. See ${LOG_FILE}." >&2
+  tail -n 20 "${LOG_FILE}" >&2 || true
+  rm -f "${PID_FILE}"
+  exit 1
+fi
+
+echo "Dev server started (PID: ${server_pid})."
+echo "Log file: ${LOG_FILE}"
+echo "PID file: ${PID_FILE}"
+<% } %>

package/lib/__templates__/taro/.cozeproj/scripts/dev_run.sh

@@ -28,6 +28,49 @@ kill_process_tree() {
     fi
 }
 
+# coze-daemon 会在 runtime shell 退出时清理原进程组。
+# 通过 Node detached spawn 创建独立 session/进程组，并将 stdio 直接写入日志。
+spawn_detached() {
+    local cwd="$1"
+    local log_file="$2"
+    shift 2
+
+    node - "$cwd" "$log_file" "$@" <<'NODE'
+const fs = require('node:fs');
+const { spawn } = require('node:child_process');
+
+const [cwd, logFile, command, ...args] = process.argv.slice(2);
+if (!cwd || !logFile || !command) {
+  throw new Error('spawn_detached 缺少 cwd、log_file 或 command');
+}
+
+const logFd = fs.openSync(logFile, 'a');
+try {
+  const child = spawn(command, args, {
+    cwd,
+    detached: true,
+    env: process.env,
+    stdio: ['ignore', logFd, logFd],
+  });
+  child.unref();
+  process.stdout.write(String(child.pid));
+} finally {
+  fs.closeSync(logFd);
+}
+NODE
+}
+
+stop_detached() {
+    local pid="${1:-}"
+    if [[ -z "${pid}" ]]; then
+        return
+    fi
+
+    kill -TERM -- "-${pid}" 2>/dev/null || kill -TERM "${pid}" 2>/dev/null || true
+    sleep 1
+    kill -KILL -- "-${pid}" 2>/dev/null || true
+}
+
 kill_port_if_listening() {
     local port=$1
     local pids
@@ -59,7 +102,7 @@ cleanup_previous_run() {
         old_pid=$(cat "${PID_FILE}" 2>/dev/null || true)
         if [[ -n "${old_pid}" ]] && kill -0 "${old_pid}" 2>/dev/null; then
             echo "🧹 Killing previous dev process tree (root PID: ${old_pid})..."
-            kill_process_tree "${old_pid}"
+            stop_detached "${old_pid}"
         fi
         rm -f "${PID_FILE}"
     fi
@@ -109,22 +152,7 @@ echo "Clearing port ${SERVER_PORT} (server) before start."
 kill_port_if_listening "${SERVER_PORT}"
 
 # ---------------------------------------------------------
-# 4. 退出时自动清理子进程（信号 trap）
-# ---------------------------------------------------------
-cleanup_on_exit() {
-    local exit_code=$?
-    trap - EXIT INT TERM HUP
-    if [[ -n "${DEV_PID}" ]] && kill -0 "${DEV_PID}" 2>/dev/null; then
-        echo "🛑 dev_run.sh exiting, cleaning up child processes..."
-        kill_process_tree "${DEV_PID}"
-    fi
-    rm -f "${PID_FILE}"
-    exit "${exit_code}"
-}
-trap cleanup_on_exit EXIT INT TERM HUP
-
-# ---------------------------------------------------------
-# 5. 启动服务
+# 4. 启动服务
 # ---------------------------------------------------------
 start_service() {
     cd "${COZE_WORKSPACE_PATH}"
@@ -144,13 +172,16 @@ start_service() {
     mkdir -p "${LOG_DIR}"
     : > "${LOG_FILE}"
 
-    # 后台启动以便记录真实 pnpm PID，但脚本持续 wait，保持外层 CLI 生命周期有效。
-    "${PNPM_BIN}" dev > >(tee -a "${LOG_FILE}") 2>&1 &
-    DEV_PID=$!
+    DEV_PID="$(spawn_detached \
+        "${COZE_WORKSPACE_PATH}" \
+        "${LOG_FILE}" \
+        "${PNPM_BIN}" dev)"
+    if [[ -z "${DEV_PID}" ]]; then
+        echo "❌ 无法获取 dev 后台进程 PID"
+        return 1
+    fi
     echo "${DEV_PID}" > "${PID_FILE}"
     echo "📝 Dev process started with PID: ${DEV_PID} (saved to ${PID_FILE})"
-
-    wait "${DEV_PID}"
 }
 
 echo "Starting HTTP services on port ${DEPLOY_RUN_PORT} (web) and ${SERVER_PORT} (server)..."

package/lib/__templates__/vite/scripts/dev.sh

@@ -32,8 +32,89 @@ kill_port_if_listening() {
     fi
 }
 
+<% if (process.env.NODE_ENV === 'test') { %>
+echo "Clearing port ${DEPLOY_RUN_PORT} before start."
+kill_port_if_listening
+echo "Starting express + Vite dev server on port ${DEPLOY_RUN_PORT}..."
+
+# 测试环境保持服务为前台进程，便于 e2e 收集输出并停止进程。
+exec env PORT="${DEPLOY_RUN_PORT}" pnpm tsx watch server/server.ts
+<% } else { %>
+LOG_DIR="${COZE_LOG_DIR:-${COZE_WORKSPACE_PATH}/logs}"
+LOG_FILE="${LOG_DIR}/server.log"
+PID_FILE="${LOG_DIR}/server.pid"
+
+# coze-daemon 会在 runtime shell 退出时清理原进程组。
+# 通过 Node detached spawn 创建独立 session/进程组，并将 stdio 直接写入日志。
+spawn_detached() {
+  local cwd="$1"
+  local log_file="$2"
+  shift 2
+
+  node - "$cwd" "$log_file" "$@" <<'NODE'
+const fs = require('node:fs');
+const { spawn } = require('node:child_process');
+
+const [cwd, logFile, command, ...args] = process.argv.slice(2);
+if (!cwd || !logFile || !command) {
+  throw new Error('spawn_detached 缺少 cwd、log_file 或 command');
+}
+
+const logFd = fs.openSync(logFile, 'a');
+try {
+  const child = spawn(command, args, {
+    cwd,
+    detached: true,
+    env: process.env,
+    stdio: ['ignore', logFd, logFd],
+  });
+  child.unref();
+  process.stdout.write(String(child.pid));
+} finally {
+  fs.closeSync(logFd);
+}
+NODE
+}
+
+stop_detached() {
+  local pid="${1:-}"
+  if [[ -z "${pid}" ]]; then
+    return
+  fi
+
+  kill -TERM -- "-${pid}" 2>/dev/null || kill -TERM "${pid}" 2>/dev/null || true
+  sleep 1
+  kill -KILL -- "-${pid}" 2>/dev/null || true
+}
+
+# 监听端口的是孙进程（pnpm -> tsx -> node），只清端口会漏掉上层 pnpm/tsx，
+# 所以先按上次记录的 PID 把整个进程组回收掉。
+if [[ -f "${PID_FILE}" ]]; then
+  stop_detached "$(cat "${PID_FILE}" 2>/dev/null || true)"
+  rm -f "${PID_FILE}"
+fi
+
 echo "Clearing port ${DEPLOY_RUN_PORT} before start."
 kill_port_if_listening
 echo "Starting express + Vite dev server on port ${DEPLOY_RUN_PORT}..."
 
-PORT=${DEPLOY_RUN_PORT} pnpm tsx watch server/server.ts
+mkdir -p "${LOG_DIR}"
+: > "${LOG_FILE}"
+
+export PORT="${DEPLOY_RUN_PORT}"
+server_pid="$(spawn_detached "${COZE_WORKSPACE_PATH}" "${LOG_FILE}" \
+  "$(command -v pnpm)" tsx watch server/server.ts)"
+echo "${server_pid}" > "${PID_FILE}"
+
+sleep 1
+if [[ -z "${server_pid}" ]] || ! kill -0 "${server_pid}" 2>/dev/null; then
+  echo "Dev server failed to start. See ${LOG_FILE}." >&2
+  tail -n 20 "${LOG_FILE}" >&2 || true
+  rm -f "${PID_FILE}"
+  exit 1
+fi
+
+echo "Dev server started (PID: ${server_pid})."
+echo "Log file: ${LOG_FILE}"
+echo "PID file: ${PID_FILE}"
+<% } %>

package/lib/cli.js

@@ -2114,7 +2114,7 @@ const EventBuilder = {
 };
 
 var name = "@coze-arch/cli";
-var version = "0.0.36-alpha.dd2af3";
+var version = "0.0.36-alpha.fd6b86";
 var description = "coze coding devtools cli";
 var license = "MIT";
 var author = "fanwenjie.fe@bytedance.com";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/cli",
-  "version": "0.0.36-alpha.dd2af3",
+  "version": "0.0.36-alpha.fd6b86",
   "private": false,
   "description": "coze coding devtools cli",
   "license": "MIT",