@coze-arch/cli 0.1.4-alpha.d384e3 → 0.1.4-alpha.e5481b

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

@@ -123,11 +123,15 @@ wait_port_connectable() {
 }
 
 # detached 出去的进程没人负责回收，超过这个时长就自己退出，避免端口与内存长期泄露。
-MAX_RUNTIME_SECONDS=1200
+MAX_RUNTIME_SECONDS=3600
+
+timeout_watchdog_enabled() {
+  [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]
+}
 
 # 真正被 detach 的是这层 bash wrapper：它是进程组 leader，组内 watchdog 到点回收整组
 # （wrapper -> pnpm -> expo/node）；被包的进程自己先退出时也顺手清空进程组，不留残余。
-RUN_WITH_TIMEOUT='
+RUN_WITH_TIMEOUT="$(declare -f timeout_watchdog_enabled)"'
 timeout_seconds=$1
 shift
 
@@ -135,7 +139,7 @@ shift
 child_pid=$!
 
 # 先忽略 TERM，才能在向整组发 TERM（自己也在组里）之后存活下来补一发 KILL。
-if [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]; then
+if timeout_watchdog_enabled; then
 ( trap "" TERM
   sleep "${timeout_seconds}"
   echo "[dev] 后台进程运行超过 ${timeout_seconds}s，回收进程组 $$。"
@@ -292,7 +296,9 @@ if [ -z "${EXPO_PID}" ]; then
 fi
 
 echo "所有服务已启动。Server PID: ${SERVER_PID}, Expo PID: ${EXPO_PID}"
-echo "两个服务均在 ${MAX_RUNTIME_SECONDS}s 后自动退出。"
+if timeout_watchdog_enabled; then
+  echo "两个服务均在 ${MAX_RUNTIME_SECONDS}s 后自动退出。"
+fi
 
 echo "检查 Server 服务端口：$SERVER_HOST:$SERVER_PORT"
 if wait_port_connectable "$SERVER_HOST" "$SERVER_PORT" 10 2; then

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

@@ -114,11 +114,15 @@ LOG_FILE="${LOG_DIR}/app.log"
 PID_FILE="${LOG_DIR}/server.pid"
 
 # detached 出去的进程没人负责回收，超过这个时长就自己退出，避免端口与内存长期泄露。
-MAX_RUNTIME_SECONDS=1200
+MAX_RUNTIME_SECONDS=3600
+
+timeout_watchdog_enabled() {
+  [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]
+}
 
 # 真正被 detach 的是这层 bash wrapper：它是进程组 leader，组内 watchdog 到点回收整组
 # （wrapper -> pnpm -> next -> node）；被包的进程自己先退出时也顺手清空进程组，不留残余。
-RUN_WITH_TIMEOUT='
+RUN_WITH_TIMEOUT="$(declare -f timeout_watchdog_enabled)"'
 timeout_seconds=$1
 shift
 
@@ -126,7 +130,7 @@ shift
 child_pid=$!
 
 # 先忽略 TERM，才能在向整组发 TERM（自己也在组里）之后存活下来补一发 KILL。
-if [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]; then
+if timeout_watchdog_enabled; then
 ( trap "" TERM
   sleep "${timeout_seconds}"
   echo "[dev] 后台进程运行超过 ${timeout_seconds}s，回收进程组 $$。"
@@ -330,7 +334,9 @@ fi
 dump_discovered_routes
 
 echo "Dev server started (PID: ${server_pid}), listening on port ${DEPLOY_RUN_PORT}."
-echo "Auto stop after ${MAX_RUNTIME_SECONDS}s."
+if timeout_watchdog_enabled; then
+  echo "Auto stop after ${MAX_RUNTIME_SECONDS}s."
+fi
 echo "Log file: ${LOG_FILE}"
 echo "PID file: ${PID_FILE}"
 <% } %>

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

@@ -65,11 +65,15 @@ LOG_FILE="${LOG_DIR}/server.log"
 PID_FILE="${LOG_DIR}/server.pid"
 
 # detached 出去的进程没人负责回收，超过这个时长就自己退出，避免端口与内存长期泄露。
-MAX_RUNTIME_SECONDS=1200
+MAX_RUNTIME_SECONDS=3600
+
+timeout_watchdog_enabled() {
+  [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]
+}
 
 # 真正被 detach 的是这层 bash wrapper：它是进程组 leader，组内 watchdog 到点回收整组
 # （wrapper -> pnpm -> nuxt -> node）；被包的进程自己先退出时也顺手清空进程组，不留残余。
-RUN_WITH_TIMEOUT='
+RUN_WITH_TIMEOUT="$(declare -f timeout_watchdog_enabled)"'
 timeout_seconds=$1
 shift
 
@@ -77,7 +81,7 @@ shift
 child_pid=$!
 
 # 先忽略 TERM，才能在向整组发 TERM（自己也在组里）之后存活下来补一发 KILL。
-if [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]; then
+if timeout_watchdog_enabled; then
 ( trap "" TERM
   sleep "${timeout_seconds}"
   echo "[dev] 后台进程运行超过 ${timeout_seconds}s，回收进程组 $$。"
@@ -264,7 +268,9 @@ if [[ "${ready_status}" -ne 0 ]]; then
 fi
 
 echo "Dev server started (PID: ${server_pid}), listening on port ${DEPLOY_RUN_PORT}."
-echo "Auto stop after ${MAX_RUNTIME_SECONDS}s."
+if timeout_watchdog_enabled; then
+  echo "Auto stop after ${MAX_RUNTIME_SECONDS}s."
+fi
 echo "Log file: ${LOG_FILE}"
 echo "PID file: ${PID_FILE}"
 <% } %>

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

@@ -2,7 +2,10 @@
 set -Eeuo pipefail
 
 ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
-cd "$ROOT_DIR"
+COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-${ROOT_DIR}}"
+export COZE_WORKSPACE_PATH
+
+cd "${COZE_WORKSPACE_PATH}"
 if [ -f "./.cozeproj/scripts/init_env.sh" ]; then
     echo "⚙️ Initializing environment..."
     # 使用 bash 执行，确保即使没有 x 权限也能跑

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

