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

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

@@ -0,0 +1,149 @@
+#!/usr/bin/env bash
+# Install dependencies on local disk and expose them to the source tree by symlink.
+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
+
+command -v pnpm >/dev/null 2>&1 || {
+  echo "[node_modules] pnpm is required" >&2
+  exit 1
+}
+
+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"/*) ;;
+  *)
+    (cd "$PROJECT_ROOT" && pnpm install "$@")
+    exit 0
+    ;;
+esac
+
+NM_ROOT="/tmp/nm"
+PROJECT_ID="$(basename "$PROJECT_ROOT")-$(printf '%s' "$PROJECT_ROOT" | cksum | awk '{print $1}')"
+mkdir -p "$NM_ROOT"
+WORK_DIR="$NM_ROOT/$PROJECT_ID"
+case "$WORK_DIR" in
+  "$DRIVE_ROOT"|"$DRIVE_ROOT"/*)
+    echo "[node_modules] local dependency directory must not be on Coze Drive: $WORK_DIR" >&2
+    exit 1
+    ;;
+esac
+
+LOCK_DIR="$NM_ROOT/$PROJECT_ID.lock"
+while ! mkdir "$LOCK_DIR" 2>/dev/null; do
+  echo "[node_modules] Waiting for another dependency preparation for this project..."
+  sleep 1
+done
+trap 'rmdir "$LOCK_DIR" 2>/dev/null || true' EXIT
+
+mkdir -p "$WORK_DIR"
+
+# 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)
+}
+
+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 ;;
+    esac
+    rm -rf "$entry"
+  done < <(find "$WORK_DIR" -mindepth 1 -maxdepth 1 -print0)
+
+  for workspace in client server; do
+    cleanup_legacy_workspace "$WORK_DIR/$workspace"
+  done
+}
+
+copy_install_metadata() {
+  local filename source_file target_file workspace
+  for filename in package.json 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
+
+  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"
+    else
+      rm -rf "$WORK_DIR/$workspace"
+    fi
+  done
+}
+
+link_node_modules() {
+  local source_dir="$1" target_dir="$2"
+  local current=""
+  mkdir -p "$target_dir"
+  if [ -L "$source_dir/node_modules" ]; then
+    current="$(readlink "$source_dir/node_modules")"
+    case "$current" in
+      "$NM_ROOT"/*/node_modules|"$NM_ROOT"/*/*/node_modules) ;;
+      *)
+        echo "[node_modules] refusing to replace unmanaged symlink: $source_dir/node_modules" >&2
+        exit 1
+        ;;
+    esac
+    rm "$source_dir/node_modules"
+  elif [ -e "$source_dir/node_modules" ]; then
+    rm -rf "$source_dir/node_modules"
+  fi
+  ln -s "$target_dir" "$source_dir/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 [ -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
+
+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
+
+echo "[node_modules] Dependencies ready"

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

@@ -6,7 +6,4 @@ 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
-if command -v coze-dev > /dev/null 2>&1 && coze-dev check-bins --help > /dev/null 2>&1; then
-  coze-dev check-bins --fix
-fi
+bash "$COZE_WORKSPACE_PATH/scripts/prepare-node-modules.sh" --prefer-frozen-lockfile --prefer-offline --loglevel debug --reporter=append-only

package/lib/__templates__/vite/template.config.js

@@ -1,8 +1,4 @@
 
-import { spawn } from 'child_process';
-import { resolve, join, basename } from 'path';
-import { appendFileSync, openSync, closeSync, mkdirSync } from 'fs';
-import { homedir } from 'os';
 
 
 
@@ -64,61 +60,6 @@ const config = {
   onAfterRender: async (_context, _outputPath) => {
     // 输出由 init 命令统一处理
   },
-
-  onComplete: async (_context, outputPath) => {
-    // Skip pnpm update in test environment to avoid monorepo workspace issues
-    if (process.env.NODE_ENV === 'test') {
-      console.log('⊘ Skipping dependency update in test environment');
-      return;
-    }
-
-    const cmd = 'pnpm';
-    const args = ['update', 'coze-coding-dev-sdk@^0.7.25'];
-    console.log(
-      `\nTriggering: ${cmd} ${args.join(' ')} (running in background)`,
-    );
-
-    try {
-      const projectRoot = resolve(outputPath);
-
-      // Determine log directory
-      const cozeHome = process.env.COZE_HOME || join(homedir(), '.coze');
-      const logDir = process.env.COZE_LOG_DIR || join(cozeHome, 'logs');
-      mkdirSync(logDir, { recursive: true });
-
-      // Use project name in log file to avoid conflicts
-      const projectName = basename(projectRoot);
-      const logFile = join(logDir, `${projectName}-init.log`);
-
-      // Write log header
-      const timestamp = new Date().toISOString();
-      appendFileSync(
-        logFile,
-        `\n=== [${timestamp}] ${cmd} ${args.join(' ')} ===\n`,
-      );
-
-      // Open log file for appending
-      const logFd = openSync(logFile, 'a');
-
-      // Spawn in detached mode
-      const child = spawn(cmd, args, {
-        cwd: projectRoot,
-        detached: true,
-        stdio: ['ignore', logFd, logFd],
-      });
-
-      child.unref();
-      closeSync(logFd);
-
-      console.log(
-        '✓ coze-coding-dev-sdk update triggered (running in background)',
-      );
-      console.log(`  Log file: ${logFile}`);
-    } catch (error) {
-      console.error('✗ Failed to trigger coze-coding-dev-sdk update:', error);
-      console.log('  You can manually run: pnpm update coze-coding-dev-sdk');
-    }
-  },
 };
 
 export default config;

