@coze-arch/cli 0.1.4-alpha.8c3e03 → 0.1.4-alpha.99c367

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

@@ -199,7 +199,9 @@ start_expo() {
   local -a expo_env
   expo_env=(
     "EXPO_NO_DEPENDENCY_VALIDATION=1"
+    "EXPO_SDK_VERSION=54.0.0"
     "EXPO_PUBLIC_BACKEND_BASE_URL=$EXPO_PUBLIC_BACKEND_BASE_URL"
+    "EXPO_PUBLIC_API_BASE=$EXPO_PUBLIC_BACKEND_BASE_URL"
     "EXPO_PACKAGER_PROXY_URL=$EXPO_PACKAGER_PROXY_URL"
     "EXPO_PUBLIC_COZE_PROJECT_ID=$EXPO_PUBLIC_COZE_PROJECT_ID"
   )

package/lib/__templates__/expo/.cozeproj/scripts/prepare-node-modules.sh

@@ -40,84 +40,246 @@ case "$WORK_DIR" in
 esac
 
 LOCK_DIR="$NM_ROOT/$PROJECT_ID.lock"
+LOCK_TIMEOUT_SECONDS="${COZE_NODE_MODULES_LOCK_TIMEOUT_SECONDS:-120}"
+case "$LOCK_TIMEOUT_SECONDS" in
+  ''|*[!0-9]*|0)
+    echo "[node_modules] COZE_NODE_MODULES_LOCK_TIMEOUT_SECONDS must be a positive integer" >&2
+    exit 1
+    ;;
+esac
+
+lock_owner_is_alive() {
+  local owner_pid=""
+  [ -f "$LOCK_DIR/pid" ] || return 1
+  IFS= read -r owner_pid < "$LOCK_DIR/pid" || return 1
+  case "$owner_pid" in
+    ''|*[!0-9]*) return 1 ;;
+  esac
+  kill -0 "$owner_pid" 2>/dev/null
+}
+
+lock_acquired=false
+release_lock() {
+  local owner_pid=""
+  if [ "$lock_acquired" != true ] || [ ! -f "$LOCK_DIR/pid" ]; then
+    return 0
+  fi
+  IFS= read -r owner_pid < "$LOCK_DIR/pid" || true
+  if [ "$owner_pid" = "$$" ]; then
+    rm -f "$LOCK_DIR/pid"
+    rmdir "$LOCK_DIR" 2>/dev/null || true
+  fi
+}
+
+lock_started_at="$(date +%s)"
+missing_owner_checks=0
 while ! mkdir "$LOCK_DIR" 2>/dev/null; do
+  if lock_owner_is_alive; then
+    missing_owner_checks=0
+  else
+    missing_owner_checks=$((missing_owner_checks + 1))
+    if [ "$missing_owner_checks" -ge 2 ]; then
+      stale_lock_dir="$LOCK_DIR.stale.$$"
+      if mv "$LOCK_DIR" "$stale_lock_dir" 2>/dev/null; then
+        echo "[node_modules] Recovering stale dependency preparation lock."
+        rm -rf "$stale_lock_dir"
+      fi
+      missing_owner_checks=0
+      continue
+    fi
+  fi
+
+  lock_now="$(date +%s)"
+  if [ $((lock_now - lock_started_at)) -ge "$LOCK_TIMEOUT_SECONDS" ]; then
+    echo "[node_modules] Timed out waiting ${LOCK_TIMEOUT_SECONDS}s for dependency preparation lock: $LOCK_DIR" >&2
+    exit 1
+  fi
   echo "[node_modules] Waiting for another dependency preparation for this project..."
   sleep 1
 done
-trap 'rmdir "$LOCK_DIR" 2>/dev/null || true' EXIT
+printf '%s\n' "$$" > "$LOCK_DIR/pid"
+lock_acquired=true
+trap release_lock EXIT
 
 mkdir -p "$WORK_DIR"
