@coze-arch/cli 0.1.4-alpha.0e7259 → 0.1.4-alpha.0f9595

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

@@ -14,6 +14,54 @@ command -v pnpm >/dev/null 2>&1 || {
   exit 1
 }
 
+install_dependencies() {
+  local install_root="$1"
+  local client_dir="$install_root/client"
+  local -a client_dependencies=()
+  local attempt
+  local expo_install_succeeded=false
+  shift
+
+  if [ ! -f "$client_dir/package.json" ]; then
+    (cd "$install_root" && pnpm install "$@")
+    return
+  fi
+
+  while IFS= read -r dependency; do
+    client_dependencies+=("$dependency")
+  done < <(
+    node -e '
+      const manifest = require(process.argv[1]);
+      for (const dependency of Object.keys(manifest.dependencies || {})) {
+        console.log(dependency);
+      }
+    ' "$client_dir/package.json"
+  )
+
+  if command -v npx >/dev/null 2>&1 && [ "${#client_dependencies[@]}" -gt 0 ]; then
+    for attempt in 1 2 3; do
+      if (cd "$client_dir" && npx expo install --pnpm "${client_dependencies[@]}" -- "$@"); then
+        expo_install_succeeded=true
+        break
+      fi
+      if [ "$attempt" -lt 3 ]; then
+        echo "[node_modules] Expo install failed, retrying ($attempt/2)..."
+      fi
+    done
+  fi
+
+  if [ "$expo_install_succeeded" = false ]; then
+    echo "[node_modules] Expo install failed after 3 attempts, falling back to pnpm for client"
+    (cd "$install_root" && pnpm --filter ./client install "$@") || return 1
+  fi
+
+  local -a pnpm_filters=(--filter .)
+  if [ -f "$install_root/server/package.json" ]; then
+    pnpm_filters+=(--filter ./server)
+  fi
+  (cd "$install_root" && pnpm "${pnpm_filters[@]}" install "$@") || return 1
+}
+
 DRIVE_ROOT="${COZE_DRIVE_ROOT:-/Coze/Drive}"
 if [ -d "$DRIVE_ROOT" ]; then
   DRIVE_ROOT="$(cd "$DRIVE_ROOT" && pwd -P)"
