@coze-arch/cli 0.1.5 → 0.1.7

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

@@ -56,9 +56,9 @@ $startupTimeoutSeconds = 30
 $startupDeadline = (Get-Date).AddSeconds($startupTimeoutSeconds)
 while ((Get-Date) -lt $startupDeadline) {
   if ($process.HasExited) {
-    Write-Error "Dev server exited before listening on port $port."
     Get-Content $errorLogFile -Tail 20 -ErrorAction SilentlyContinue
     Remove-Item $pidFile -Force -ErrorAction SilentlyContinue
+    Write-Error "Dev server exited before listening on port $port." -ErrorAction Continue
     exit 1
   }
 
@@ -71,9 +71,9 @@ while ((Get-Date) -lt $startupDeadline) {
   Start-Sleep -Milliseconds 200
 }
 
-Write-Error "Dev server did not listen on port $port within $startupTimeoutSeconds seconds."
 Stop-ProcessTree $process.Id
 Get-Content $errorLogFile -Tail 20 -ErrorAction SilentlyContinue
 Remove-Item $pidFile -Force -ErrorAction SilentlyContinue
+Write-Error "Dev server did not listen on port $port within $startupTimeoutSeconds seconds." -ErrorAction Continue
 exit 1
 <% } %>

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

@@ -45,11 +45,15 @@ LOG_FILE="${LOG_DIR}/server.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='
+RUN_WITH_TIMEOUT="$(declare -f timeout_watchdog_enabled)"'
 timeout_seconds=$1
 shift
 
@@ -57,6 +61,7 @@ shift
 child_pid=$!
 
 # 先忽略 TERM，才能在向整组发 TERM（自己也在组里）之后存活下来补一发 KILL。
+if timeout_watchdog_enabled; then
 ( trap "" TERM
   sleep "${timeout_seconds}"
   echo "[dev] 后台进程运行超过 ${timeout_seconds}s，回收进程组 $$。"
@@ -64,6 +69,7 @@ child_pid=$!
   sleep 5
   kill -KILL -- "-$$" 2>/dev/null || true
 ) &
+fi
 
 wait "${child_pid}"
 kill -KILL -- "-$$" 2>/dev/null || true
@@ -142,7 +148,9 @@ if [[ -z "${server_pid}" ]] || ! kill -0 "${server_pid}" 2>/dev/null; then
 fi
 
 echo "Dev server started (PID: ${server_pid})."
-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__/vite/scripts/prepare-node-modules.sh

@@ -0,0 +1,212 @@
+#!/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"
+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
+}
+
+release_lock() {
+  local owner_pid=""
+  [ -f "$LOCK_DIR/pid" ] || return 0
+  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
+printf '%s\n' "$$" > "$LOCK_DIR/pid"
+trap release_lock 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
+}
+
+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
+}
+
+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"
+  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/cli.js

@@ -2114,7 +2114,7 @@ const EventBuilder = {
 };
 
 var name = "@coze-arch/cli";
-var version = "0.1.5";
+var version = "0.1.7";
 var description = "coze coding devtools cli";
 var license = "MIT";
 var author = "fanwenjie.fe@bytedance.com";
@@ -9883,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);
   }
