@coze-arch/cli 0.0.36-alpha.2c0689 → 0.0.36-alpha.3ab612

package/README.md

@@ -69,7 +69,9 @@ build_win = ["powershell.exe", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Fil
 
 ## 部署
 
-`coze-dev deploy` 内置于同一 CLI，登录态默认保存在 `~/.coze/cli/config.json`：
+`coze-dev deploy` 内置于同一 CLI。认证优先读取
+`~/.coze/desktop/runtime.beta.json`，其次读取 `~/.coze/desktop/runtime.json`；
+桌面 Token 不可用时再回退到 `COZE_API_TOKEN` 和 `~/.coze/cli/config.json` 登录态：
 
 ```bash
 coze-dev deploy auth login

package/docs/deploy.md

@@ -1,7 +1,14 @@
 # coze-dev deploy
 
-`coze-dev` 内置的部署命令，复用主 Coze CLI 保存在
-`~/.coze/cli/config.json` 中的登录状态。
+`coze-dev` 内置的部署命令。认证凭据按以下优先级读取：
+
+1. `~/.coze/desktop/runtime.beta.json` 的 `patToken.accessToken`
+2. `~/.coze/desktop/runtime.json` 的 `patToken.accessToken`
+3. 非空环境变量 `COZE_API_TOKEN`
+4. 主 Coze CLI 保存在 `~/.coze/cli/config.json` 中的登录状态
+
+桌面运行时文件不存在、不可读、JSON 无效或 Token 字段缺失、为空时，CLI
+静默尝试下一来源，不输出或持久化 Token。
 
 ## 安装与运行
 

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

@@ -16,7 +16,12 @@ EXPO_HOST="0.0.0.0"
 EXPO_DIR="expo"
 # DEPLOY_RUN_PORT 是平台注入的对外端口，EXPO_PORT 保留为本地覆盖项。
 EXPO_PORT="${DEPLOY_RUN_PORT:-${EXPO_PORT:-<%= port %>}}"
-WEB_URL="${COZE_PROJECT_DOMAIN_DEFAULT:-http://127.0.0.1:${SERVER_PORT}}"
+COZE_HARDWARE_DID="${COZE_HARDWARE_DID:-}"
+if [ -n "${EXPO_PORT:-}" ] && [ -n "${COZE_HARDWARE_DID}" ]; then
+  WEB_URL="${COZE_PROJECT_DOMAIN_DEFAULT:-https://cozedaemon-${COZE_HARDWARE_DID}-${EXPO_PORT}.dev.coze.site}"
+else
+  WEB_URL="${COZE_PROJECT_DOMAIN_DEFAULT:-http://127.0.0.1:${SERVER_PORT}}"
+fi
 ASSUME_YES="1"
 EXPO_PUBLIC_BACKEND_BASE_URL="${EXPO_PUBLIC_BACKEND_BASE_URL:-$WEB_URL}"
 EXPO_PUBLIC_COZE_PROJECT_ID="${COZE_PROJECT_ID:-}"

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

@@ -14,22 +14,42 @@ DEPLOY_RUN_PORT="${DEPLOY_RUN_PORT:-${PORT}}"
 
 cd "${COZE_WORKSPACE_PATH}"
 
+list_port_pids() {
+    local port=$1
+    local pids=""
+    local has_tool=0
+
+    if command -v ss >/dev/null 2>&1; then
+      has_tool=1
+      pids=$(ss -H -lntp 2>/dev/null | awk -v port="${port}" '$4 ~ ":"port"$"' | grep -o 'pid=[0-9]*' | cut -d= -f2 | sort -u | paste -sd' ' - || true)
+    fi
+    if [[ -z "${pids}" ]] && command -v lsof >/dev/null 2>&1; then
+      has_tool=1
+      pids=$(lsof -t -iTCP:"${port}" -sTCP:LISTEN 2>/dev/null | sort -u | paste -sd' ' - || true)
+    fi
+    if [[ "${has_tool}" -eq 0 ]]; then
+      echo "Warning: neither ss nor lsof available, cannot inspect port ${port}." >&2
+    fi
+
+    echo "${pids}"
+}
+
 kill_port_if_listening() {
     local pids
-    pids=$(ss -H -lntp 2>/dev/null | awk -v port="${DEPLOY_RUN_PORT}" '$4 ~ ":"port"$"' | grep -o 'pid=[0-9]*' | cut -d= -f2 | paste -sd' ' - || true)
+    pids=$(list_port_pids "${DEPLOY_RUN_PORT}")
     if [[ -z "${pids}" ]]; then
       echo "Port ${DEPLOY_RUN_PORT} is free."
       return
     fi
     echo "Port ${DEPLOY_RUN_PORT} in use by PIDs: ${pids} (SIGKILL)"
-    echo "${pids}" | xargs -I {} kill -9 {}
+    echo "${pids}" | xargs -I {} kill -9 {} || true
     sleep 1
-    pids=$(ss -H -lntp 2>/dev/null | awk -v port="${DEPLOY_RUN_PORT}" '$4 ~ ":"port"$"' | grep -o 'pid=[0-9]*' | cut -d= -f2 | paste -sd' ' - || true)
+    pids=$(list_port_pids "${DEPLOY_RUN_PORT}")
     if [[ -n "${pids}" ]]; then
-      echo "Warning: port ${DEPLOY_RUN_PORT} still busy after SIGKILL, PIDs: ${pids}"
-    else
-      echo "Port ${DEPLOY_RUN_PORT} cleared."
+      echo "端口 ${DEPLOY_RUN_PORT} 被 PID ${pids} 占用且无法清理（SIGKILL 后仍在监听），dev server 无法启动。" >&2
+      exit 1
     fi
+    echo "Port ${DEPLOY_RUN_PORT} cleared."
 }
 
 <% if (process.env.NODE_ENV === 'test') { %>
@@ -44,8 +64,6 @@ LOG_DIR="${COZE_LOG_DIR:-${COZE_WORKSPACE_PATH}/logs}"
 LOG_FILE="${LOG_DIR}/server.log"
 PID_FILE="${LOG_DIR}/server.pid"
 
-# coze-daemon 会在 runtime shell 退出时清理原进程组。
-# 通过 Node detached spawn 创建独立 session/进程组，并将 stdio 直接写入日志。
 spawn_detached() {
   local cwd="$1"
   local log_file="$2"
@@ -87,6 +105,89 @@ stop_detached() {
   kill -KILL -- "-${pid}" 2>/dev/null || true
 }
 
+READY_RETRIES=10
+READY_PROBE_HOSTS=("127.0.0.1" "::1")
+LOG_TAIL_LINES=40
+
+dump_log() {
+  echo "---- tail -n ${LOG_TAIL_LINES} ${LOG_FILE} ----" >&2
+  tail -n "${LOG_TAIL_LINES}" "${LOG_FILE}" >&2 || true
+  echo "---- end of ${LOG_FILE} ----" >&2
+}
+
+# 仅用于无 ss/lsof 时的兜底探测。服务可能只 bind IPv4 loopback、只 bind IPv6 loopback
+# （server.listen(port, 'localhost') 会变成 ::1 独占），或 bind 双栈通配地址，
+port_connectable() {
+  local port=$1
+  local host
+  for host in "${READY_PROBE_HOSTS[@]}"; do
+    if command -v nc >/dev/null 2>&1; then
+      if nc -z -w 1 "${host}" "${port}" >/dev/null 2>&1; then
+        return 0
+      fi
+    elif (exec 3<>"/dev/tcp/${host}/${port}") >/dev/null 2>&1; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+port_probe_available() {
+  command -v ss >/dev/null 2>&1 || command -v lsof >/dev/null 2>&1
+}
+
+# 端口监听者是否属于本进程组：spawn detached 后 PID == PGID，子孙进程继承该 PGID。
+#   0 = 是；1 = 不是（无人监听，或监听者不属于本进程组）；2 = 无探测工具，无法判断
+port_listened_by_pgid() {
+  local port=$1 pgid=$2
+  local listener owner
+
+  if ! port_probe_available; then
+    return 2
+  fi
+
+  for listener in $(list_port_pids "${port}" 2>/dev/null); do
+    owner=$(ps -o pgid= -p "${listener}" 2>/dev/null | tr -d ' ')
+    if [[ "${owner}" == "${pgid}" ]]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+wait_for_ready() {
+  local pid=$1 port=$2
+  local attempt=0 owned
+
+  if ! port_probe_available; then
+    echo "Warning: 缺少 ss 与 lsof，无法确认端口监听者归属，仅按 loopback 可连接性判断就绪。" >&2
+  fi
+
+  while [[ "${attempt}" -lt "${READY_RETRIES}" ]]; do
+    if ! kill -0 "${pid}" 2>/dev/null; then
+      echo "Dev server 进程在启动过程中退出。" >&2
+      return 1
+    fi
+
+    if port_listened_by_pgid "${port}" "${pid}"; then
+      owned=0
+    else
+      owned=$?
+    fi
+    if [[ "${owned}" -eq 0 ]]; then
+      return 0
+    fi
+    if [[ "${owned}" -eq 2 ]] && port_connectable "${port}"; then
+      return 0
+    fi
+
+    sleep 1
+    attempt=$((attempt + 1))
+  done
+
+  return 2
+}
+
 # 监听端口的是孙进程（pnpm -> tsx -> node），只清端口会漏掉上层 pnpm/tsx，
 # 所以先按上次记录的 PID 把整个进程组回收掉。
 if [[ -f "${PID_FILE}" ]]; then
@@ -104,17 +205,33 @@ 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)"
+if [[ -z "${server_pid}" ]]; then
+  echo "Dev server failed to start: 未获取到后台进程 PID。" >&2
+  dump_log
+  exit 1
+fi
 echo "${server_pid}" > "${PID_FILE}"
 
-sleep 1
-if [[ -z "${server_pid}" ]] || ! kill -0 "${server_pid}" 2>/dev/null; then
+if wait_for_ready "${server_pid}" "${DEPLOY_RUN_PORT}"; then
+  ready_status=0
+else
+  ready_status=$?
+fi
+
+if [[ "${ready_status}" -eq 2 ]]; then
+  # 进程还活着但迟迟没监听端口：多半是编译/运行时报错后 tsx watch 驻留，日志里有真正原因。
+  echo "Dev server 在 ${READY_RETRIES} 次探测（每次 1s）内未就绪于端口 ${DEPLOY_RUN_PORT}（进程 ${server_pid} 仍在运行）。" >&2
+  dump_log
+  exit 1
+elif [[ "${ready_status}" -ne 0 ]]; then
   echo "Dev server failed to start. See ${LOG_FILE}." >&2
-  tail -n 20 "${LOG_FILE}" >&2 || true
+  dump_log
+  stop_detached "${server_pid}"
   rm -f "${PID_FILE}"
   exit 1
 fi
 
-echo "Dev server started (PID: ${server_pid})."
+echo "Dev server started (PID: ${server_pid}), listening on port ${DEPLOY_RUN_PORT}."
 echo "Log file: ${LOG_FILE}"
 echo "PID file: ${PID_FILE}"
 <% } %>