@@ -1,6 +1,10 @@
 #!/bin/bash
 set -Eeuo pipefail
 
+ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
+COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-${ROOT_DIR}}"
+export COZE_WORKSPACE_PATH
+
 start_service() {
     cd "${COZE_WORKSPACE_PATH}/server/dist"
 

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

@@ -28,7 +28,9 @@ function Start-DevProcess([string] $workingDirectory, [string] $logFile, [hashta
   }
 }
 
-$workspace = if ($env:COZE_WORKSPACE_PATH) { $env:COZE_WORKSPACE_PATH } else { (Get-Location).Path }
+$projectRoot = (Resolve-Path (Join-Path $PSScriptRoot "../..")).Path
+$workspace = if ($env:COZE_WORKSPACE_PATH) { $env:COZE_WORKSPACE_PATH } else { $projectRoot }
+$env:COZE_WORKSPACE_PATH = $workspace
 $port = if ($env:DEPLOY_RUN_PORT) { [int] $env:DEPLOY_RUN_PORT } elseif ($env:PORT) { [int] $env:PORT } else { <%= port %> }
 $serverPort = if ($env:SERVER_PORT) { [int] $env:SERVER_PORT } else { <%= serverPort %> }
 $logDirectory = if ($env:COZE_LOG_DIR) { $env:COZE_LOG_DIR } else { Join-Path $workspace "logs" }
@@ -43,7 +45,7 @@ if (Test-Path $pidFile) {
 Stop-ListeningProcess $port
 Stop-ListeningProcess $serverPort
 
-$environment = @{ PORT = "$port"; SERVER_PORT = "$serverPort" }
+$environment = @{ COZE_WORKSPACE_PATH = $workspace; PORT = "$port"; SERVER_PORT = "$serverPort" }
 if ($env:COZE_PROJECT_DOMAIN_DEFAULT) {
   $environment.PROJECT_DOMAIN = $env:COZE_PROJECT_DOMAIN_DEFAULT
 }

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

@@ -4,6 +4,7 @@ set -Eeuo pipefail
 
 ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
 COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-${ROOT_DIR}}"
+export COZE_WORKSPACE_PATH
 cd "${COZE_WORKSPACE_PATH}"
 
 # ---------------------------------------------------------
@@ -31,11 +32,15 @@ kill_process_tree() {
 }
 
 # detached 出去的进程没人负责回收，超过这个时长就自己退出，避免端口与内存长期泄露。
-MAX_RUNTIME_SECONDS=1200
+MAX_RUNTIME_SECONDS=3600
+
+timeout_watchdog_enabled() {
+    [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]
+}
 
 # 真正被 detach 的是这层 bash wrapper：它是进程组 leader，组内 watchdog 到点回收整组
 # （wrapper -> pnpm -> taro/nest）；被包的进程自己先退出时也顺手清空进程组，不留残余。
-RUN_WITH_TIMEOUT='
+RUN_WITH_TIMEOUT="$(declare -f timeout_watchdog_enabled)"'
 timeout_seconds=$1
 shift
 
@@ -43,7 +48,7 @@ shift
 child_pid=$!
 
 # 先忽略 TERM，才能在向整组发 TERM（自己也在组里）之后存活下来补一发 KILL。
-if [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]; then
+if timeout_watchdog_enabled; then
 ( trap "" TERM
   sleep "${timeout_seconds}"
   echo "[dev] 后台进程运行超过 ${timeout_seconds}s，回收进程组 $$。"
@@ -157,12 +162,24 @@ list_port_pids() {
 
 kill_port_if_listening() {
     local port=$1
+    # 用于错误提示的端口环境变量名称，例如 DEPLOY_RUN_PORT 或 SERVER_PORT。
+    local port_env_name=$2
     local pids
+    local pid
     pids=$(list_port_pids "${port}")
     if [[ -z "${pids}" ]]; then
         echo "Port ${port} is free."
         return
     fi
+
+    # 端口可能由另一个项目占用。必须在杀进程前校验全部 PID，避免清理到一半才发现外部进程。
+    for pid in ${pids}; do
+        if ! process_belongs_to_workspace "${pid}"; then
+            echo "Error: port ${port} is occupied by PID ${pid}, which does not belong to workspace ${COZE_WORKSPACE_PATH}. Refusing to kill it. Set ${port_env_name} to another port and retry." >&2
+            return 1
+        fi
+    done
+
     echo "Port ${port} in use by PIDs: ${pids} (SIGKILL)"
     for pid in ${pids}; do
         kill_process_tree "${pid}"
@@ -170,7 +187,8 @@ kill_port_if_listening() {
     sleep 1
     pids=$(list_port_pids "${port}")
     if [[ -n "${pids}" ]]; then
-        echo "Warning: port ${port} still busy after SIGKILL, PIDs: ${pids}"
+        echo "Error: port ${port} is still occupied after cleaning up this project's processes, PIDs: ${pids}. Check the remaining processes manually or set ${port_env_name} to another port and retry." >&2
+        return 1
     else
         echo "Port ${port} cleared."
     fi
@@ -212,9 +230,9 @@ mkdir -p "${LOG_DIR}"
 cleanup_previous_run
 
 echo "Clearing port ${PORT} (web) before start."
-kill_port_if_listening "${PORT}"
+kill_port_if_listening "${PORT}" "DEPLOY_RUN_PORT"
 echo "Clearing port ${SERVER_PORT} (server) before start."
-kill_port_if_listening "${SERVER_PORT}"
+kill_port_if_listening "${SERVER_PORT}" "SERVER_PORT"
 
 # ---------------------------------------------------------
 # 4. 启动服务
@@ -254,7 +272,9 @@ start_service() {
     fi
 
     echo "📝 Dev process started with PID: ${DEV_PID}"
-    echo "Auto stop after ${MAX_RUNTIME_SECONDS}s."
+    if timeout_watchdog_enabled; then
+        echo "Auto stop after ${MAX_RUNTIME_SECONDS}s."
+    fi
     echo "Log file: ${LOG_FILE}"
     echo "PID file: ${PID_FILE}"
 }

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

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
+COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-${ROOT_DIR}}"
+export COZE_WORKSPACE_PATH
+
 cd "${COZE_WORKSPACE_PATH}"
 
 echo "✅ 初始化完成"

package/lib/__templates__/taro/.cozeproj/scripts/pack.ps1

@@ -1,6 +1,8 @@
 $ErrorActionPreference = "Stop"
 
-$workspace = if ($env:COZE_WORKSPACE_PATH) { $env:COZE_WORKSPACE_PATH } else { (Get-Location).Path }
+$projectRoot = (Resolve-Path (Join-Path $PSScriptRoot "../..")).Path
+$workspace = if ($env:COZE_WORKSPACE_PATH) { $env:COZE_WORKSPACE_PATH } else { $projectRoot }
+$env:COZE_WORKSPACE_PATH = $workspace
 Set-Location $workspace
 
 & pnpm build:pack

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

@@ -1,3 +1,11 @@
+#!/bin/bash
+
+ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
+COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-${ROOT_DIR}}"
+export COZE_WORKSPACE_PATH
+
+cd "${COZE_WORKSPACE_PATH}"
+
 # build_weapp.sh - 通过 PID 文件精确杀掉自己上次的构建进程
 PID_FILE="/tmp/coze-build_weapp.pid"
 

package/lib/__templates__/taro/.cozeproj/scripts/validate.ps1

@@ -1,6 +1,8 @@
 $ErrorActionPreference = "Stop"
 
-$workspace = if ($env:COZE_WORKSPACE_PATH) { $env:COZE_WORKSPACE_PATH } else { (Get-Location).Path }
+$projectRoot = (Resolve-Path (Join-Path $PSScriptRoot "../..")).Path
+$workspace = if ($env:COZE_WORKSPACE_PATH) { $env:COZE_WORKSPACE_PATH } else { $projectRoot }
+$env:COZE_WORKSPACE_PATH = $workspace
 Set-Location $workspace
 
 & pnpm validate

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

@@ -1,6 +1,10 @@
 #!/bin/bash
 set -Eeuo pipefail
 
+ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
+COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-${ROOT_DIR}}"
+export COZE_WORKSPACE_PATH
+
 cd "${COZE_WORKSPACE_PATH}"
 
 echo "🔍 Running validate..."

package/lib/__templates__/taro/_gitignore

@@ -17,6 +17,7 @@ dist-*/
 .env.production.local
 
 # Logs
+/logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

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

@@ -45,11 +45,15 @@ LOG_FILE="${LOG_DIR}/server.log"
 PID_FILE="${LOG_DIR}/server.pid"
 
 # detached 出去的进程没人负责回收，超过这个时长就自己退出，避免端口与内存长期泄露。
-MAX_RUNTIME_SECONDS=1200
+MAX_RUNTIME_SECONDS=3600
+
+timeout_watchdog_enabled() {
+  [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]
+}
 
 # 真正被 detach 的是这层 bash wrapper：它是进程组 leader，组内 watchdog 到点回收整组
 # （wrapper -> pnpm -> tsx -> node）；被包的进程自己先退出时也顺手清空进程组，不留残余。
-RUN_WITH_TIMEOUT='
+RUN_WITH_TIMEOUT="$(declare -f timeout_watchdog_enabled)"'
 timeout_seconds=$1
 shift
 
@@ -57,7 +61,7 @@ shift
 child_pid=$!
 
 # 先忽略 TERM，才能在向整组发 TERM（自己也在组里）之后存活下来补一发 KILL。
-if [[ -z "${COZE_EVAL:-}" && -z "${COZE_PROJECT_TYPE:-}" ]]; then
+if timeout_watchdog_enabled; then
 ( trap "" TERM
   sleep "${timeout_seconds}"
   echo "[dev] 后台进程运行超过 ${timeout_seconds}s，回收进程组 $$。"
@@ -144,7 +148,9 @@ if [[ -z "${server_pid}" ]] || ! kill -0 "${server_pid}" 2>/dev/null; then
 fi
 
 echo "Dev server started (PID: ${server_pid})."
-echo "Auto stop after ${MAX_RUNTIME_SECONDS}s."
+if timeout_watchdog_enabled; then
+  echo "Auto stop after ${MAX_RUNTIME_SECONDS}s."
+fi
 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.1.4-alpha.d384e3";
+var version = "0.1.4-alpha.e5481b";
 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.1.4-alpha.d384e3",
+  "version": "0.1.4-alpha.e5481b",
   "private": false,
   "description": "coze coding devtools cli",
   "license": "MIT",