package/lib/cli.js

@@ -2114,7 +2114,7 @@ const EventBuilder = {
 };
 
 var name = "@coze-arch/cli";
-var version = "0.1.4-alpha.b94eab";
+var version = "0.1.4-alpha.d384e3";
 var description = "coze coding devtools cli";
 var license = "MIT";
 var author = "fanwenjie.fe@bytedance.com";
@@ -9179,6 +9179,7 @@ const shouldRenderFile = (filePath) => {
     '.prettierrc',
     '.babelrc',
     '.sh',
+    '.ps1',
   ]);
 
   const ext = path.extname(filePath).toLowerCase();
@@ -9882,18 +9883,38 @@ const execute = async (
 };
 
 function _nullishCoalesce$2(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
+const getDependencyPreparationCommand = (projectPath) => {
+  if (fs.existsSync(path.join(projectPath, 'scripts', 'prepare.sh'))) {
+    return 'bash ./scripts/prepare.sh';
+  }
+  if (
+    fs.existsSync(
+      path.join(
+        projectPath,
+        '.cozeproj',
+        'scripts',
+        'prepare-node-modules.sh',
+      ),
+    )
+  ) {
+    return 'bash ./.cozeproj/scripts/prepare-node-modules.sh';
+  }
+  return 'pnpm install';
+};
+
 /**
- * 运行 pnpm install
+ * 优先通过模板提供的 wrapper 准备依赖。
  */
-const runPnpmInstall = (projectPath) => {
-  logger.info('\nInstalling dependencies with pnpm...');
+const prepareDependencies = (projectPath) => {
+  logger.info('\nPreparing dependencies with the project wrapper...');
 
-  const result = shelljs.exec('pnpm install', {
+  const command = getDependencyPreparationCommand(projectPath);
+  const result = shelljs.exec(command, {
     cwd: projectPath,
     silent: true,
   });
 
-  // verbose 模式下输出 pnpm install 的详细日志
+  // verbose 模式下输出依赖准备命令的详细日志
   if (result.stdout) {
     logger.verbose(result.stdout);
   }
@@ -9902,11 +9923,11 @@ const runPnpmInstall = (projectPath) => {
   }
 
   if (result.code === 0) {
-    logger.success('Dependencies installed successfully!');
+    logger.success('Dependencies prepared successfully!');
   } else {
     // 仅在失败时输出详细信息以便排查
     const errorMessage = [
-      `pnpm install failed with exit code ${result.code}`,
+      `${command} failed with exit code ${result.code}`,
       result.stderr ? `\nStderr:\n${result.stderr}` : '',
       result.stdout ? `\nStdout:\n${result.stdout}` : '',
     ]
@@ -10131,7 +10152,7 @@ const installDependenciesStep = ctx => {
   try {
     if (!skipInstall) {
       if (ctx.hasPackageJson) {
-        runPnpmInstall(ctx.absoluteOutputPath);
+        prepareDependencies(ctx.absoluteOutputPath);
         ctx.timer.logPhase('Dependencies installation');
       } else {
         logger.info(
@@ -10140,7 +10161,7 @@ const installDependenciesStep = ctx => {
       }
     }
   } catch (error) {
-    // 捕获 pnpm install 失败的情况
+    // 捕获依赖准备失败的情况
     installSuccess = false;
     installErrorCode = 1;
     installErrorType = 'execution_failed';
@@ -10227,7 +10248,9 @@ const startDevServerStep = ctx => {
     logger.info('\nNext steps:');
     logger.info(`  cd ${ctx.outputPath}`);
     if (skipInstall && ctx.hasPackageJson) {
-      logger.info('  pnpm install');
+      logger.info(
+        `  ${getDependencyPreparationCommand(ctx.absoluteOutputPath)}`,
+      );
     }
     if (skipGit) {
       logger.info('  git init');
@@ -10339,7 +10362,7 @@ const registerCommand$1 = program => {
     .argument('[directory]', 'Output directory for the project')
     .requiredOption('-t, --template <name>', 'Template name')
     .option('-o, --output <path>', 'Output directory', process.cwd())
-    .option('--skip-install', 'Skip automatic pnpm install', false)
+    .option('--skip-install', 'Skip automatic dependency preparation', false)
     .option('--skip-git', 'Skip automatic git initialization', false)
     .option(
       '--skip-commit',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/cli",
-  "version": "0.1.4-alpha.b94eab",
+  "version": "0.1.4-alpha.d384e3",
   "private": false,
   "description": "coze coding devtools cli",
   "license": "MIT",

package/lib/__templates__/nextjs/.babelrc

@@ -1,15 +0,0 @@
-{
-  "presets": [
-    [
-      "next/babel",
-      {
-        "preset-react": {
-          "development": true
-        }
-      }
-    ]
-  ],
-  "plugins": [
-    "@react-dev-inspector/babel-plugin"
-  ]
-}