+INSTALL_STATE_FILE="$WORK_DIR/.install-state"
+
+# Previous versions mirrored the whole project into WORK_DIR. That gives pnpm
+# and framework dev servers two paths for the same source tree, which breaks
+# file watching and on-demand compilation. Keep only managed local outputs.
+cleanup_legacy_workspace() {
+  local workspace_dir="$1" entry name
+  if [ -L "$workspace_dir" ] || { [ -e "$workspace_dir" ] && [ ! -d "$workspace_dir" ]; }; then
+    rm -rf "$workspace_dir"
+    return
+  fi
+  if [ ! -d "$workspace_dir" ]; then
+    return 0
+  fi
+
+  while IFS= read -r -d '' entry; do
+    name="$(basename "$entry")"
+    [ "$name" = "node_modules" ] || rm -rf "$entry"
+  done < <(find "$workspace_dir" -mindepth 1 -maxdepth 1 -print0)
+}
 
-# Mirror the project with symlinks. node_modules stays real in WORK_DIR;
-# workspace directories stay real too, so pnpm never writes them to Drive.
-mirror_root() {
+cleanup_legacy_shadow_project() {
   local entry name
   while IFS= read -r -d '' entry; do
     name="$(basename "$entry")"
     case "$name" in
-      node_modules|pnpm-lock.yaml) continue ;;
-      client|server)
-        [ -f "$PROJECT_ROOT/$name/package.json" ] && continue
-        ;;
+      node_modules|client|server|.install-state|.next) continue ;;
     esac
     rm -rf "$entry"
   done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
 
-  while IFS= read -r -d '' entry; do
-    name="$(basename "$entry")"
-    case "$name" in
-      node_modules|pnpm-lock.yaml) continue ;;
-      client|server)
-        [ -f "$entry/package.json" ] && continue
-        ;;
-    esac
-    ln -s "$entry" "$WORK_DIR/$name"
-  done < <(find "$PROJECT_ROOT" -mindepth 1 -maxdepth 1 -print0)
+  for workspace in client server; do
+    cleanup_legacy_workspace "$WORK_DIR/$workspace"
+  done
 }
 
