@alipay/alipay-aipay 1.6.8-beta3 → 1.6.8-beta4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/alipay-aipay",
-  "version": "1.6.8-beta3",
+  "version": "1.6.8-beta4",
   "description": "支付宝 AI 付接入 Skill 安装包 - 优先安装 Agent Skill，并在 macOS/Linux 后台准备用户级 CLI 工具",
   "type": "module",
   "bin": {

package/skill/VERSION

@@ -1 +1 @@
-1.6.8-beta3
+1.6.8-beta4

package/skill/references/normal/scripts/onboarding_message_runner.mjs

@@ -362,7 +362,7 @@ function mccCatalogForAgent(records) {
 
 function parseAgentCandidateRefs(args, records) {
   const raw = optional(args, 'agent-candidate-refs-json');
-  if (raw === undefined) return { provided: false, codes: [] };
+  if (raw === undefined) return { codes: [] };
   let parsed;
   try {
     parsed = JSON.parse(raw);
@@ -380,7 +380,7 @@ function parseAgentCandidateRefs(args, records) {
     }
     codes.push(refs.get(ref));
   }
-  return { provided: true, codes };
+  return { codes };
 }
 
 function mccTableSummary(records) {

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

@@ -323,6 +323,92 @@ mcc_semantic_retry_file() {
     "$(mcc_cache_component "$sales_code")"
 }
 
+mcc_agent_review_file() {
+  local product_type="$1" sales_code="$2" root scope
+  root="$(mcc_cache_root)" || return 1
+  scope="$(mcc_cache_scope_id)" || return 1
+  if [ -e "$root" ] && { [ ! -d "$root" ] || [ -L "$root" ]; }; then
+    return 1
+  fi
+  mkdir -p "$root" 2>/dev/null || return 1
+  chmod 700 "$root" 2>/dev/null || true
+  printf '%s/%s.%s.%s.agent-reviews.json' \
+    "$root" \
+    "$(mcc_cache_component "$scope")" \
+    "$(mcc_cache_component "$product_type")" \
+    "$(mcc_cache_component "$sales_code")"
+}
+
+mcc_agent_review_issued() {
+  local product_type="$1" sales_code="$2" input_id="$3" file
+  file="$(mcc_agent_review_file "$product_type" "$sales_code")" || return 1
+  [ -f "$file" ] && [ ! -L "$file" ] || return 1
+  jq -e \
+    --arg inputId "$input_id" \
+    '.schemaVersion == 1
+      and ((.entries // null) | type == "array")
+      and all(.entries[];
+        type == "object"
+        and ((.query // null) | type == "string")
+        and ((.inputId // null) | type == "string")
+      )
+      and any(.entries[]; .inputId == $inputId)' \
+    "$file" >/dev/null 2>&1
+}
+
+mark_mcc_agent_review_issued() {
+  local product_type="$1" sales_code="$2" query="$3" input_id="$4"
+  local file dir lock tmp
+  file="$(mcc_agent_review_file "$product_type" "$sales_code")" || return 1
+  dir="${file%/*}"
+  lock="${file}.lock"
+  if ! mkdir "$lock" 2>/dev/null; then
+    return 1
+  fi
+  if [ -e "$file" ] && { [ ! -f "$file" ] || [ -L "$file" ]; }; then
+    rmdir "$lock" 2>/dev/null || true
+    return 1
+  fi
+  tmp="$(mktemp "$dir/.mcc-agent-reviews.XXXXXX" 2>/dev/null)" || {
+    rmdir "$lock" 2>/dev/null || true
+    return 1
+  }
+  chmod 600 "$tmp" 2>/dev/null || true
+  if [ -f "$file" ]; then
+    if ! jq -ce \
+      --arg query "$query" \
+      --arg inputId "$input_id" '
+        if .schemaVersion != 1 or ((.entries // null) | type != "array") then
+          error("invalid MCC agent review state")
+        elif any(.entries[]; .query == $query and .inputId == $inputId) then
+          .
+        else
+          .entries += [{query: $query, inputId: $inputId}]
+        end
+      ' "$file" >"$tmp" 2>/dev/null; then
+      rm -f "$tmp" 2>/dev/null || true
+      rmdir "$lock" 2>/dev/null || true
+      return 1
+    fi
+  else
+    if ! jq -cn \
+      --arg query "$query" \
+      --arg inputId "$input_id" \
+      '{schemaVersion: 1, entries: [{query: $query, inputId: $inputId}]}' \
+      >"$tmp" 2>/dev/null; then
+      rm -f "$tmp" 2>/dev/null || true
+      rmdir "$lock" 2>/dev/null || true
+      return 1
+    fi
+  fi
+  if ! mv "$tmp" "$file" 2>/dev/null; then
+    rm -f "$tmp" 2>/dev/null || true
+    rmdir "$lock" 2>/dev/null || true
+    return 1
+  fi
+  rmdir "$lock" 2>/dev/null || true
+}
+
 claim_mcc_semantic_retry() {
   local product_type="$1" sales_code="$2" query="$3" input_id="$4" semantic_terms_json="$5"
   local file dir lock entry original_query retry_count next_retry_count now tmp lock_acquired=false
@@ -654,6 +740,15 @@ query_mcc_detail_chunk() {
   printf '%s' "$business"
 }
 
+mcc_match_error_kind() {
+  case "$1" in
+    *agent-candidate-refs-json*) printf 'INVALID_AGENT_CANDIDATE_REFS' ;;
+    *semantic-terms-json*) printf 'INVALID_SEMANTIC_TERMS' ;;
+    *mcc-catalog-json*) printf 'INVALID_DYNAMIC_CATALOG' ;;
+    *) printf 'MATCHER_RUNTIME_ERROR' ;;
+  esac
+}
+
 normalize_mcc_catalog() {
   local rows_json="$1" details_json="$2"
   jq -cn --argjson rows "$rows_json" --argjson details "$details_json" '
@@ -713,6 +808,7 @@ normalize_mcc_catalog() {
 
 run_mcc_match_codes() {
   local query="$1" product_type="$2" root_intent="$3" catalog="$4" semantic_terms_json="$5" agent_candidate_refs_json="${6:-}" runner_out runner_err runner_rc line resolution=""
+  local runner_error error_kind
   runner_out=$(mktemp "${TMPDIR:-/tmp}/mcc_match_out.XXXXXX") || { echo "❌ 创建临时文件失败"; exit 1; }
   runner_err=$(mktemp "${TMPDIR:-/tmp}/mcc_match_err.XXXXXX") || { rm -f "$runner_out"; echo "❌ 创建临时文件失败"; exit 1; }
   local node_args=(
@@ -729,7 +825,16 @@ run_mcc_match_codes() {
   "${NODE_BINARY:-node}" "${node_args[@]}" >"$runner_out" 2>"$runner_err"
   runner_rc=$?
   if [ "$runner_rc" -ne 0 ] || [ -s "$runner_out" ]; then
+    runner_error="$(sed -n 's/^ONBOARDING_MESSAGE_ERROR://p' "$runner_err" | sed -n '1p')"
+    error_kind="$(mcc_match_error_kind "$runner_error")"
+    if [ "$error_kind" = "INVALID_AGENT_CANDIDATE_REFS" ] && [ -n "$agent_candidate_refs_json" ]; then
+      rm -f "$runner_out" "$runner_err"
+      emit_control "MCC_AGENT_CANDIDATE_REFS_IGNORED=INVALID"
+      run_mcc_match_codes "$query" "$product_type" "$root_intent" "$catalog" "$semantic_terms_json"
+      return $?
+    fi
     rm -f "$runner_out" "$runner_err"
+    emit_control "MCC_MATCH_ERROR=$error_kind"
     mcc_query_failed
   fi
   while IFS= read -r line; do
@@ -754,7 +859,7 @@ validate_mcc_selection_cache() {
 }
 
 run_resolve_plan() {
-  local query="" product_type="" root_intent="" semantic_terms_json='[]' agent_candidate_refs_json="" select_value="" selection_receipt="" input_id="" sales_code tree rows tree_catalog resolution match_type semantic_status full_codes candidate_rows qualification_rows details catalog selection_cache="" used_selection_cache=false stale_selection=false resolved_semantic_terms='[]' retry_input_id="" retry_rc=0 next_retry_count=0 retry_reason="" retry_payload="" agent_review_required="false" agent_review_payload=""
+  local query="" product_type="" root_intent="" semantic_terms_json='[]' agent_candidate_refs_json="" select_value="" selection_receipt="" input_id="" sales_code tree rows tree_catalog resolution match_type semantic_status full_codes candidate_rows qualification_rows details catalog selection_cache="" used_selection_cache=false stale_selection=false resolved_semantic_terms='[]' retry_rc=0 next_retry_count=0 retry_reason="" retry_payload="" agent_review_required="false" agent_review_payload=""
   shift
   while [[ $# -gt 0 ]]; do
     case "$1" in
@@ -840,20 +945,25 @@ run_resolve_plan() {
     semantic_status=$(printf '%s' "$resolution" | jq -r '.semanticStatus // ""' 2>/dev/null) || mcc_query_failed
     resolved_semantic_terms=$(printf '%s' "$resolution" | jq -c '.semanticTerms // []' 2>/dev/null) || mcc_query_failed
     agent_review_required=$(printf '%s' "$resolution" | jq -r '.agentReview.required // false' 2>/dev/null) || mcc_query_failed
+    if [ -n "$input_id" ] && [ -n "$agent_candidate_refs_json" ]; then
+      mark_mcc_agent_review_issued "$product_type" "$sales_code" "$query" "$input_id" || true
+    fi
     if [ "$agent_review_required" = "true" ] && [ -z "$agent_candidate_refs_json" ] && [ -n "$input_id" ]; then
       agent_review_payload=$(printf '%s' "$resolution" | jq -c '.agentReview' 2>/dev/null) || mcc_query_failed
-      emit_control "MCC_QUERY_RESULT=SUCCESS"
-      emit_control "MCC_RESOLUTION=$(printf '%s' "$resolution" | jq -c 'del(.agentReview)' 2>/dev/null)"
-      emit_control "MCC_AGENT_REVIEW_REQUIRED=$agent_review_payload"
-      return 0
+      if ! mcc_agent_review_issued "$product_type" "$sales_code" "$input_id"; then
+        mark_mcc_agent_review_issued "$product_type" "$sales_code" "$query" "$input_id" || true
+        emit_control "MCC_QUERY_RESULT=SUCCESS"
+        emit_control "MCC_RESOLUTION=$(printf '%s' "$resolution" | jq -c 'del(.agentReview)' 2>/dev/null)"
+        emit_control "MCC_AGENT_REVIEW_REQUIRED=$agent_review_payload"
+        return 0
+      fi
     fi
     if [ "$match_type" = "NONE" ] \
       && [ "$semantic_status" != "DYNAMIC_CATALOG_CODE_NOT_FOUND" ] \
       && [ "$semantic_status" != "DYNAMIC_CATALOG_CODE_AMBIGUOUS" ]; then
       if [ -n "$input_id" ]; then
-        retry_input_id="$input_id"
         next_retry_count="$(claim_mcc_semantic_retry \
-          "$product_type" "$sales_code" "$query" "$retry_input_id" "$resolved_semantic_terms" 2>/dev/null)"
+          "$product_type" "$sales_code" "$query" "$input_id" "$resolved_semantic_terms" 2>/dev/null)"
         retry_rc=$?
       else
         # A retry without a message identity cannot be bound to one user input.