@@ -9903,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}` : '',
     ]
@@ -10132,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(
@@ -10141,7 +10161,7 @@ const installDependenciesStep = ctx => {
       }
     }
   } catch (error) {
-    // 捕获 pnpm install 失败的情况
+    // 捕获依赖准备失败的情况
     installSuccess = false;
     installErrorCode = 1;
     installErrorType = 'execution_failed';
@@ -10228,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');
@@ -10340,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',
@@ -11626,6 +11648,7 @@ function _optionalChain$9(ops) { let lastAccessLHS = undefined; let value = ops[
 
 
 
+
 
 
 const getDeployParentOptions = (command) =>
@@ -11689,6 +11712,106 @@ const resolveCozeAccountId = async (
   }
 };
 
+const RESOURCE_FIELDS = [
+  'cpu',
+  'memory_mb',
+  'max_instance',
+  'max_concurrency',
+] ;
+
+
+
+
+
+
+const CPU_MEMORY_PAIRS = new Map([
+  [1, 2048],
+  [4, 8192],
+  [8, 16384],
+  [16, 32768],
+]);
+
+const INVALID_JSON = Symbol('invalid-deploy-config-json');
+
+const invalidDeployConfig = (
+  message,
+  details,
+) => new CliError(message, 'INVALID_DEPLOY_CONFIG', details);
+
+const requireInteger = (
+  value,
+  field,
+) => {
+  if (!Number.isInteger(value)) {
+    throw invalidDeployConfig(`deploy_config.${field} must be an integer.`, { field, value });
+  }
+  return value ;
+};
+
+const parseDeployConfigOverride = (
+  value,
+) => {
+  if (value === undefined) {
+    return undefined;
+  }
+
+  const parsed = safeJsonParse(value, INVALID_JSON);
+  if (parsed === INVALID_JSON) {
+    throw invalidDeployConfig('--deploy-config must be a valid JSON object.');
+  }
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    throw invalidDeployConfig('--deploy-config must be a JSON object.');
+  }
+
+  const object = parsed ;
+  const unknownFields = Object.keys(object).filter(
+    field => !RESOURCE_FIELDS.includes(field ),
+  );
+  const missingFields = RESOURCE_FIELDS.filter(field => !(field in object));
+  if (unknownFields.length > 0 || missingFields.length > 0) {
+    throw invalidDeployConfig(
+      '--deploy-config must contain exactly cpu, memory_mb, max_instance, and max_concurrency.',
+      { missing_fields: missingFields, unknown_fields: unknownFields },
+    );
+  }
+
+  const cpu = requireInteger(object.cpu, 'cpu');
+  const memoryMb = requireInteger(object.memory_mb, 'memory_mb');
+  const maxInstance = requireInteger(object.max_instance, 'max_instance');
+  const maxConcurrency = requireInteger(object.max_concurrency, 'max_concurrency');
+  if (CPU_MEMORY_PAIRS.get(cpu) !== memoryMb) {
+    throw invalidDeployConfig(
+      'deploy_config cpu and memory_mb must use one of: 1/2048, 4/8192, 8/16384, or 16/32768.',
+      { cpu, memory_mb: memoryMb },
+    );
+  }
+  if (maxInstance < 1 || maxInstance > 100) {
+    throw invalidDeployConfig('deploy_config.max_instance must be between 1 and 100.', {
+      max_instance: maxInstance,
+    });
+  }
+  if (maxConcurrency < 10 || maxConcurrency > 1000) {
+    throw invalidDeployConfig('deploy_config.max_concurrency must be between 10 and 1000.', {
+      max_concurrency: maxConcurrency,
+    });
+  }
+
+  return {
+    cpu,
+    memory_mb: memoryMb,
+    max_instance: maxInstance,
+    max_concurrency: maxConcurrency,
+  };
+};
+
+const applyDeployConfigOverride = (
+  config,
+  override,
+) =>
+  override
+    ? { ...config, deploy_config: { ...config.deploy_config, ...override } }
+    : config;
+
 const getCreateDeployConfig = (config) => ({
   deploy_config: {
     cpu: config.deploy_config.cpu,
@@ -13380,6 +13503,10 @@ const registerDeploy = (deploy) => {
       collectConnectorId,
       [],
     )
+    .option(
+      '--deploy-config <json>',
+      'Deployment resources as JSON: cpu, memory_mb, max_instance, max_concurrency',
+    )
     .option('--wait', 'Wait for deployment completion')
     .option('--yes', 'Confirm deployment')
     // eslint-disable-next-line @coze-arch/max-line-per-function -- deployment orchestration is one auditable flow
@@ -13387,6 +13514,7 @@ const registerDeploy = (deploy) => {
       const runtime = await getRuntime(command);
       const sourceRoot = node_path.resolve(runtime.cwd, options.sourceRoot || '.');
       const requestedApplicationType = parseApplicationType(options.applicationType);
+      const deployConfigOverride = parseDeployConfigOverride(options.deployConfig);
       runtime.output.debug(`[deploy] Reading local project: ${sourceRoot}`);
       const localContext =
         await readDeployLocalContext(
@@ -13467,10 +13595,13 @@ const registerDeploy = (deploy) => {
         ...(isPagesDeployment ? { application_type: 'pages'  } : {}),
         ...(cozeFileContent ? { coze_file_content: cozeFileContent } : {}),
       });
-      const config = withRequestedApplicationType(
-        serverConfig,
-        requestedApplicationType,
-        Boolean(appId),
+      const config = applyDeployConfigOverride(
+        withRequestedApplicationType(
+          serverConfig,
+          requestedApplicationType,
+          Boolean(appId),
+        ),
+        deployConfigOverride,
       );
       const applicationType = config.application_type;
       const connectorConfigs = getConnectorConfigs(options.connectorId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coze-arch/cli",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "private": false,
   "description": "coze coding devtools cli",
   "license": "MIT",
@@ -94,4 +94,4 @@
       "coze-dev": "bin/main"
     }
   }
-}
+}

package/lib/__templates__/nextjs/.babelrc

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