@alipay/alipay-aipay 1.0.2 → 1.2.2

package/skill/references/onboarding/modules/scripts/auth.sh

@@ -9,9 +9,9 @@
 #   auth confirm [--scope <scope> --sales-code <code> --mcc-code <code> --product-name <name> --mcc-name <name>]
 #   auth mismatch [--scope <scope> --sales-code <code> --mcc-code <code> --product-name <name> --mcc-name <name>]
 # 返回值:
-#   init:     AUTH_FLOW:SKIP | AUTH_FLOW:READY
+#   init:     AUTH_FLOW:SKIP | AUTH_FLOW:READY | AUTH_FLOW:SCOPE_MISMATCH | AUTH_FLOW:MCC_MISMATCH | AUTH_FLOW:FAILED
 #   confirm:  AUTH_FLOW:AUTH_SUCCESS | AUTH_FLOW:PENDING | AUTH_FLOW:EXPIRED | AUTH_FLOW:SCOPE_MISMATCH | AUTH_FLOW:MCC_MISMATCH | AUTH_FLOW:FAILED
-#   mismatch: 执行 logout → 调用 auth init 重新生成授权链接（不输出 FLOW 标记，由 auth init 输出 AUTH_FLOW:READY）
+#   mismatch: 执行一次 logout 后调用 auth init 重新生成授权链接（不输出 FLOW 标记，由 auth init 输出 AUTH_FLOW:READY）
 #=============================================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -194,6 +194,123 @@ run_json_command() {
   return 1
 }
 