-mirror_workspace() {
-  local workspace="$1" source_dir="$PROJECT_ROOT/$1" work_dir="$WORK_DIR/$1"
-  local entry name
-  if [ -L "$work_dir" ] || { [ -e "$work_dir" ] && [ ! -d "$work_dir" ]; }; then
-    rm -rf "$work_dir"
+link_install_entry() {
+  local source_path="$1" target_path="$2"
+  rm -rf "$target_path"
+  if [ -e "$source_path" ]; then
+    ln -s "$source_path" "$target_path"
   fi
-  mkdir -p "$work_dir"
+}
 
-  while IFS= read -r -d '' entry; do
-    [ "$(basename "$entry")" = "node_modules" ] || rm -rf "$entry"
-  done < <(find "$work_dir" -mindepth 1 -maxdepth 1 -print0)
+hash_install_input() {
+  if command -v sha256sum >/dev/null 2>&1; then
+    sha256sum | awk '{print $1}'
+  elif command -v shasum >/dev/null 2>&1; then
+    shasum -a 256 | awk '{print $1}'
+  else
+    cksum | awk '{print $1 "-" $2}'
+  fi
+}
 
-  while IFS= read -r -d '' entry; do
-    name="$(basename "$entry")"
-    [ "$name" = "node_modules" ] || ln -s "$entry" "$work_dir/$name"
-  done < <(find "$source_dir" -mindepth 1 -maxdepth 1 -print0)
+calculate_install_fingerprint() {
+  local filename workspace
+  {
+    printf 'prepare-node-modules-version=2\n'
+    printf 'pnpm-version=%s\n' "$(pnpm --version)"
+    for filename in package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
+      printf 'file=%s\n' "$filename"
+      if [ -f "$PROJECT_ROOT/$filename" ]; then
+        cat "$PROJECT_ROOT/$filename"
+      else
+        printf '<missing>\n'
+      fi
+    done
+    for workspace in client server; do
+      printf 'file=%s/package.json\n' "$workspace"
+      if [ -f "$PROJECT_ROOT/$workspace/package.json" ]; then
+        cat "$PROJECT_ROOT/$workspace/package.json"
+      else
+        printf '<missing>\n'
+      fi
+    done
+  } | hash_install_input
 }
 
-mirror_root
-for workspace in client server; do
-  if [ -f "$PROJECT_ROOT/$workspace/package.json" ]; then
-    mirror_workspace "$workspace"
+dependencies_are_ready() {
+  local workspace
+  [ -d "$WORK_DIR/node_modules" ] || return 1
+  for workspace in client server; do
+    if [ -f "$PROJECT_ROOT/$workspace/package.json" ] && [ ! -d "$WORK_DIR/$workspace/node_modules" ]; then
+      return 1
+    fi
+  done
+}
+
+write_install_state() {
+  local fingerprint="$1" temporary_state
+  temporary_state="$(mktemp "$WORK_DIR/.install-state.XXXXXX")"
+  printf '%s\n' "$fingerprint" > "$temporary_state"
+  mv -f "$temporary_state" "$INSTALL_STATE_FILE"
+}
+
+prepare_next_output() {
+  local next_root="$PROJECT_ROOT/.next"
+  local next_dev="$next_root/dev"
+  local target="$WORK_DIR/.next/dev"
+  local current=""
+  if [ ! -f "$PROJECT_ROOT/next.config.js" ] &&
+    [ ! -f "$PROJECT_ROOT/next.config.mjs" ] &&
+    [ ! -f "$PROJECT_ROOT/next.config.ts" ]; then
+    return 0
   fi
-done
 
-# pnpm refuses to update a symlinked lockfile, so install against a local copy.
-rm -rf "$WORK_DIR/pnpm-lock.yaml"
-if [ -f "$PROJECT_ROOT/pnpm-lock.yaml" ]; then
-  cp "$PROJECT_ROOT/pnpm-lock.yaml" "$WORK_DIR/pnpm-lock.yaml"
-fi
+  # Migrate links created by the previous implementation, which linked the
+  # entire .next directory. Keep the root local so production output stays in
+  # the project while only development output is redirected to local disk.
+  if [ -L "$next_root" ]; then
+    current="$(readlink "$next_root")"
+    case "$current" in
+      "$NM_ROOT"/*/.next)
+        rm "$next_root"
+        ;;
+      *)
+        echo "[node_modules] refusing to replace unmanaged .next symlink: $next_root" >&2
+        exit 1
+        ;;
+    esac
+  elif [ -e "$next_root" ] && [ ! -d "$next_root" ]; then
+    echo "[node_modules] refusing to replace non-directory Next output: $next_root" >&2
+    exit 1
+  fi
+  mkdir -p "$next_root"
 
-echo "[node_modules] Installing dependencies in $WORK_DIR"
-if ! (cd "$WORK_DIR" && pnpm install "$@"); then
-  rm -f "$WORK_DIR/pnpm-lock.yaml"
-  exit 1
-fi
+  if [ "${COZE_LOCAL_NEXT_OUTPUT:-}" != "1" ]; then
+    # .next/dev is separate from production output in Next 16. Leave its
+    # managed link in place so production preparation does not discard a dev
+    # cache or modify output used by a running dev server.
+    return 0
+  fi
 
-if [ -f "$WORK_DIR/pnpm-lock.yaml" ]; then
-  temporary_lockfile="$(mktemp "$PROJECT_ROOT/.pnpm-lock.yaml.XXXXXX")"
-  cp "$WORK_DIR/pnpm-lock.yaml" "$temporary_lockfile"
-  chmod 0644 "$temporary_lockfile"
-  mv -f "$temporary_lockfile" "$PROJECT_ROOT/pnpm-lock.yaml"
-fi
+  mkdir -p "$target"
+  if [ -L "$next_dev" ]; then
+    current="$(readlink "$next_dev")"
+    if [ "$current" = "$target" ]; then
+      return 0
+    fi
+    case "$current" in
+      "$NM_ROOT"/*/.next/dev) rm "$next_dev" ;;
+      *)
+        echo "[node_modules] refusing to replace unmanaged .next/dev symlink: $next_dev" >&2
+        exit 1
+        ;;
+    esac
+  elif [ -e "$next_dev" ]; then
+    rm -rf "$next_dev"
+  fi
+  # macOS 的 ln -sfn 不会直接替换实体目录，所以上面先清理，再覆盖链接。
+  ln -sfn "$target" "$next_dev"
+}
+
+copy_install_metadata() {
+  local filename source_file target_file workspace
+  for filename in pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
+    source_file="$PROJECT_ROOT/$filename"
+    target_file="$WORK_DIR/$filename"
+    rm -f "$target_file"
+    if [ -f "$source_file" ]; then
+      cp "$source_file" "$target_file"
+    fi
+  done
+
+  link_install_entry "$PROJECT_ROOT/package.json" "$WORK_DIR/package.json"
+  link_install_entry "$PROJECT_ROOT/patches" "$WORK_DIR/patches"
+  link_install_entry "$PROJECT_ROOT/scripts" "$WORK_DIR/scripts"
+
+  for workspace in client server; do
+    if [ -f "$PROJECT_ROOT/$workspace/package.json" ]; then
+      mkdir -p "$WORK_DIR/$workspace"
+      link_install_entry "$PROJECT_ROOT/$workspace/package.json" "$WORK_DIR/$workspace/package.json"
+      link_install_entry "$PROJECT_ROOT/$workspace/scripts" "$WORK_DIR/$workspace/scripts"
+    else
+      rm -rf "$WORK_DIR/$workspace"
+    fi
+  done
+}
 
 link_node_modules() {
   local source_dir="$1" target_dir="$2"
@@ -139,11 +301,39 @@ link_node_modules() {
   ln -s "$target_dir" "$source_dir/node_modules"
 }
 
+cleanup_legacy_shadow_project
+install_fingerprint="$(calculate_install_fingerprint)"
+copy_install_metadata
+
+installed_fingerprint=""
+if [ -f "$INSTALL_STATE_FILE" ]; then
+  IFS= read -r installed_fingerprint < "$INSTALL_STATE_FILE" || true
+fi
+
+if [ "$installed_fingerprint" = "$install_fingerprint" ] && dependencies_are_ready; then
+  echo "[node_modules] Reusing unchanged dependencies in $WORK_DIR"
+else
+  rm -f "$INSTALL_STATE_FILE"
+  echo "[node_modules] Installing dependencies in $WORK_DIR"
+  if ! (cd "$WORK_DIR" && pnpm install "$@"); then
+    exit 1
+  fi
+
+  if [ -f "$WORK_DIR/pnpm-lock.yaml" ]; then
+    temporary_lockfile="$(mktemp "$PROJECT_ROOT/.pnpm-lock.yaml.XXXXXX")"
+    cp "$WORK_DIR/pnpm-lock.yaml" "$temporary_lockfile"
+    chmod 0644 "$temporary_lockfile"
+    mv -f "$temporary_lockfile" "$PROJECT_ROOT/pnpm-lock.yaml"
+  fi
+  write_install_state "$(calculate_install_fingerprint)"
+fi
+
 link_node_modules "$PROJECT_ROOT" "$WORK_DIR/node_modules"
 for workspace in client server; do
   if [ -f "$PROJECT_ROOT/$workspace/package.json" ]; then
     link_node_modules "$PROJECT_ROOT/$workspace" "$WORK_DIR/$workspace/node_modules"
   fi
 done
+prepare_next_output
 
 echo "[node_modules] Dependencies ready"

package/lib/__templates__/nextjs/eslint.config.mjs

@@ -23,6 +23,11 @@ const eslintConfig = defineConfig([
   ...nextVitals,
   ...nextTs,
   {
+    settings: {
+      // node_modules 里的 barrel 包（lucide-react 等）不参与 ExportMap 构建，
+      // import/no-cycle 只需要项目源码的依赖图。
+      'import/ignore': ['/node_modules/'],
+    },
     rules: {
       'import/no-cycle': ['error', { ignoreExternal: true }],
       'react-hooks/set-state-in-effect': 'off',
@@ -37,14 +42,15 @@ const eslintConfig = defineConfig([
   },
   // Override default ignores of eslint-config-next.
   globalIgnores([
-    // Default ignores of eslint-config-next:
-    '.next/**',
-    'out/**',
-    'build/**',
+    // Default ignores of eslint-config-next (trailing slash prunes the whole
+    // directory instead of walking into it):
+    '.next/',
+    'out/',
+    'build/',
     'next-env.d.ts',
     // Build artifacts:
     'server.js',
-    'dist/**',
+    'dist/',
     // Script files (CommonJS):
     'scripts/**/*.js',
   ]),

package/lib/__templates__/nextjs/package.json

@@ -6,7 +6,7 @@
     "build": "bash ./scripts/build.sh",
     "dev": "bash ./scripts/dev.sh",
     "preinstall": "npx only-allow pnpm",
-    "lint": "eslint",
+    "lint": "eslint --cache --cache-location node_modules/.cache/eslint/",
     "lint:build": "eslint . --quiet",
     "lint:style": "stylelint \"src/**/*.css\"",
     "start": "bash ./scripts/start.sh",

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 tsx watch --ignore .next src/server.ts
 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 tsx watch --ignore .next src/server.ts") -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

@@ -14,6 +14,28 @@ DEPLOY_RUN_PORT="${DEPLOY_RUN_PORT:-${PORT}}"
 
 cd "${COZE_WORKSPACE_PATH}"
 
+configure_drive_watcher() {
+    local drive_root="${COZE_DRIVE_ROOT:-/Coze/Drive}"
+    local project_root
+    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}"/*)
+        if [[ -n "${COZE_WATCH_POLL_INTERVAL_MS:-}" && -z "${WATCHPACK_POLLING+x}" ]]; then
+          export WATCHPACK_POLLING="${COZE_WATCH_POLL_INTERVAL_MS}"
+          echo "Using Watchpack polling every ${WATCHPACK_POLLING}ms."
+        fi
+        ;;
+    esac
+}
+
+configure_drive_watcher
+
 list_port_pids() {
     local port=$1
     local pids=""
@@ -55,10 +77,11 @@ kill_port_if_listening() {
 <% if (process.env.NODE_ENV === 'test') { %>
 echo "Clearing port ${DEPLOY_RUN_PORT} before start."
 kill_port_if_listening
+COZE_LOCAL_NEXT_OUTPUT=1 bash "${COZE_WORKSPACE_PATH}/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
 echo "Starting HTTP service on port ${DEPLOY_RUN_PORT} for dev..."
 
 # 测试环境保持服务为前台进程，便于 e2e 收集输出并停止进程。
-exec env PORT="${DEPLOY_RUN_PORT}" pnpm tsx watch src/server.ts
+exec env PORT="${DEPLOY_RUN_PORT}" pnpm tsx src/server.ts
 <% } else { %>
 LOG_DIR="${COZE_LOG_DIR:-${COZE_WORKSPACE_PATH}/logs}"
 LOG_FILE="${LOG_DIR}/app.log"
@@ -226,6 +249,7 @@ fi
 
 echo "Clearing port ${DEPLOY_RUN_PORT} before start."
 kill_port_if_listening
+COZE_LOCAL_NEXT_OUTPUT=1 bash "${COZE_WORKSPACE_PATH}/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
 echo "Starting HTTP service on port ${DEPLOY_RUN_PORT} for dev..."
 
 mkdir -p "${LOG_DIR}"
@@ -233,7 +257,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)" tsx src/server.ts)"
 if [[ -z "${server_pid}" ]]; then
   echo "Dev server failed to start: 未获取到后台进程 PID。" >&2
   dump_log