@coze-arch/cli 0.1.8-alpha.a5ed27 → 0.1.8-alpha.e237ba

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

@@ -119,15 +119,8 @@ process_belongs_to_workspace() {
 
     case "${cwd}" in
         "${COZE_WORKSPACE_PATH}"|"${COZE_WORKSPACE_PATH}"/*) return 0 ;;
+        *) return 1 ;;
     esac
-
-    if [[ -n "${COZE_LOCAL_WORKSPACE_PATH:-}" ]]; then
-        case "${cwd}" in
-            "${COZE_LOCAL_WORKSPACE_PATH}"|"${COZE_LOCAL_WORKSPACE_PATH}"/*) return 0 ;;
-        esac
-    fi
-
-    return 1
 }
 
 process_group_belongs_to_workspace() {
@@ -224,51 +217,6 @@ PNPM_BIN="$(command -v pnpm)"
 bash "$ROOT_DIR/.cozeproj/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline
 echo "✅ Dependencies installed successfully!"
 
-is_under_root() {
-    local path="$1"
-    local root="$2"
-    [ -n "$root" ] || return 1
-    case "$path" in
-        "$root"|"$root"/*) return 0 ;;
-        *) return 1 ;;
-    esac
-}
-
-is_coze_drive_workspace() {
-    local path="$1"
-    local root
-    local candidates=()
-
-    if [ -n "${COZE_DRIVE_ROOT:-}" ]; then
-        candidates+=("$COZE_DRIVE_ROOT")
-    fi
-    candidates+=("/Coze/Drive")
-
-    for root in "${candidates[@]}"; do
-        if [ -d "$root" ]; then
-            root="$(cd "$root" && pwd -P)"
-        else
-            root="${root%/}"
-        fi
-        if is_under_root "$path" "$root"; then
-            return 0
-        fi
-    done
-
-    return 1
-}
-
-if is_coze_drive_workspace "${COZE_WORKSPACE_PATH}"; then
-    COZE_LOCAL_BUILD_ROOT="${COZE_LOCAL_BUILD_ROOT:-/tmp/coze-taro-build}"
-    COZE_LOCAL_WORKSPACE_PATH="${COZE_LOCAL_BUILD_ROOT}/$(basename "$COZE_WORKSPACE_PATH")-$(printf '%s' "$COZE_WORKSPACE_PATH" | cksum | awk '{print $1}')/workspace"
-    export COZE_LOCAL_BUILD_ROOT
-    export COZE_LOCAL_WORKSPACE_PATH
-    DEV_COMMAND=(env COZE_SKIP_PREPARE_NODE_MODULES=1 COZE_SYNC_SOURCE_TO_LOCAL=1 bash "$ROOT_DIR/.cozeproj/scripts/build-on-local-disk.sh" "${PNPM_BIN}" dev)
-    echo "📁 Taro dev will run from a local disk workspace."
-else
-    DEV_COMMAND=("${PNPM_BIN}" dev)
-fi
-
 # ---------------------------------------------------------
 # 3. 清理旧进程 + 端口
 # ---------------------------------------------------------
@@ -300,6 +248,7 @@ start_service() {
         echo "⚠️  警告: COZE_PROJECT_DOMAIN_DEFAULT 未设置，使用 .env.local 中的配置"
     fi
 
+    # 启动 Taro H5 和 NestJS Server
     echo "Starting Taro H5 Dev Server and NestJS Server..."
 
     : > "${LOG_FILE}"
@@ -307,7 +256,7 @@ start_service() {
     DEV_PID="$(spawn_detached \
         "${COZE_WORKSPACE_PATH}" \
         "${LOG_FILE}" \
-        "${DEV_COMMAND[@]}")"
+        "${PNPM_BIN}" dev)"
     if [[ -z "${DEV_PID}" ]]; then
         echo "❌ 无法获取 dev 后台进程 PID"
         return 1

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

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -Eeuo pipefail
 
 ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
 COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-${ROOT_DIR}}"
@@ -7,40 +6,6 @@ export COZE_WORKSPACE_PATH
 
 cd "${COZE_WORKSPACE_PATH}"
 
-is_under_root() {
-    local path="$1"
-    local root="$2"
-    [ -n "$root" ] || return 1
-    case "$path" in
-        "$root"|"$root"/*) return 0 ;;
-        *) return 1 ;;
-    esac
-}
-
-is_coze_drive_workspace() {
-    local path="$1"
-    local root
-    local candidates=()
-
-    if [ -n "${COZE_DRIVE_ROOT:-}" ]; then
-        candidates+=("$COZE_DRIVE_ROOT")
-    fi
-    candidates+=("/Coze/Drive")
-
-    for root in "${candidates[@]}"; do
-        if [ -d "$root" ]; then
-            root="$(cd "$root" && pwd -P)"
-        else
-            root="${root%/}"
-        fi
-        if is_under_root "$path" "$root"; then
-            return 0
-        fi
-    done
-
-    return 1
-}
-
 # build_weapp.sh - 通过 PID 文件精确杀掉自己上次的构建进程
 PID_FILE="/tmp/coze-build_weapp.pid"
 
@@ -57,11 +22,7 @@ if [ -f "$PID_FILE" ]; then
 fi
 
 # 用 setsid 创建新的进程组，方便下次整组杀掉
-if is_coze_drive_workspace "${COZE_WORKSPACE_PATH}"; then
-    setsid bash "$ROOT_DIR/.cozeproj/scripts/build-on-local-disk.sh" pnpm build:pack &
-else
-    setsid pnpm build:pack &
-fi
+setsid pnpm build:pack &
 echo $! > "$PID_FILE"
 
 echo "构建已启动 (PID: $(cat $PID_FILE))"

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

@@ -98,6 +98,7 @@ printf '%s\n' "$$" > "$LOCK_DIR/pid"
 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
@@ -118,12 +119,13 @@ cleanup_legacy_workspace() {
   done < <(find "$workspace_dir" -mindepth 1 -maxdepth 1 -print0)
 }
 
+# Preserve existing project caches during dependency preparation.
 cleanup_legacy_shadow_project() {
   local entry name
   while IFS= read -r -d '' entry; do
     name="$(basename "$entry")"
     case "$name" in
-      node_modules|client|server) continue ;;
+      node_modules|client|server|caches|.install-state) continue ;;
     esac
     rm -rf "$entry"
   done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
@@ -141,6 +143,162 @@ link_install_entry() {
   fi
 }
 
+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
+}
+
+append_file_to_install_fingerprint() {
+  local relative_path="$1"
+  local source_path="$PROJECT_ROOT/$relative_path"
+  printf 'path=%s\n' "$relative_path"
+  if [ -f "$source_path" ]; then
+    cat "$source_path"
+  else
+    printf '<missing>\n'
+  fi
+}
+
+append_directory_to_install_fingerprint() {
+  local relative_path="$1"
+  local source_path="$PROJECT_ROOT/$relative_path"
+  local file
+  printf 'path=%s\n' "$relative_path"
+  if [ ! -d "$source_path" ]; then
+    printf '<missing>\n'
+    return
+  fi
+
+  while IFS= read -r file; do
+    printf 'file=%s\n' "${file#"${PROJECT_ROOT}/"}"
+    cat "$file"
+  done < <(find -P "$source_path" -type f -print | LC_ALL=C sort)
+}
+
+# Everything that can change the resolved dependency tree. The leading version marker
+# invalidates every stored state when this scheme itself changes.
+calculate_install_fingerprint() {
+  local filename workspace argument
+  {
+    printf 'prepare-node-modules-install-state=1\n'
+    printf 'node-version=%s\n' "$(node --version)"
+    printf 'pnpm-version=%s\n' "$(pnpm --version)"
+    printf 'node-env=%s\n' "${NODE_ENV:-}"
+    printf 'npm-config-production=%s\n' "${npm_config_production:-}"
+    printf 'npm-config-production-upper=%s\n' "${NPM_CONFIG_PRODUCTION:-}"
+    printf 'pnpm-config-production=%s\n' "${PNPM_CONFIG_PRODUCTION:-}"
+    for argument in "$@"; do
+      printf 'install-argument=%s\n' "$argument"
+    done
+    for filename in package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
+      append_file_to_install_fingerprint "$filename"
+    done
+    for workspace in client server; do
+      append_file_to_install_fingerprint "$workspace/package.json"
+    done
+    append_directory_to_install_fingerprint patches
+  } | hash_install_input
+}
+
+install_requires_refresh() {
+  local argument
+  for argument in "$@"; do
+    case "$argument" in
+      --force|-f|--lockfile-only|--fix-lockfile) return 0 ;;
+    esac
+  done
+  return 1
+}
+
+# Reuse skips pnpm install entirely, so it must not skip side effects that live outside
+# node_modules. preinstall is exempt: it only guards which package manager may run, and
+# there is no install to guard when the tree is already in place.
+package_has_install_lifecycle() {
+  local package_path="$1"
+  node - "$package_path" <<'NODE'
+const fs = require('node:fs');
+const [packagePath] = process.argv.slice(2);
+
+try {
+  const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+  const scripts = packageJson && typeof packageJson.scripts === 'object' && packageJson.scripts
+    ? packageJson.scripts
+    : {};
+  const hasLifecycle = ['install', 'postinstall', 'prepare'].some(
+    name => typeof scripts[name] === 'string' && scripts[name].trim() !== '',
+  );
+
+  process.exit(hasLifecycle ? 0 : 1);
+} catch {
+  process.exit(0);
+}
+NODE
+}
+
+install_reuse_is_safe() {
+  local workspace package_path
+  for package_path in "$PROJECT_ROOT/.pnpmfile.cjs" "$PROJECT_ROOT/.pnpmfile.js"; do
+    if [ -e "$package_path" ]; then
+      echo "[node_modules] Reinstalling because pnpm hooks are present: $package_path"
+      return 1
+    fi
+  done
+
+  if [ -f "$PROJECT_ROOT/.npmrc" ] && grep -Eq '^[[:space:]]*pnpmfile[[:space:]]*=' "$PROJECT_ROOT/.npmrc"; then
+    echo "[node_modules] Reinstalling because .npmrc configures a pnpm hook."
+    return 1
+  fi
+
+  for workspace in . client server; do
+    package_path="$PROJECT_ROOT/$workspace/package.json"
+    [ -f "$package_path" ] || continue
+    if package_has_install_lifecycle "$package_path"; then
+      echo "[node_modules] Reinstalling because $package_path has an install lifecycle script."
+      return 1
+    fi
+  done
+  return 0
+}
+
+dependencies_are_ready() {
+  local workspace
+  [ -f "$WORK_DIR/node_modules/.modules.yaml" ] || return 1
+  for workspace in client server; do
+    if [ -f "$PROJECT_ROOT/$workspace/package.json" ] &&
+      [ ! -f "$WORK_DIR/$workspace/node_modules/.modules.yaml" ]; then
+      return 1
+    fi
+  done
+  return 0
+}
+
+# 判断顺序按代价从小到大排。指纹要读云盘上的 lockfile 和整个 patches/，所以放最后：只有其余
+# 条件都满足、确实可能复用时才付这份开销。build.sh 和 prepare.sh 不设开关，第一行就返回了。
+install_can_be_reused() {
+  local installed_fingerprint=""
+
+  [ "${COZE_REUSE_NODE_MODULES:-}" = "1" ] || return 1
+  install_requires_refresh "$@" && return 1
+  [ -f "$INSTALL_STATE_FILE" ] || return 1
+  IFS= read -r installed_fingerprint < "$INSTALL_STATE_FILE" || return 1
+  dependencies_are_ready || return 1
+  install_reuse_is_safe || return 1
+  [ "$installed_fingerprint" = "$(calculate_install_fingerprint "$@")" ] || return 1
+  return 0
+}
+
+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"
+}
+
 copy_install_metadata() {
   local filename source_file target_file workspace
   for filename in pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
@@ -190,16 +348,26 @@ link_node_modules() {
 cleanup_legacy_shadow_project
 copy_install_metadata
 
-echo "[node_modules] Installing dependencies in $WORK_DIR"
-if ! (cd "$WORK_DIR" && pnpm install "$@"); then
-  exit 1
-fi
+if install_can_be_reused "$@"; then
+  echo "[node_modules] Reusing unchanged dependencies in $WORK_DIR"
+else
+  # A stale state file must not survive a failed install.
+  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
 
-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"
+  # pnpm may have rewritten the lockfile, so record the fingerprint of the tree as it
+  # now stands. Otherwise the next run would see a changed input and reinstall.
+  write_install_state "$(calculate_install_fingerprint "$@")"
 fi
 
 link_node_modules "$PROJECT_ROOT" "$WORK_DIR/node_modules"

package/lib/__templates__/vite/.coze

@@ -9,7 +9,7 @@ run = ["bash", "./scripts/dev.sh"]
 run_win = ["powershell.exe", "-NoProfile", "-ExecutionPolicy", "Bypass", "-File", "./scripts/dev.ps1"]
 validate = ["bash", "./scripts/validate.sh"]
 validate_win = ["powershell.exe", "-NoProfile", "-ExecutionPolicy", "Bypass", "-File", "./scripts/validate.ps1"]
-deps = ["git"] # -> apt install git
+deps = ["git", "rsync"] # -> apt install git rsync
 
 [deploy]
 build = ["bash","./scripts/build.sh"]

package/lib/__templates__/vite/README.md

@@ -228,6 +228,8 @@ app.innerHTML = `
 
 **必须使用 pnpm 管理依赖**
 
+云盘开发先修改源码 `package.json`，再执行 `bash ./scripts/prepare.sh`；以下安装命令仅适用于普通本地项目。
+
 ```bash
 # ✅ 安装依赖
 pnpm install
@@ -416,3 +418,21 @@ const pool = new Pool({ connectionString: process.env.DATABASE_URL });
 2. 将整个项目上传到服务器
 3. 运行 `pnpm install --prod`
 4. 运行 `coze-dev start` 启动服务
+
+## 云盘源码与本地开发
+
+Vite、Next.js、Nuxt 的 Unix 开发脚本在 `COZE_DRIVE_ROOT`（默认 `/Coze/Drive`）内通过
+`scripts/local-workspace.cjs` 将源码用 `rsync` 同步到本机临时目录。系统需提供 Node.js、pnpm、bash 和 rsync。
+所有开发与修复仍在云盘源码目录完成，从该目录执行 `.coze` 的 `[dev]` 命令。
+
+- `prepare.sh` 同步并在本地安装依赖；安装成功且云盘依赖输入未变化时，仅将更新的锁文件回写云盘。
+- `dev.sh` 在本地镜像运行开发服务，每轮 rsync 结束后等待一秒再同步，框架监听本地文件进行热更新。
+  同步失败或依赖输入变化时停止服务；修复后重新运行 `prepare.sh` / `dev.sh`。
+- `validate.sh` 使用独立的本地 `check` 目录，避免类型生成影响正在运行的 `dev` 服务。
+- 同步排除 `.git`、`node_modules`、日志和框架输出；不要在镜像修复源码或将依赖、编译产物回传云盘。
+  日志和 PID 默认保留在源码目录的 `logs/`，实际镜像路径见脚本输出。
+
+本地镜像仅用于 `[dev].build/run/validate`。部署配置、`build.sh`、`start.sh` 保持原流程；
+普通本地目录和 Windows PowerShell 入口也保持原流程。
+存量项目通过新版 CLI 的 `coze-dev patch --dry-run` / `coze-dev patch` 升级，沿用 patch 总开关。
+仅升级完整匹配旧模板的三个 Unix 开发脚本并保留端口；自定义开发脚本、命令或同名 helper 会跳过。

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

@@ -6,7 +6,7 @@ COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-$(pwd)}"
 cd "${COZE_WORKSPACE_PATH}"
 
 echo "Installing dependencies..."
-bash "$COZE_WORKSPACE_PATH/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
+pnpm install --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only
 
 echo "Building frontend with Vite..."
 pnpm vite build

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

@@ -1,14 +1,20 @@
 #!/bin/bash
 set -Eeuo pipefail
 
+# Resolve the source project from this script, then let the Web runner choose its local mirror.
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd -P)"
+if [[ "${COZE_WEB_LOCAL_ACTIVE:-}" != "${PROJECT_ROOT}" ]]; then
+  exec node "${SCRIPT_DIR}/local-workspace.cjs" dev "$@"
+fi
+COZE_WORKSPACE_PATH="${PROJECT_ROOT}"
+
 <% if (process.env.NODE_ENV === 'test') { %>
 # 测试环境：支持环境变量覆盖端口
 PORT="${PORT:-<%= port %>}"
-COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-$(pwd)}"
 DEPLOY_RUN_PORT="${DEPLOY_RUN_PORT:-${PORT}}"
 <% } else { %>
 PORT=<%= port %>
-COZE_WORKSPACE_PATH="${COZE_WORKSPACE_PATH:-$(pwd)}"
 DEPLOY_RUN_PORT="${DEPLOY_RUN_PORT:-${PORT}}"
 <% } %>
 
@@ -38,7 +44,7 @@ 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
+exec env PORT="${DEPLOY_RUN_PORT}" node "${SCRIPT_DIR}/local-workspace.cjs" watch pnpm tsx watch server/server.ts
 <% } else { %>
 LOG_DIR="${COZE_LOG_DIR:-${COZE_WORKSPACE_PATH}/logs}"
 LOG_FILE="${LOG_DIR}/server.log"
@@ -136,7 +142,7 @@ mkdir -p "${LOG_DIR}"
 
 export PORT="${DEPLOY_RUN_PORT}"
 server_pid="$(spawn_detached "${COZE_WORKSPACE_PATH}" "${LOG_FILE}" \
-  "$(command -v pnpm)" tsx watch server/server.ts)"
+  "$(command -v node)" "${SCRIPT_DIR}/local-workspace.cjs" watch "$(command -v pnpm)" tsx watch server/server.ts)"
 echo "${server_pid}" > "${PID_FILE}"
 
 sleep 1