+# 校验当前登录会话是否覆盖目标产品 scope 和 MCC。
+# 可复用调用方已经取得的 whoami JSON，避免重复查询。
+validate_current_authorization() {
+  local whoami_result="${1:-}"
+  local logged_in is_expired granted_scope required_scope
+  local scope_match mcc_verify_result mcc_verify_unwrapped mcc_match
+  local mcc_error_type mcc_error_code mcc_success
+  local granted_scope_item
+  local -a granted_scope_items
+
+  if [ -z "$SALES_CODE" ] || [ -z "$MCC_CODE" ]; then
+    echo "❌ 缺少授权校验参数"
+    echo "AUTH_FLOW:FAILED"
+    return 1
+  fi
+
+  if [ -z "$whoami_result" ]; then
+    whoami_result=$(run_json_command "alipay-cli whoami --json" alipay-cli whoami --json) || {
+      echo "AUTH_FLOW:FAILED"
+      return 1
+    }
+  fi
+
+  if ! handle_error "$whoami_result"; then
+    echo "AUTH_FLOW:FAILED"
+    return 1
+  fi
+
+  logged_in=$(echo "$whoami_result" | jq -r '.data.logged_in // false')
+  is_expired=$(echo "$whoami_result" | jq -r '.data.is_expired // false')
+  if [ "$logged_in" != "true" ] || [ "$is_expired" = "true" ]; then
+    echo "❌ 当前登录状态无效或已过期"
+    echo "AUTH_FLOW:FAILED"
+    return 1
+  fi
+
+  granted_scope=$(echo "$whoami_result" | jq -r '.data.scope // empty')
+  case "$SALES_CODE" in
+    "I1080300001000041203") required_scope="fast_instant_trade_pay:write" ;;
+    "I1080300001000041313") required_scope="auth_alipay_apppay:write" ;;
+    "I1080300001000160457") required_scope="machine_pay:write" ;;
+    *)
+      echo "❌ 未知产品码: $SALES_CODE"
+      echo "AUTH_FLOW:FAILED"
+      return 1
+      ;;
+  esac
+
+  scope_match="false"
+  IFS=',' read -r -a granted_scope_items <<< "$granted_scope"
+  for granted_scope_item in "${granted_scope_items[@]}"; do
+    granted_scope_item="${granted_scope_item#"${granted_scope_item%%[![:space:]]*}"}"
+    granted_scope_item="${granted_scope_item%"${granted_scope_item##*[![:space:]]}"}"
+    if [ "$granted_scope_item" = "$required_scope" ]; then
+      scope_match="true"
+      break
+    fi
+  done
+
+  mcc_match="true"
+  if [ "$scope_match" = "true" ]; then
+    mcc_verify_result=$(run_json_command "alipay-cli mcp call ar-query.queryArInfosBySalesProd" \
+      alipay-cli mcp call ar-query.queryArInfosBySalesProd \
+      -d "{\"request\":{\"salesProductCodes\":[\"${SALES_CODE}\"]},\"ctx\":{}}" \
+      --json) || {
+      echo "AUTH_FLOW:FAILED"
+      return 1
+    }
+
+    mcc_verify_unwrapped=$(unwrap_mcp "$mcc_verify_result")
+    mcc_error_type=$(detect_error "$mcc_verify_result")
+    if [ "$mcc_error_type" = "AUTH_MISMATCH" ]; then
+      mcc_match="false"
+    elif [ "$mcc_error_type" != "SUCCESS" ]; then
+      echo "❌ MCC 校验失败"
+      echo "AUTH_FLOW:FAILED"
+      return 1
+    fi
+
+    # 保留对非标准错误响应的兼容，只在后端明确返回 MCC 未授权时判定不匹配。
+    mcc_error_code=$(echo "$mcc_verify_unwrapped" | jq -r '.errorCode // .data.errorCode // ""' 2>/dev/null)
+    mcc_success=$(echo "$mcc_verify_unwrapped" | jq -r '.success // "null"' 2>/dev/null)
+    if [ "$mcc_success" = "false" ] && [ -n "$mcc_error_code" ] && \
+       echo "$mcc_verify_unwrapped" | jq -r '.errorMessage // .data.errorMessage // .error.message // ""' 2>/dev/null | grep -qi "mccCode.*is not auth"; then
+      mcc_match="false"
+    elif echo "$mcc_verify_unwrapped" | grep -qi "mccCode.*is not auth"; then
+      mcc_match="false"
+    fi
+  fi
+
+  if [ "$scope_match" = "true" ] && [ "$mcc_match" = "true" ]; then
+    echo "✅ 授权范围校验通过（scope + MCC）"
+    return 0
+  fi
+
+  echo ""
+  echo "⚠️ 授权范围不满足"
+  if [ "$scope_match" != "true" ]; then
+    echo "📋 原因：scope 权限不满足"
+    echo "🤖 需要权限: $required_scope"
+    echo "🤖 已授权 scope: $granted_scope"
+  fi
+  if [ "$mcc_match" != "true" ]; then
+    echo "📋 原因：经营类目未授权"
+    echo "🤖 当前类目: $MCC_CODE"
+  fi
+
+  echo ""
+  echo "📋 必须通过 auth.sh mismatch 退出当前登录并重新授权"
+  if [ "$scope_match" != "true" ]; then
+    echo "AUTH_FLOW:SCOPE_MISMATCH"
+  else
+    echo "AUTH_FLOW:MCC_MISMATCH"
+  fi
+  return 1
+}
+
 # ─── auth init: 检查登录状态 + 执行登录 + 构建授权链接 + 输出授权信息 ────────
 auth_init() {
   SCOPE=""
@@ -230,26 +347,42 @@ auth_init() {
   fi
 
   # Step 1: 检查登录状态
-  CHECK_RESULT=$(run_json_command "alipay-cli whoami --json" alipay-cli whoami --json) || exit 1
+  CHECK_RESULT=$(run_json_command "alipay-cli whoami --json" alipay-cli whoami --json) || {
+    echo "AUTH_FLOW:FAILED"
+    return 1
+  }
+  if ! handle_error "$CHECK_RESULT"; then
+    echo "AUTH_FLOW:FAILED"
+    return 1
+  fi
   LOGGED_IN=$(echo "$CHECK_RESULT" | jq -r '.data.logged_in // false')
   IS_EXPIRED=$(echo "$CHECK_RESULT" | jq -r '.data.is_expired // false')
 
   if [ "$LOGGED_IN" = "true" ] && [ "$IS_EXPIRED" = "false" ]; then
+    validate_current_authorization "$CHECK_RESULT" || return 1
     DEVICE_CODE=""
     save_auth_state
-    echo "✅ 已处于登录状态，可继续后续流程"
+    echo "✅ 当前登录及授权范围有效，可继续后续流程"
     echo "AUTH_FLOW:SKIP"
     return 0
   fi
 
   # Step 2: 执行登录
-  LOGIN_RESULT=$(run_json_command "alipay-cli login --non-interactive --scope" alipay-cli login --non-interactive --scope "$SCOPE" --json) || exit 1
+  LOGIN_RESULT=$(run_json_command "alipay-cli login --non-interactive --scope" alipay-cli login --non-interactive --scope "$SCOPE" --json) || {
+    echo "AUTH_FLOW:FAILED"
+    return 1
+  }
+  if ! handle_error "$LOGIN_RESULT"; then
+    echo "AUTH_FLOW:FAILED"
+    return 1
+  fi
   LOGIN_STATUS=$(echo "$LOGIN_RESULT" | jq -r '.data.status // ""')
 
   if [ "$LOGIN_STATUS" = "already_logged_in" ]; then
+    validate_current_authorization || return 1
     DEVICE_CODE=""
     save_auth_state
-    echo "✅ 已处于登录状态，可继续后续流程"
+    echo "✅ 当前登录及授权范围有效，可继续后续流程"
     echo "AUTH_FLOW:SKIP"
     return 0
   fi
@@ -269,8 +402,21 @@ auth_init() {
     exit 1
   fi
 
-  # Step 5: 构建授权链接（禁止使用 CLI 返回的 verification_url）
-  BROWSER_URL="https://aipay.alipay.com/cli-auth?deviceCode=${DEVICE_CODE}&productCode=${SALES_CODE}&mccCode=${MCC_CODE}&platform=${DEV_TOOL_NAME}"
+  # Step 5: 构建并校验授权链接（禁止使用 CLI 返回的 verification_url）
+  BROWSER_URL="https://aipay.alipay.com/cli-auth?deviceCode=${DEVICE_CODE}&productCode=${SALES_CODE}&mccCode=${MCC_CODE}"
+  if [ -n "${DEV_TOOL_NAME:-}" ] && [ "$DEV_TOOL_NAME" != "unknown" ]; then
+    AUTH_PLATFORM=$(jq -nr --arg value "$DEV_TOOL_NAME" '$value|@uri')
+    BROWSER_URL="${BROWSER_URL}&platform=${AUTH_PLATFORM}"
+  fi
+  if [[ "$BROWSER_URL" != https://aipay.alipay.com/cli-auth\?* ]] ||
+     [[ "$BROWSER_URL" != *"deviceCode=${DEVICE_CODE}"* ]] ||
+     [[ "$BROWSER_URL" != *"productCode=${SALES_CODE}"* ]] ||
+     [[ "$BROWSER_URL" != *"mccCode=${MCC_CODE}"* ]] ||
+     [[ "$BROWSER_URL" == *"opengw.alipay.com/oauth/device"* ]]; then
+    echo "❌ 授权链接构建失败，缺少必要参数或误用了 CLI verification_url，已停止。"
+    echo "📋 正确格式: https://aipay.alipay.com/cli-auth?deviceCode=...&productCode=...&mccCode=..."
+    exit 1
+  fi
 
   # Step 6: 保存参数到状态文件（供 confirm/mismatch 使用）
   save_auth_state
@@ -304,7 +450,8 @@ auth_init() {
   echo ""
   echo "⚠️ 安全提示：请核对授权页面显示的确认码是否与上方一致，如不一致，请勿授权，立即停止操作！"
   echo ""
-  echo "🌐 授权链接：[点击跳转进行授权](${BROWSER_URL})（无法跳链时，请复制链接到网页浏览器打开）"
+  echo "提示：无法跳链时，请复制下方链接到网页浏览器打开。"
+  echo "🌐 授权链接：[点击跳转进行授权](${BROWSER_URL})"
   echo ""
   echo "请在完成授权后告诉我\"好了\"继续后续流程。"
   echo ""
@@ -349,103 +496,29 @@ auth_confirm() {
     echo "AUTH_FLOW:EXPIRED"
     return 0
   else
-    echo "❌ 授权确认失败"
-    echo "$LOGIN_COMPLETE_RESULT" | jq -r '.data.error.message // .error.message // "未知错误"' 2>/dev/null
+    if handle_error "$LOGIN_COMPLETE_RESULT"; then
+      echo "❌ 授权确认失败：返回结果未包含可识别的完成状态"
+    fi
     cleanup_auth_state
     echo "AUTH_FLOW:FAILED"
     return 1
   fi
 
-  # Step 3: Scope 权限校验
+  # Step 3: 复用 init 的 scope + MCC 校验
   WHOAMI_RESULT=$(run_json_command "alipay-cli whoami --json" alipay-cli whoami --json) || {
     echo "AUTH_FLOW:FAILED"
     return 1
   }
-  GRANTED_SCOPE=$(echo "$WHOAMI_RESULT" | jq -r '.data.scope // empty')
-
-  case "$SALES_CODE" in
-    "I1080300001000041203") REQUIRED_SCOPE="fast_instant_trade_pay:write" ;;
-    "I1080300001000041313") REQUIRED_SCOPE="auth_alipay_apppay:write" ;;
-    "I1080300001000160457") REQUIRED_SCOPE="machine_pay:write" ;;
-    *) echo "❌ 未知产品码: $SALES_CODE"; return 1 ;;
-  esac
-
-  SCOPE_MATCH="false"
-  if echo "$GRANTED_SCOPE" | grep -Fq "$REQUIRED_SCOPE"; then
-    SCOPE_MATCH="true"
-  fi
-
-  # Step 4: MCC 一致性校验
-  MCC_VERIFY_RESULT=$(run_json_command "alipay-cli mcp call ar-query.queryArInfosBySalesProd" \
-    alipay-cli mcp call ar-query.queryArInfosBySalesProd \
-    -d "{\"request\":{\"salesProductCodes\":[\"${SALES_CODE}\"]},\"ctx\":{}}" \
-    --json) || {
-    echo "AUTH_FLOW:FAILED"
-    return 1
-  }
-
-  # 先解包 MCP 信封再精确解析
-  MCC_VERIFY_UNWRAPPED=$(unwrap_mcp "$MCC_VERIFY_RESULT")
-
-  MCC_MATCH="true"
-  MCC_ERROR_TYPE=$(detect_error "$MCC_VERIFY_RESULT")
-  if [ "$MCC_ERROR_TYPE" = "AUTH_MISMATCH" ]; then
-    MCC_MATCH="false"
-  elif [ "$MCC_ERROR_TYPE" != "SUCCESS" ]; then
-    echo "❌ MCC 校验失败"
-    echo "AUTH_FLOW:FAILED"
-    return 1
-  fi
-
-  # 精确解析 errorCode 字段判断 MCC 授权异常，避免 grep 全文匹配误判
-  MCC_ERROR_CODE=$(echo "$MCC_VERIFY_UNWRAPPED" | jq -r '.errorCode // .data.errorCode // ""' 2>/dev/null)
-  MCC_SUCCESS=$(echo "$MCC_VERIFY_UNWRAPPED" | jq -r '.success // "null"' 2>/dev/null)
-  # 优先路径：success=false 且 errorCode 存在，且 errorMessage 精确包含 mccCode is not auth
-  # 这条路径确保仅在后端明确返回授权类错误时才判定为 MCC 不匹配，避免正常数据误触发
-  if [ "$MCC_SUCCESS" = "false" ] && [ -n "$MCC_ERROR_CODE" ] && echo "$MCC_VERIFY_UNWRAPPED" | jq -r '.errorMessage // .data.errorMessage // .error.message // ""' 2>/dev/null | grep -qi "mccCode.*is not auth"; then
-    MCC_MATCH="false"
-  # 兜底路径：解包后的全文包含 "mccCode is not auth"（覆盖非 JSON 格式的错误响应）
-  elif echo "$MCC_VERIFY_UNWRAPPED" | grep -qi "mccCode.*is not auth"; then
-    MCC_MATCH="false"
-  fi
-
-  # Step 5: 判断校验结果
-  if [ "$SCOPE_MATCH" = "true" ] && [ "$MCC_MATCH" = "true" ]; then
-    echo "✅ 授权范围校验通过（scope + MCC）"
-    cleanup_auth_state
-    echo "AUTH_FLOW:AUTH_SUCCESS"
-    return 0
-  fi
-
-  # Step 6: 校验不通过，输出原因
-  echo ""
-  echo "⚠️ 授权范围不满足，正在退出登录..."
-
-  if [ "$SCOPE_MATCH" != "true" ]; then
-    echo "📋 原因：scope 权限不满足"
-    echo "🤖 需要权限: $REQUIRED_SCOPE"
-    echo "🤖 已授权 scope: $GRANTED_SCOPE"
-  fi
-  if [ "$MCC_MATCH" != "true" ]; then
-    echo "📋 原因：经营类目未授权"
-    echo "🤖 当前类目: $MCC_CODE"
-  fi
-
-  LOGOUT_RESULT=$(export PLATFORM=${DEV_TOOL_NAME} && alipay-cli logout --json 2>/dev/null)
-  echo "✅ 已退出当前登录"
-  echo ""
-  echo "📋 需要重新执行授权流程"
-
-  if [ "$SCOPE_MATCH" != "true" ]; then
-    echo "AUTH_FLOW:SCOPE_MISMATCH"
-  else
-    echo "AUTH_FLOW:MCC_MISMATCH"
-  fi
-  return 1
+  validate_current_authorization "$WHOAMI_RESULT" || return 1
+  cleanup_auth_state
+  echo "AUTH_FLOW:AUTH_SUCCESS"
+  return 0
 }
 
-# ─── auth mismatch: 授权范围不满足 → logout + 重新授权 ───────────────────────
+# ─── auth mismatch: 授权范围不满足 → logout → 重新授权 ──────────────────────
 auth_mismatch() {
+  local logout_result logout_error_type
+
   # 优先使用显式传入的非敏感上下文；未传时再从状态文件兜底恢复。
   restore_auth_context_or_state "$@" || exit 1
 
@@ -454,19 +527,28 @@ auth_mismatch() {
     return 1
   fi
 
-  echo "⚠️ 授权范围不满足，正在退出登录..."
-
-  # Step 1: 退出登录
-  LOGOUT_RESULT=$(export PLATFORM=${DEV_TOOL_NAME} && alipay-cli logout --json 2>/dev/null)
-  echo "📋 已退出当前登录"
-
-  # Step 2: 根据 salesCode 构造正确的 scope
+  # Step 1: 根据 salesCode 构造正确的 scope；目标无效时不退出当前登录。
   SCOPE=$(get_scope "$SALES_CODE")
   if [ -z "$SCOPE" ]; then
     echo "❌ 未知产品码: $SALES_CODE"
     return 1
   fi
 
+  # Step 2: mismatch 是授权不匹配恢复路径中唯一执行 logout 的入口。
+  echo "⚠️ 授权范围不满足，正在退出当前登录并准备重新授权..."
+  logout_result=$(run_json_command "alipay-cli logout --json" alipay-cli logout --json) || {
+    echo "❌ 退出当前登录失败，已停止重新授权"
+    echo "AUTH_FLOW:FAILED"
+    return 1
+  }
+  logout_error_type=$(detect_error "$logout_result")
+  if [ "$logout_error_type" != "SUCCESS" ]; then
+    echo "❌ 退出当前登录失败，已停止重新授权"
+    echo "AUTH_FLOW:FAILED"
+    return 1
+  fi
+  echo "✅ 已退出当前登录"
+
   # Step 3: 调用 auth init 执行登录 + 构建授权链接 + 输出授权信息
   # DEV_TOOL_NAME 已 export，子进程可继承
   echo "📋 请重新扫码授权，新的授权将包含正确的权限范围"

package/skill/references/onboarding/modules/scripts/error_handler.sh

@@ -23,9 +23,87 @@ fi
 #   { "content": [ { "text": "<业务JSON>", "type": "text" } ] }
 # 业务 JSON（含 success / resultObj / errorCode）被包在 content[0].text 里。
 # 本函数负责解包：若检测到信封结构，提取 content[0].text；否则原样返回。
+# 当 stdout 混有日志时，只接受唯一可确定的 MCP 信封或 JSON；候选不唯一时
+# 保留原始文本，让后续错误检测安全阻断，禁止猜测业务响应。
 #
 # 对于非 mcp call 的命令（如 alipay-cli login / whoami），返回不带信封，
 # 保证这些命令的原样透传。
+extract_unique_json() {
+  local RAW="$1"
+  printf '%s' "$RAW" | jq -Rsc '
+    explode as $chars |
+    reduce range(0; ($chars | length)) as $index (
+      {
+        depth: 0,
+        start: null,
+        in_string: false,
+        escaped: false,
+        raw_candidates: []
+      };
+      ($chars[$index]) as $char |
+      if .depth == 0 then
+        if $char == 123 or $char == 91 then
+          .depth = 1 |
+          .start = $index |
+          .in_string = false |
+          .escaped = false
+        else
+          .
+        end
+      elif .in_string then
+        if .escaped then
+          .escaped = false
+        elif $char == 92 then
+          .escaped = true
+        elif $char == 34 then
+          .in_string = false
+        else
+          .
+        end
+      elif $char == 34 then
+        .in_string = true
+      elif $char == 123 or $char == 91 then
+        .depth += 1
+      elif $char == 125 or $char == 93 then
+        .depth -= 1 |
+        if .depth == 0 then
+          ($chars[.start:($index + 1)] | implode) as $candidate |
+          .raw_candidates += [$candidate] |
+          .start = null
+        else
+          .
+        end
+      else
+        .
+      end
+    ) |
+    [
+      .raw_candidates[] |
+      fromjson? |
+      select(type == "object" or type == "array")
+    ] |
+    unique as $candidates |
+    (
+      $candidates |
+      map(select(
+        type == "object" and
+        (.content | type) == "array" and
+        any(.content[]?; (.text? | type) == "string")
+      )) |
+      unique
+    ) as $envelopes |
+    if ($envelopes | length) == 1 then
+      {status: "ok", value: $envelopes[0]}
+    elif ($envelopes | length) == 0 and ($candidates | length) == 1 then
+      {status: "ok", value: $candidates[0]}
+    elif ($candidates | length) == 0 then
+      {status: "none"}
+    else
+      {status: "ambiguous"}
+    end
+  ' 2>/dev/null
+}
+
 unwrap_mcp() {
   local RAW="$1"
   if [ -z "$RAW" ]; then
@@ -33,17 +111,30 @@ unwrap_mcp() {
     return
   fi
 
-  if ! echo "$RAW" | jq -e . >/dev/null 2>&1; then
-    echo "$RAW"
-    return
-  fi
+  local ANALYSIS STATUS JSON
+  ANALYSIS=$(extract_unique_json "$RAW")
+  STATUS=$(echo "$ANALYSIS" | jq -r '.status // "none"' 2>/dev/null)
+  case "$STATUS" in
+    ok)
+      JSON=$(echo "$ANALYSIS" | jq -c '.value' 2>/dev/null)
+      ;;
+    ambiguous)
+      echo "CLI 输出包含多个 JSON 候选，无法唯一解析"
+      echo "$RAW"
+      return
+      ;;
+    *)
+      echo "$RAW"
+      return
+      ;;
+  esac
 
   local TEXT
-  TEXT=$(echo "$RAW" | jq -r 'if (.content | type == "array") and (.content[0].text != null) then .content[0].text else empty end' 2>/dev/null)
+  TEXT=$(echo "$JSON" | jq -r 'if (.content | type == "array") and (.content[0].text != null) then .content[0].text else empty end' 2>/dev/null)
   if [ -n "$TEXT" ]; then
     echo "$TEXT"
   else
-    echo "$RAW"
+    echo "$JSON"
   fi
 }
 
@@ -103,11 +194,36 @@ extract_error_message() {
   fi
 
   echo "$JSON" | jq -r '
-    [
-      .. | objects |
-      (.errorMessage?, .errorMsg?, .message?, (.error? | objects | .message?)) |
-      select(. != null and (tostring != ""))
-    ][0] // "未知错误"
+    if .data.success? == false then
+      [
+        .data.subMsg?,
+        .data.msg?,
+        .subMsg?,
+        .errorMessage?,
+        .errorMsg?,
+        .message?,
+        (.error? | objects | .message?),
+        .msg?,
+        (
+          .. | objects |
+          (.errorMessage?, .errorMsg?, .message?, (.error? | objects | .message?))
+        )
+      ] |
+      [
+        .[] |
+        select(
+          . != null and
+          (tostring != "") and
+          ((tostring | ascii_downcase) != "success")
+        )
+      ][0] // "未知错误"
+    else
+      [
+        .. | objects |
+        (.errorMessage?, .errorMsg?, .message?, (.error? | objects | .message?)) |
+        select(. != null and (tostring != ""))
+      ][0] // "未知错误"
+    end
   ' 2>/dev/null
 }
 
@@ -244,6 +360,8 @@ detect_error() {
 
 # ─── MCP 认证错误处理 ──────────────────────────────────────────────────────
 handle_mcp_auth_error() {
+  local LOGOUT_RESULT LOGOUT_EXIT_CODE LOGOUT_ERROR_TYPE LOGOUT_ERROR_MSG
+
   echo ""
   echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
   echo "🔐 未登录或授权已过期"
@@ -255,7 +373,22 @@ handle_mcp_auth_error() {
   echo "📋 说明：Authorization is empty（认证信息为空）"
   echo ""
   echo "🔄 正在退出当前登录..."
-  export PLATFORM=${DEV_TOOL_NAME:-unknown} && alipay-cli logout --json 2>/dev/null
+  LOGOUT_RESULT=$(PLATFORM=${DEV_TOOL_NAME:-unknown} alipay-cli logout --json 2>&1)
+  LOGOUT_EXIT_CODE=$?
+  LOGOUT_ERROR_TYPE=$(detect_error "$LOGOUT_RESULT")
+
+  if [ "$LOGOUT_EXIT_CODE" -ne 0 ] || [ "$LOGOUT_ERROR_TYPE" != "SUCCESS" ]; then
+    echo ""
+    echo "❌ 退出当前登录失败，已停止重新授权"
+    if echo "$LOGOUT_RESULT" | jq -e . >/dev/null 2>&1; then
+      LOGOUT_ERROR_MSG=$(extract_error_message "$LOGOUT_RESULT")
+      echo "📋 错误信息：$LOGOUT_ERROR_MSG"
+    elif [ -n "$LOGOUT_RESULT" ]; then
+      echo "📋 错误信息：$LOGOUT_RESULT"
+    fi
+    echo "📋 请先重试退出登录；确认退出成功后再重新授权。"
+    return 1
+  fi
 
   echo ""
   echo "✅ 已退出登录状态"
@@ -265,7 +398,7 @@ handle_mcp_auth_error() {
   echo "   2. 您使用支付宝扫码授权"
   echo "   3. 授权成功后继续当前操作"
   echo ""
-  echo "请回复「继续」开始重新授权，或「退出」结束流程。"
+  echo "📌 产品、MCC 和授权范围未变化时，沿用已有确认立即重新生成授权链接；发生变化时先重新确认受影响内容。"
 }
 
 # ─── MCP 服务不可用处理 ────────────────────────────────────────────────────
@@ -322,11 +455,8 @@ handle_auth_mismatch() {
 
   echo ""
   echo ""
-
-  echo "🔄 正在退出当前登录..."
-  export PLATFORM=${DEV_TOOL_NAME:-unknown} && alipay-cli logout --json 2>/dev/null
-
-  echo "✅ 已退出登录，请重新执行登录授权流程"
+  echo "⛔ 已停止当前操作和后续调用"
+  echo "📋 请调用 auth.sh mismatch；该命令会统一退出当前登录并使用正确范围重新授权"
 }
 
 # ─── 后端业务错误处理（完整透出错误信息） ──────────────────────────────────

package/skill/references/onboarding/modules/scripts/query_sign_status.sh

@@ -2,7 +2,7 @@
 #=============================================================================
 # 脚本名称: query_sign_status.sh
 # 功能描述: 查询签约状态并根据结果判断后续流程
-# 调用位置: Step 3.1 签约状态查询
+# 调用位置: Step 3.1 状态与资源查询
 # 调用前置: 脚本通过 error_handler.sh 间接初始化 DEV_TOOL_NAME；需传入 --sales-code，或兼容使用 SALES_CODE 环境变量
 # 用法: bash query_sign_status.sh --sales-code <code> [--product-type aipay|webpay|apppay]
 # 返回值: 输出签约状态判断结果和处理建议
@@ -73,15 +73,15 @@ emit_signed_flow() {
   case "$SALES_CODE" in
     "I1080300001000041203")
       echo "FLOW:PC_WEB_SIGNED"
-      # 网站支付已生效或已提交：跳过签约提交，直接进入应用发布
+      # 网站支付已生效或已提交：Step 4 只处理应用决策，Step 5 跳过签约提交
       ;;
     "I1080300001000041313")
       echo "FLOW:APP_SIGNED"
-      # APP支付已生效或已提交：跳过签约提交，直接进入应用发布
+      # APP支付已生效或已提交：Step 4 只处理应用决策，Step 5 跳过签约提交
       ;;
     "I1080300001000160457")
       echo "FLOW:AI_PAY_SIGNED"
-      # 按量付费已生效或已提交：跳过签约提交，直接进入服务注册 + 应用发布
+      # 按量付费已生效或已提交：Step 4 处理服务/应用决策，Step 5 跳过签约提交
       ;;
   esac
 }
@@ -99,8 +99,14 @@ fi
 # 解包 MCP 信封后解析业务字段
 BUSINESS=$(unwrap_mcp "$RESULT")
 
-# 使用 // [] 安全提取数组，判断签约状态；解析失败必须阻断，避免误判为未签约
-AR_LIST=$(echo "$BUSINESS" | jq -c '.resultObj.arInfoList // []' 2>/dev/null)
+# 只有明确返回数组才可判断签约状态；缺少字段必须阻断，避免误判为未签约
+AR_LIST=$(echo "$BUSINESS" | jq -c '
+  if (.resultObj | type) == "object" and (.resultObj.arInfoList | type) == "array" then
+    .resultObj.arInfoList
+  else
+    null
+  end
+' 2>/dev/null)
 if [ -z "$AR_LIST" ] || ! echo "$AR_LIST" | jq -e 'type == "array"' >/dev/null 2>&1; then
   echo "❌ 签约状态返回结构异常，无法解析 arInfoList"
   exit 1
@@ -108,7 +114,7 @@ fi
 AR_COUNT=$(echo "$AR_LIST" | jq 'length')
 
 if [ "$AR_COUNT" -eq 0 ]; then
-  echo "📋 未签约 (NOT_SIGNED)，进入资料采集流程"
+  echo "📋 签约状态: 未签约 (NOT_SIGNED)；继续 Step 4 一次性资料与资源决策"
   echo "SIGN_STATUS=NOT_SIGNED"
 
   case "$SALES_CODE" in
@@ -122,16 +128,16 @@ if [ "$AR_COUNT" -eq 0 ]; then
       ;;
     "I1080300001000160457")
       echo "FLOW:AI_PAY_NOT_SIGNED"
-      # 按量付费未签约：跳过 Step 4，进入 Step 5.1 签约，再继续服务注册 + 应用发布
+      # 按量付费未签约：Step 4 无需页面图片，但仍完成服务/应用决策
       ;;
   esac
 else
-  # 使用 // [] 避免迭代 null 报错
+  # AR_LIST 已在上方确认为数组
   HAS_EFFECTIVE=$(echo "$AR_LIST" | jq -r '[.[] | select(.arStatus == "02")] | length')
   HAS_SUBMITTED=$(echo "$AR_LIST" | jq -r '[.[] | select(.arStatus == "01")] | length')
 
   if [ "$HAS_EFFECTIVE" -gt 0 ]; then
-    echo "✅ 已签约（已生效），跳过资料采集"
+    echo "✅ 签约已生效；无需签约材料，继续 Step 4 资源决策"
     echo "SIGN_STATUS=SIGNED_EFFECTIVE"
     emit_signed_flow
   elif [ "$HAS_SUBMITTED" -gt 0 ]; then
@@ -139,7 +145,7 @@ else
     echo "SIGN_STATUS=SIGN_SUBMITTED"
     emit_signed_flow
   else
-    echo "📋 其他签约状态，进入资料采集流程"
+    echo "📋 其他签约状态；保留已取得的只读结果并将签约分支标记为待核验"
     echo "SIGN_STATUS=OTHER_STATUS"
     echo "FLOW:OTHER_STATUS"
   fi