@@ -23,7 +71,7 @@ fi
 case "$PROJECT_ROOT" in
   "$DRIVE_ROOT"|"$DRIVE_ROOT"/*) ;;
   *)
-    (cd "$PROJECT_ROOT" && pnpm install "$@")
+    install_dependencies "$PROJECT_ROOT" "$@"
     exit 0
     ;;
 esac
@@ -72,7 +120,7 @@ cleanup_legacy_shadow_project() {
   while IFS= read -r -d '' entry; do
     name="$(basename "$entry")"
     case "$name" in
-      node_modules|.next|client|server) continue ;;
+      node_modules|client|server) continue ;;
     esac
     rm -rf "$entry"
   done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
@@ -82,9 +130,17 @@ cleanup_legacy_shadow_project() {
   done
 }
 
-copy_install_metadata() {
+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
+}
+
+prepare_install_metadata() {
   local filename source_file target_file workspace
-  for filename in package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
+  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"
@@ -93,15 +149,28 @@ copy_install_metadata() {
     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"
-      rm -f "$WORK_DIR/$workspace/package.json"
-      cp "$PROJECT_ROOT/$workspace/package.json" "$WORK_DIR/$workspace/package.json"
+      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
+
+  for filename in app.config.ts app.config.js app.json; do
+    source_file="$PROJECT_ROOT/client/$filename"
+    target_file="$WORK_DIR/client/$filename"
+    rm -f "$target_file"
+    if [ -f "$source_file" ]; then
+      cp "$source_file" "$target_file"
+    fi
+  done
 }
 
 link_node_modules() {
@@ -125,10 +194,10 @@ link_node_modules() {
 }
 
 cleanup_legacy_shadow_project
-copy_install_metadata
+prepare_install_metadata
 
 echo "[node_modules] Installing dependencies in $WORK_DIR"
-if ! (cd "$WORK_DIR" && pnpm install "$@"); then
+if ! install_dependencies "$WORK_DIR" "$@"; then
   exit 1
 fi
 
@@ -138,7 +207,6 @@ if [ -f "$WORK_DIR/pnpm-lock.yaml" ]; then
   chmod 0644 "$temporary_lockfile"
   mv -f "$temporary_lockfile" "$PROJECT_ROOT/pnpm-lock.yaml"
 fi
-
 link_node_modules "$PROJECT_ROOT" "$WORK_DIR/node_modules"
 for workspace in client server; do
   if [ -f "$PROJECT_ROOT/$workspace/package.json" ]; then

package/lib/__templates__/expo/client/app.config.ts

@@ -1,4 +1,4 @@
-import { ExpoConfig, ConfigContext } from 'expo/config';
+import type { ExpoConfig, ConfigContext } from 'expo/config';
 
 const appName = process.env.COZE_PROJECT_NAME || process.env.EXPO_PUBLIC_COZE_PROJECT_NAME || '应用';
 const projectId = process.env.COZE_PROJECT_ID || process.env.EXPO_PUBLIC_COZE_PROJECT_ID;
@@ -10,6 +10,7 @@ export default ({ config }: ConfigContext): ExpoConfig => {
     "name": appName,
     "slug": slugAppName,
     "version": "1.0.0",
+    "sdkVersion": "54.0.0",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "myapp",

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

@@ -7,7 +7,6 @@ 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
-bash "$COZE_WORKSPACE_PATH/scripts/prepare-next-output.sh"
 
 echo "Building the Next.js project..."
 pnpm next build --webpack

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

@@ -56,7 +56,6 @@ kill_port_if_listening() {
 echo "Clearing port ${DEPLOY_RUN_PORT} before start."
 kill_port_if_listening
 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-output.sh"
 echo "Starting HTTP service on port ${DEPLOY_RUN_PORT} for dev..."
 
 # 测试环境保持服务为前台进程，便于 e2e 收集输出并停止进程。
@@ -229,7 +228,6 @@ fi
 echo "Clearing port ${DEPLOY_RUN_PORT} before start."
 kill_port_if_listening
 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-output.sh"
 echo "Starting HTTP service on port ${DEPLOY_RUN_PORT} for dev..."
 
 mkdir -p "${LOG_DIR}"

package/lib/__templates__/nextjs/scripts/prepare-node-modules.sh

@@ -72,7 +72,7 @@ cleanup_legacy_shadow_project() {
   while IFS= read -r -d '' entry; do
     name="$(basename "$entry")"
     case "$name" in
-      node_modules|.next|client|server) continue ;;
+      node_modules|client|server) continue ;;
     esac
     rm -rf "$entry"
   done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
@@ -82,9 +82,17 @@ cleanup_legacy_shadow_project() {
   done
 }
 
-copy_install_metadata() {
+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
+}
+
+prepare_install_metadata() {
   local filename source_file target_file workspace
-  for filename in package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
+  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"
@@ -93,11 +101,15 @@ copy_install_metadata() {
     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"
-      rm -f "$WORK_DIR/$workspace/package.json"
-      cp "$PROJECT_ROOT/$workspace/package.json" "$WORK_DIR/$workspace/package.json"
+      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
@@ -125,7 +137,7 @@ link_node_modules() {
 }
 
 cleanup_legacy_shadow_project
-copy_install_metadata
+prepare_install_metadata
 
 echo "[node_modules] Installing dependencies in $WORK_DIR"
 if ! (cd "$WORK_DIR" && pnpm install "$@"); then

package/lib/__templates__/nuxt-vue/scripts/prepare-node-modules.sh

@@ -72,7 +72,7 @@ cleanup_legacy_shadow_project() {
   while IFS= read -r -d '' entry; do
     name="$(basename "$entry")"
     case "$name" in
-      node_modules|.next|client|server) continue ;;
+      node_modules|client|server) continue ;;
     esac
     rm -rf "$entry"
   done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
@@ -82,9 +82,17 @@ cleanup_legacy_shadow_project() {
   done
 }
 
-copy_install_metadata() {
+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
+}
+
+prepare_install_metadata() {
   local filename source_file target_file workspace
-  for filename in package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
+  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"
@@ -93,11 +101,15 @@ copy_install_metadata() {
     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"
-      rm -f "$WORK_DIR/$workspace/package.json"
-      cp "$PROJECT_ROOT/$workspace/package.json" "$WORK_DIR/$workspace/package.json"
+      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
@@ -125,7 +137,7 @@ link_node_modules() {
 }
 
 cleanup_legacy_shadow_project
-copy_install_metadata
+prepare_install_metadata
 
 echo "[node_modules] Installing dependencies in $WORK_DIR"
 if ! (cd "$WORK_DIR" && pnpm install "$@"); then

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

@@ -72,7 +72,7 @@ cleanup_legacy_shadow_project() {
   while IFS= read -r -d '' entry; do
     name="$(basename "$entry")"
     case "$name" in
-      node_modules|.next|client|server) continue ;;
+      node_modules|client|server) continue ;;
     esac
     rm -rf "$entry"
   done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
@@ -82,9 +82,17 @@ cleanup_legacy_shadow_project() {
   done
 }
 
-copy_install_metadata() {
+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
+}
+
+prepare_install_metadata() {
   local filename source_file target_file workspace
-  for filename in package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
+  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"
@@ -93,11 +101,15 @@ copy_install_metadata() {
     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"
-      rm -f "$WORK_DIR/$workspace/package.json"
-      cp "$PROJECT_ROOT/$workspace/package.json" "$WORK_DIR/$workspace/package.json"
+      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
@@ -125,7 +137,7 @@ link_node_modules() {
 }
 
 cleanup_legacy_shadow_project
-copy_install_metadata
+prepare_install_metadata
 
 echo "[node_modules] Installing dependencies in $WORK_DIR"
 if ! (cd "$WORK_DIR" && pnpm install "$@"); then

package/lib/__templates__/vite/scripts/prepare-node-modules.sh

@@ -72,7 +72,7 @@ cleanup_legacy_shadow_project() {
   while IFS= read -r -d '' entry; do
     name="$(basename "$entry")"
     case "$name" in
-      node_modules|.next|client|server) continue ;;
+      node_modules|client|server) continue ;;
     esac
     rm -rf "$entry"
   done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
@@ -82,9 +82,17 @@ cleanup_legacy_shadow_project() {
   done
 }
 
-copy_install_metadata() {
+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
+}
+
+prepare_install_metadata() {
   local filename source_file target_file workspace
-  for filename in package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc; do
+  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"
@@ -93,11 +101,15 @@ copy_install_metadata() {
     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"
-      rm -f "$WORK_DIR/$workspace/package.json"
-      cp "$PROJECT_ROOT/$workspace/package.json" "$WORK_DIR/$workspace/package.json"
+      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
@@ -125,7 +137,7 @@ link_node_modules() {
 }
 
 cleanup_legacy_shadow_project
-copy_install_metadata
+prepare_install_metadata
 
 echo "[node_modules] Installing dependencies in $WORK_DIR"
 if ! (cd "$WORK_DIR" && pnpm install "$@"); then

package/lib/cli.js

@@ -2114,7 +2114,7 @@ const EventBuilder = {
 };
 
 var name = "@coze-arch/cli";
-var version = "0.1.4-alpha.0e7259";
+var version = "0.1.4-alpha.0f9595";
 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.0e7259",
+  "version": "0.1.4-alpha.0f9595",
   "private": false,
   "description": "coze coding devtools cli",
   "license": "MIT",

package/lib/__templates__/nextjs/scripts/prepare-next-output.sh

@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-# Keep Next.js compiler output off Coze Drive while leaving source files in place.
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
-PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
-
-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
-
-NM_ROOT="/tmp/nm"
-PROJECT_ID="$(basename "$PROJECT_ROOT")-$(printf '%s' "$PROJECT_ROOT" | cksum | awk '{print $1}')"
-NEXT_DIR="$NM_ROOT/$PROJECT_ID/.next"
-LEGACY_NEXT_DIR="$NM_ROOT/next/$PROJECT_ID"
-
-if [ -L "$NEXT_DIR" ]; then
-  current="$(readlink "$NEXT_DIR")"
-  if [ "$current" = "$PROJECT_ROOT/.next" ]; then
-    rm "$NEXT_DIR"
-  else
-    echo "[next] refusing to replace unmanaged local output symlink: $NEXT_DIR" >&2
-    exit 1
-  fi
-elif [ -e "$NEXT_DIR" ] && [ ! -d "$NEXT_DIR" ]; then
-  echo "[next] local output path is not a directory: $NEXT_DIR" >&2
-  exit 1
-fi
-mkdir -p "$NEXT_DIR"
-
-if [ -L "$PROJECT_ROOT/.next" ]; then
-  current="$(readlink "$PROJECT_ROOT/.next")"
-  if [ "$current" = "$NEXT_DIR" ]; then
-    exit 0
-  fi
-  if [ "$current" = "$LEGACY_NEXT_DIR" ]; then
-    rm "$PROJECT_ROOT/.next"
-  else
-    echo "[next] refusing to replace unmanaged symlink: $PROJECT_ROOT/.next" >&2
-    exit 1
-  fi
-fi
-
-if [ -e "$PROJECT_ROOT/.next" ]; then
-  rm -rf "$PROJECT_ROOT/.next"
-fi
-
-if ! ln -s "$NEXT_DIR" "$PROJECT_ROOT/.next"; then
-  if [ ! -L "$PROJECT_ROOT/.next" ] || [ "$(readlink "$PROJECT_ROOT/.next")" != "$NEXT_DIR" ]; then
-    echo "[next] failed to link $PROJECT_ROOT/.next to $NEXT_DIR" >&2
-    exit 1
-  fi
-fi
-
-echo "[next] Compiler output ready at $NEXT_DIR"