@coze-arch/cli 0.1.5 → 0.1.8-alpha.6e99f9

package/lib/__templates__/nextjs/scripts/build.ps1

@@ -8,7 +8,7 @@ Write-Host "Installing dependencies..."
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
 Write-Host "Building the Next.js project..."
-& pnpm next build
+& pnpm next build --webpack
 if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
 Write-Host "Bundling server with tsup..."

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

@@ -6,10 +6,10 @@ COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-$(pwd)}"
 cd "${COZE_WORKSPACE_PATH}"
 
 echo "Installing dependencies..."
-pnpm install --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
+bash "$COZE_WORKSPACE_PATH/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
 
 echo "Building the Next.js project..."
-pnpm next build
+pnpm next build --webpack
 
 echo "Bundling server with tsup..."
 pnpm tsup src/server.ts --format cjs --platform node --target node20 --outDir dist --no-splitting --no-minify

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

@@ -28,7 +28,7 @@ Stop-ListeningProcess $port
 
 <% if (process.env.NODE_ENV === 'test') { %>
 $env:PORT = "$port"
-& pnpm tsx watch src/server.ts
+& pnpm next dev --webpack --hostname 0.0.0.0 --port $port
 exit $LASTEXITCODE
 <% } else { %>
 $logDirectory = if ($env:COZE_LOG_DIR) { $env:COZE_LOG_DIR } else { Join-Path $workspace "logs" }
@@ -45,7 +45,7 @@ if (Test-Path $pidFile) {
 $previousPort = $env:PORT
 $env:PORT = "$port"
 try {
-  $process = Start-Process -FilePath $env:ComSpec -ArgumentList @("/d", "/s", "/c", "pnpm tsx watch src/server.ts") -WorkingDirectory $workspace -RedirectStandardOutput $logFile -RedirectStandardError $errorLogFile -PassThru
+  $process = Start-Process -FilePath $env:ComSpec -ArgumentList @("/d", "/s", "/c", "pnpm next dev --webpack --hostname 0.0.0.0 --port $port") -WorkingDirectory $workspace -RedirectStandardOutput $logFile -RedirectStandardError $errorLogFile -PassThru
 } finally {
   if ($null -eq $previousPort) { Remove-Item Env:PORT -ErrorAction SilentlyContinue } else { $env:PORT = $previousPort }
 }

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

@@ -52,24 +52,83 @@ kill_port_if_listening() {
     echo "Port ${DEPLOY_RUN_PORT} cleared."
 }
 
+# Next 的路由清单由 watchpack 每次启动重新扫 src 下的 app/pages 目录现算，而 watchpack
+# 不会进入软链目录，软链子树里的 page/route 会被静默跳过：既不注册路由，也不打任何日志，
+# 表现为该路由一直 404 而 .next 里没有它的产物。这里只做提示，不改动源码。
+warn_source_symlinks() {
+    local source_dir="${COZE_WORKSPACE_PATH}/src"
+    local links link
+    if [[ ! -e "${source_dir}" ]]; then
+      return
+    fi
+    links=$(find "${source_dir}" -type l 2>/dev/null || true)
+    if [[ -z "${links}" ]]; then
+      return
+    fi
+    echo "Warning: 以下路径是软链，Next 不会进入其中，里面的 page/route 不会被编译：" >&2
+    while IFS= read -r link; do
+      echo "  ${link}" >&2
+    done <<< "${links}"
+}
+
+# 云盘挂载偶尔会把新建文件的 mtime 设为 Unix epoch，这种时间戳会让所有按 mtime 判断新旧的
+# 环节（Next 的首轮路由扫描、webpack 的 timestamp 快照、tsbuildinfo）拿到错误的结论。
+# 只修 mtime 确实异常的那些条目：无条件刷新整棵 app/pages 会让 webpack 每次启动都重算全部
+# 路由文件的 hash，并让云盘把它们全部重传一遍。不跟随软链、不改文件内容。
+# 判定 mtime 是否异常的下界。真实的项目文件不可能早于这个时间，落在它之前的只有被云盘写坏的
+# 时间戳，所以用它把"需要修"和"本来就好"区分开。
+DRIVE_MTIME_FLOOR="1971-01-01"
+
+refresh_drive_route_mtimes() {
+    local drive_root="${COZE_DRIVE_ROOT:-/Coze/Drive}"
+    local project_root route_dir
+    project_root="$(pwd -P)"
+    if [[ -d "${drive_root}" ]]; then
+      drive_root="$(cd "${drive_root}" && pwd -P)"
+    else
+      drive_root="${drive_root%/}"
+    fi
+
+    case "${project_root}" in
+      "${drive_root}"|"${drive_root}"/*) ;;
+      *) return ;;
+    esac
+
+    for route_dir in "${COZE_WORKSPACE_PATH}/src/app" "${COZE_WORKSPACE_PATH}/src/pages"; do
+      [[ -d "${route_dir}" ]] || continue
+      if ! find -P "${route_dir}" \( -type f -o -type d \) ! -newermt "${DRIVE_MTIME_FLOOR}" -exec touch {} + 2>/dev/null; then
+        echo "Warning: failed to refresh Next route timestamps in ${route_dir}." >&2
+      fi
+    done
+}
+
 <% if (process.env.NODE_ENV === 'test') { %>
 echo "Clearing port ${DEPLOY_RUN_PORT} before start."
 kill_port_if_listening
+COZE_REUSE_NODE_MODULES=1 bash "${COZE_WORKSPACE_PATH}/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
+bash "${COZE_WORKSPACE_PATH}/scripts/prepare-next-dev-output.sh"
+warn_source_symlinks
+refresh_drive_route_mtimes
 echo "Starting HTTP service on port ${DEPLOY_RUN_PORT} for dev..."
 
 # 测试环境保持服务为前台进程，便于 e2e 收集输出并停止进程。
-exec env PORT="${DEPLOY_RUN_PORT}" pnpm tsx watch src/server.ts
+# 开发环境直接使用 Next 的 dev CLI，避免云盘文件事件在 custom server 链路中丢失。
+exec pnpm next dev --webpack --hostname 0.0.0.0 --port "${DEPLOY_RUN_PORT}"
 <% } else { %>
 LOG_DIR="${COZE_LOG_DIR:-${COZE_WORKSPACE_PATH}/logs}"
 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 -> tsx -> node）；被包的进程自己先退出时也顺手清空进程组，不留残余。
-RUN_WITH_TIMEOUT='
+# （wrapper -> pnpm -> next -> node）；被包的进程自己先退出时也顺手清空进程组，不留残余。
+RUN_WITH_TIMEOUT="$(declare -f timeout_watchdog_enabled)"'
 timeout_seconds=$1
 shift
 
@@ -77,6 +136,7 @@ shift
 child_pid=$!
 
 # 先忽略 TERM，才能在向整组发 TERM（自己也在组里）之后存活下来补一发 KILL。
+if timeout_watchdog_enabled; then
 ( trap "" TERM
   sleep "${timeout_seconds}"
   echo "[dev] 后台进程运行超过 ${timeout_seconds}s，回收进程组 $$。"
@@ -84,6 +144,7 @@ child_pid=$!
   sleep 5
   kill -KILL -- "-$$" 2>/dev/null || true
 ) &
+fi
 
 wait "${child_pid}"
 kill -KILL -- "-$$" 2>/dev/null || true
@@ -132,7 +193,7 @@ stop_detached() {
   kill -KILL -- "-${pid}" 2>/dev/null || true
 }
 
-READY_RETRIES=10
+READY_RETRIES=30
 READY_PROBE_HOSTS=("127.0.0.1" "::1")
 LOG_TAIL_LINES=40
 
@@ -142,6 +203,21 @@ dump_log() {
   echo "---- end of ${LOG_FILE} ----" >&2
 }
 
+# 服务刚就绪时 app-paths-manifest.json 还是空的（dev 按需编译，没请求就没产物），
+# 但 .next/dev/types/routes.d.ts 已经写出了本次启动发现到的全部路由。把它落进日志，
+# 排查时才能区分“路由没被发现”和“路由发现了但还没编译”。
+dump_discovered_routes() {
+  local route_types="${COZE_WORKSPACE_PATH}/.next/dev/types/routes.d.ts"
+  if [[ ! -f "${route_types}" ]]; then
+    return
+  fi
+  {
+    echo "---- discovered routes (${route_types}) ----"
+    grep -E '^type (AppRoutes|AppRouteHandlerRoutes|PageRoutes) ' "${route_types}" || true
+    echo "---- end of discovered routes ----"
+  } >> "${LOG_FILE}"
+}
+
 # 仅用于无 ss/lsof 时的兜底探测。服务可能只 bind IPv4 loopback、只 bind IPv6 loopback
 # （server.listen(port, 'localhost') 会变成 ::1 独占），或 bind 双栈通配地址，
 port_connectable() {
@@ -215,7 +291,7 @@ wait_for_ready() {
   return 2
 }
 
-# 监听端口的是孙进程（pnpm -> tsx -> node），只清端口会漏掉上层 pnpm/tsx，
+# 监听端口的是孙进程（pnpm -> next -> node），只清端口会漏掉上层 pnpm/next，
 # 所以先按上次记录的 PID 把整个进程组回收掉。
 if [[ -f "${PID_FILE}" ]]; then
   stop_detached "$(cat "${PID_FILE}" 2>/dev/null || true)"
@@ -224,6 +300,10 @@ fi
 
 echo "Clearing port ${DEPLOY_RUN_PORT} before start."
 kill_port_if_listening
+COZE_REUSE_NODE_MODULES=1 bash "${COZE_WORKSPACE_PATH}/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
+bash "${COZE_WORKSPACE_PATH}/scripts/prepare-next-dev-output.sh"
+warn_source_symlinks
+refresh_drive_route_mtimes
 echo "Starting HTTP service on port ${DEPLOY_RUN_PORT} for dev..."
 
 mkdir -p "${LOG_DIR}"
@@ -231,7 +311,7 @@ mkdir -p "${LOG_DIR}"
 
 export PORT="${DEPLOY_RUN_PORT}"
 server_pid="$(spawn_detached "${COZE_WORKSPACE_PATH}" "${LOG_FILE}" \
-  "$(command -v pnpm)" tsx watch src/server.ts)"
+  "$(command -v pnpm)" next dev --webpack --hostname 0.0.0.0 --port "${DEPLOY_RUN_PORT}")"
 if [[ -z "${server_pid}" ]]; then
   echo "Dev server failed to start: 未获取到后台进程 PID。" >&2
   dump_log
@@ -247,8 +327,7 @@ fi
 
 if [[ "${ready_status}" -ne 0 ]]; then
   if [[ "${ready_status}" -eq 2 ]]; then
-    # 进程还活着但迟迟没监听端口：多半是编译/运行时报错后 tsx watch 驻留，日志里有真正原因。
-    echo "Dev server 在 ${READY_RETRIES} 次探测（每次 1s）内未就绪于端口 ${DEPLOY_RUN_PORT}（进程 ${server_pid} 仍在运行，已回收）。" >&2
+    echo "Dev server did not listen on port ${DEPLOY_RUN_PORT} after ${READY_RETRIES} attempts; stopping PID ${server_pid}." >&2
   else
     echo "Dev server failed to start. See ${LOG_FILE}." >&2
   fi
@@ -259,8 +338,12 @@ if [[ "${ready_status}" -ne 0 ]]; then
   exit 1
 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__/nextjs/scripts/prepare-next-dev-output.sh

@@ -0,0 +1,122 @@
+#!/usr/bin/env bash
+# Keep Next development output off Coze Drive without moving production output.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+if [ "$(basename "$(dirname "$SCRIPT_DIR")")" = ".cozeproj" ]; then
+  PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd -P)"
+else
+  PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
+fi
+
+DRIVE_ROOT="${COZE_DRIVE_ROOT:-/Coze/Drive}"
+if [ -d "$DRIVE_ROOT" ]; then
+  DRIVE_ROOT="$(cd "$DRIVE_ROOT" && pwd -P)"
+else
+  DRIVE_ROOT="${DRIVE_ROOT%/}"
+fi
+case "$PROJECT_ROOT" in
+  "$DRIVE_ROOT"|"$DRIVE_ROOT"/*) ;;
+  *) exit 0 ;;
+esac
+
+# Next writes every on-demand development build into .next/dev. On Coze Drive each of
+# those writes goes through the sync daemon, so only that subtree moves to local disk.
+# Production output stays in the project directory, which keeps `next build` and
+# deployment unchanged.
+#
+# One local directory per project, shared with prepare-node-modules.sh: node_modules and
+# this cache sit side by side under WORK_DIR. The caches subdirectory is the slot that
+# script reserves for output that must survive an install, so nothing here is cleaned up
+# behind our back. PROJECT_ID has to stay identical to the one it computes.
+NM_ROOT="/tmp/nm"
+PROJECT_ID="$(basename "$PROJECT_ROOT")-$(printf '%s' "$PROJECT_ROOT" | cksum | awk '{print $1}')"
+WORK_DIR="$NM_ROOT/$PROJECT_ID"
+NEXT_ROOT="$PROJECT_ROOT/.next"
+NEXT_DEV="$NEXT_ROOT/dev"
+LEGACY_NEXT_ROOT="$WORK_DIR/.next"
+LOCAL_NEXT_DEV="$WORK_DIR/caches/next-dev"
+
+case "$LOCAL_NEXT_DEV" in
+  "$DRIVE_ROOT"|"$DRIVE_ROOT"/*)
+    echo "[next] local development output must not be on Coze Drive: $LOCAL_NEXT_DEV" >&2
+    exit 1
+    ;;
+esac
+
+# Coze Drive sync does not preserve symlinks: a synced copy of a link arrives as a
+# regular file holding the link target. Recognize the links this scheme creates so a
+# project that came back from sync repairs itself instead of failing to start.
+is_flattened_managed_link() {
+  local candidate="$1" content=""
+  [ -f "$candidate" ] || return 1
+  [ ! -L "$candidate" ] || return 1
+  [ "$(wc -c < "$candidate")" -le 4096 ] || return 1
+  content="$(tr -d '\r\n' < "$candidate")"
+  case "$content" in
+    "$NM_ROOT"/*) return 0 ;;
+  esac
+  return 1
+}
+
+# Earlier versions linked the whole .next directory. Bring any production build made
+# back then into the project; from here on only .next/dev is redirected.
+restore_legacy_next_root() {
+  local entry
+  rm -f "$NEXT_ROOT"
+  mkdir -p "$NEXT_ROOT"
+  if [ -d "$LEGACY_NEXT_ROOT" ]; then
+    while IFS= read -r -d '' entry; do
+      mv "$entry" "$NEXT_ROOT/"
+    done < <(find -P "$LEGACY_NEXT_ROOT" -mindepth 1 -maxdepth 1 -print0)
+    rmdir "$LEGACY_NEXT_ROOT" 2>/dev/null || true
+  fi
+}
+
+if [ -L "$NEXT_ROOT" ]; then
+  case "$(readlink "$NEXT_ROOT")" in
+    "$NM_ROOT"/*)
+      echo "[next] Restoring legacy .next output to the project directory."
+      restore_legacy_next_root
+      ;;
+    *)
+      echo "[next] refusing to replace unmanaged .next symlink: $NEXT_ROOT" >&2
+      exit 1
+      ;;
+  esac
+elif is_flattened_managed_link "$NEXT_ROOT"; then
+  echo "[next] Recovering .next flattened by Coze Drive sync."
+  restore_legacy_next_root
+elif [ -e "$NEXT_ROOT" ] && [ ! -d "$NEXT_ROOT" ]; then
+  echo "[next] refusing to replace non-directory Next output: $NEXT_ROOT" >&2
+  exit 1
+fi
+
+mkdir -p "$NEXT_ROOT" "$LOCAL_NEXT_DEV"
+
+if [ -L "$NEXT_DEV" ]; then
+  if [ "$(readlink "$NEXT_DEV")" = "$LOCAL_NEXT_DEV" ]; then
+    exit 0
+  fi
+  case "$(readlink "$NEXT_DEV")" in
+    "$NM_ROOT"/*) rm "$NEXT_DEV" ;;
+    *)
+      echo "[next] refusing to replace unmanaged .next/dev symlink: $NEXT_DEV" >&2
+      exit 1
+      ;;
+  esac
+elif [ -e "$NEXT_DEV" ]; then
+  # .next/dev holds development output only, and Next regenerates it on demand.
+  rm -rf "$NEXT_DEV"
+fi
+
+# A second dev start can win the race between the removal above and this link.
+if ! ln -s "$LOCAL_NEXT_DEV" "$NEXT_DEV" 2>/dev/null; then
+  if [ -L "$NEXT_DEV" ] && [ "$(readlink "$NEXT_DEV")" = "$LOCAL_NEXT_DEV" ]; then
+    exit 0
+  fi
+  echo "[next] failed to link development output: $NEXT_DEV" >&2
+  exit 1
+fi
+
+echo "[next] Development output linked to $LOCAL_NEXT_DEV"