@1aboveio/skills 0.19.1 → 0.19.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1aboveio/skills",
-  "version": "0.19.1",
+  "version": "0.19.3",
   "description": "Install the 1AboveIO first-party skill groups through the native Skills CLI.",
   "license": "MIT",
   "type": "module",

package/runtime/skills/distribution/generated/recipes.json

@@ -8,7 +8,7 @@
       "id": "first-party",
       "type": "first-party",
       "package": "@1aboveio/skills",
-      "version": "0.19.1",
+      "version": "0.19.3",
       "updatePolicy": "pinned-npm-version",
       "members": [
         {
@@ -208,7 +208,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -244,7 +244,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -290,7 +290,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -323,7 +323,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -366,7 +366,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -394,7 +394,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -432,7 +432,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -460,7 +460,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -498,7 +498,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -526,7 +526,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -564,7 +564,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -596,7 +596,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime",
@@ -636,7 +636,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime"
@@ -662,7 +662,7 @@
             "sourceId": "first-party",
             "sourceType": "first-party",
             "package": "@1aboveio/skills",
-            "version": "0.19.1",
+            "version": "0.19.3",
             "installPath": null,
             "members": [
               "harness-runtime"
@@ -694,7 +694,7 @@
           "sourceId": "first-party",
           "sourceType": "first-party",
           "package": "@1aboveio/skills",
-          "version": "0.19.1",
+          "version": "0.19.3",
           "installPath": null,
           "members": [
             "harness-runtime",
@@ -749,7 +749,7 @@
           "sourceId": "first-party",
           "sourceType": "first-party",
           "package": "@1aboveio/skills",
-          "version": "0.19.1",
+          "version": "0.19.3",
           "installPath": null,
           "members": [
             "harness-runtime",

package/runtime/skills/engineering/engineering-runtime/scripts/workflow-policy.mjs

@@ -119,7 +119,7 @@ export const WORKFLOW_TRUSTED_SOURCES = deepFreeze({
     id: 'first-party',
     type: 'first-party',
     package: '@1aboveio/skills',
-    version: '0.19.1',
+    version: '0.19.3',
   },
   matt: {
     id: 'matt-pocock',

package/skills/cicd-pipeline/mergify/references/watch-contract.md

@@ -20,12 +20,17 @@ The identical observation means opposite things on either side of queue entry:
 |---|---|---|
 | active queue membership absent | `NOT_YET_QUEUED` — healthy, keep waiting | **`DEQUEUED`** — terminal, read the reason |
 
-So the watcher's memory *is* the verdict. Four pieces of state must survive across polls:
+So the watcher's memory *is* the verdict. Five pieces of state must survive across polls:
 
 1. **`seenQueued`** — has queue entry ever been observed? Every downstream transition depends on it. Set from the `queued` label **or** `mergify queue show`.
 2. **A re-read counter** (`missingActiveReads` / `absentStreak`) — one absence is suspicion, two consecutive *readable* absences settle `DEQUEUED`.
 3. **Readable vs. absent** — a failed `gh`/`mergify` call is *no information*: it must not advance that counter or overwrite that source's last readable contribution to the stall-state snapshot. During a partial outage, the still-readable sibling remains informative and genuine progress from it still resets the change clock.
 4. **A change clock** (`lastChangeMs`) — the stall bound is *no observable change*, not elapsed time.
+5. **The last synthetic batch PR number** — retain
+   `mergeability_check.queue_pull_request_number` from every readable active queue
+   observation (and accept the older top-level spelling). Mergify removes that relationship
+   from `queue show` after dequeue, but the terminal reason belongs to the synthetic batch,
+   not the original PR.
 
 ### Why a per-poll predicate cannot satisfy this
 
@@ -149,14 +154,24 @@ Suggested routing classes:
 
 | raw reason shape | route |
 |---|---|
-| `checks-failed` | fix round, fresh verdict, new enqueue |
+| batch check `FAILURE`, `ERROR`, or `TIMED_OUT` | `checks-failed`; fix round, fresh verdict, new enqueue |
+| batch checks cancelled before validation executes | `checks-cancelled`; report the cancelled checks and hand back so an unchanged-SHA requeue can be considered |
 | `pull-request-updated`, `draft-pull-request-changed` | HEAD moved; verdict stale; re-enter delivery after fresh validation |
 | `conflict`, `conflict-with-base-branch` | rebase/evidence refresh, then enqueue |
 | `conditions-unmet`, `frozen`, `manual`, `pr-manually-dequeued`, `checks-timeout` | hand back with the condition/reason quoted |
-| unknown | hand back; fail closed |
+| unknown | `unknown`; hand back, fail closed, and preserve `rawReason` |
 
 When the reason is not machine-readable, quote the Mergify status comment, queue show condition leaf, or event-log URL in `rawReason` rather than inventing a reason.
 
+The selected `state:"dequeued"` Mergify status comment is parsed as structured evidence:
+`dequeuedAtMs`, `rawReason`, its draft PR fallback, and provider-reported failing checks. On
+dequeue, the watcher queries the retained batch PR once and attaches its failed or cancelled
+`statusCheckRollup` entries to the terminal verdict. A missing or deleted batch PR remains a
+truthful `DEQUEUED`: `batchPr.readable` is false, the retained number and `rawReason` survive,
+and any checks named by the provider comment remain available. An unchanged-SHA requeue can
+produce a new synthetic PR; every readable active observation replaces the retained number,
+so the newest batch wins over stale comment fallback.
+
 ## Watcher Requirements
 
 - Run as one background task or one script invocation; do not spend foreground turns polling.
@@ -195,13 +210,16 @@ Output streams:
 | stdout | exactly one pretty-printed terminal JSON verdict, at exit — carrying `phases`, `seenQueued`, and the outcome |
 | stderr | one compact JSON record per poll (`progress: true`), with the live outcome, PR labels, queue membership/position, `phases`, `changed`, and `sinceChangeMs` — the stall clock made visible |
 
-Each subprocess read (`gh pr view`, `mergify queue show`) also carries its own bounded
+Each regular-poll subprocess read (`gh pr view`, `mergify queue show`) also carries its own bounded
 timeout — a small multiple of `--interval-seconds`, clamped to never exceed the **effective
 phase stall bound** (pre-admission: `--admission-stall-minutes`; post-entry: `--stall-minutes`)
 capped by `--max-minutes`, then divided by the number of reads made per poll (2 here:
 `gh pr view` + `mergify queue show`). The two reads together cannot outlive the bound that will
 actually fire `STALLED` on this poll — so a hung pre-admission poll cannot outlive the short
 admission clock, and a post-entry poll is not permanently clamped to the admission value.
+After a terminal dequeue classification, one additional bounded `gh pr view` reads the
+retained synthetic batch PR. It enriches the already-settled verdict and never participates
+in queue membership, the absence counter, or the stall clock.
 Those stall/ceiling bounds are only evaluated after a poll returns, and a single hung read
 cannot alone consume more than half of a small stall/ceiling bound. (The sibling watcher makes
 one read per poll, so its clamp divides by 1 and the single-read guarantee is the whole bound

package/skills/cicd-pipeline/mergify/scripts/watch-pr-delivery-core.mjs

@@ -162,6 +162,7 @@ export function observationKey({ pr = {}, queue = {} } = {}) {
     queue.queued ?? null,
     queue.queueState ?? queue.state ?? null,
     queue.position ?? null,
+    queue.batchPrNumber ?? null,
   ])
 }
 
@@ -181,6 +182,7 @@ function stallQueueSnapshot(queue = {}) {
     queued: queue.queued ?? null,
     queueState: queue.queueState ?? queue.state ?? null,
     position: queue.position ?? null,
+    batchPrNumber: queue.batchPrNumber ?? null,
   }
 }
 
@@ -413,13 +415,16 @@ export function summarizeStatusChecks(rollup) {
 // (`startedMs`) — a locally-slow clock could in principle make a stale dequeue read as fresh;
 // low risk on an NTP-synced host, called out here rather than silently assumed away (NOTE-2).
 //
-// Returns epoch milliseconds, or null when no mergify comment's payload reports
-// `state: "dequeued"`, or that comment has no parseable "Left the queue" line — callers must
-// treat null as "no reliable timestamp", never as "not dequeued".
+// Parse the selected dequeue comment once and retain all provider evidence used by the
+// terminal verdict. The rendered comment is also the only surviving source after Mergify's
+// queue API drops active membership and its synthetic PR relationship.
 const MERGIFY_PAYLOAD_RE = /-\*- Mergify Payload -\*-\s*\n(\{[\s\S]*?\})\s*\n-\*- Mergify Payload End -\*-/
 const LEFT_QUEUE_RE = /Left the queue\*\*[^`\n]*`(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}) UTC`/g
+const BATCH_PR_RE = /\bon draft #(\d+)\b/i
+const REASON_RE = /^## Reason\s*\n+([^\n]+)/m
+const PROVIDER_CHECK_RE = /^-\s*(❌|🟠|🛑)\s*\[([^\]]+)\]\(([^)]+)\)/gmu
 
-export function dequeuedAtFromComments(comments) {
+export function dequeueInfoFromComments(comments) {
   const list = Array.isArray(comments) ? comments : []
   const mergifyComments = list.filter((c) => c && c.author && c.author.login === 'mergify')
   let target = null
@@ -431,15 +436,36 @@ export function dequeuedAtFromComments(comments) {
     try { payload = JSON.parse(payloadMatch[1]) } catch { continue }
     if (payload && payload.state === 'dequeued') target = comment // last match wins — comments are chronological
   }
-  if (!target) return null
+  if (!target) return { dequeuedAtMs: null, rawReason: null, batchPrNumber: null, providerFailedChecks: [] }
   const body = typeof target.body === 'string' ? target.body : ''
   let match
   let last = null
   LEFT_QUEUE_RE.lastIndex = 0
   while ((match = LEFT_QUEUE_RE.exec(body))) last = match
-  if (!last) return null
-  const [, y, mo, d, h, mi] = last
-  return Date.UTC(Number(y), Number(mo) - 1, Number(d), Number(h), Number(mi))
+  const dequeuedAtMs = last
+    ? Date.UTC(Number(last[1]), Number(last[2]) - 1, Number(last[3]), Number(last[4]), Number(last[5]))
+    : null
+  const reasonMatch = REASON_RE.exec(body)
+  const batchMatch = BATCH_PR_RE.exec(body)
+  const providerFailedChecks = []
+  PROVIDER_CHECK_RE.lastIndex = 0
+  while ((match = PROVIDER_CHECK_RE.exec(body))) {
+    providerFailedChecks.push({
+      name: match[2],
+      status: match[1] === '🟠' ? 'CANCELLED' : (match[1] === '🛑' ? 'TIMED_OUT' : 'FAILURE'),
+      detailsUrl: match[3] || null,
+    })
+  }
+  return {
+    dequeuedAtMs,
+    rawReason: reasonMatch?.[1]?.trim() || null,
+    batchPrNumber: batchMatch ? Number(batchMatch[1]) : null,
+    providerFailedChecks,
+  }
+}
+
+export function dequeuedAtFromComments(comments) {
+  return dequeueInfoFromComments(comments).dequeuedAtMs
 }
 
 // Exported so tests can pin that the live read timeout uses the same phase-aware bound the
@@ -470,6 +496,7 @@ function prObservation({ repo, pr, intervalSeconds, stallMinutes, admissionStall
   const data = parseJson(result.stdout)
   if (!data) return { readable: false, error: 'gh pr view returned invalid JSON' }
   const checks = summarizeStatusChecks(data.statusCheckRollup)
+  const dequeueInfo = dequeueInfoFromComments(data.comments)
   return {
     readable: true,
     state: data.state || null,
@@ -478,7 +505,8 @@ function prObservation({ repo, pr, intervalSeconds, stallMinutes, admissionStall
     headRefOid: data.headRefOid || null,
     labels: (data.labels || []).map((label) => label.name).filter(Boolean),
     url: data.url || null,
-    dequeuedAtMs: dequeuedAtFromComments(data.comments),
+    dequeuedAtMs: dequeueInfo.dequeuedAtMs,
+    dequeueInfo,
     ...checks,
   }
 }
@@ -514,12 +542,46 @@ export function queueObservation({ pr, repo, intervalSeconds, stallMinutes, admi
       queued: parsed.queued === true || Boolean(parsed.queue_rule_name || parsed.queue_rule),
       queueState: parsed.status || parsed.state || parsed.mergeability_check?.state || null,
       position: typeof parsed.position === 'number' ? parsed.position : null,
+      batchPrNumber: positivePrNumber(
+        parsed.mergeability_check?.queue_pull_request_number
+          ?? parsed.queue_pull_request_number
+          ?? parsed.speculative_check_pr,
+      ),
       raw: parsed,
     }
   }
   const text = `${result.stdout}\n${result.stderr}`.trim()
-  if (/not in the merge queue|not queued|not found/i.test(text)) return { readable: true, queued: false, queueState: 'not-queued', position: null, raw: text }
-  return { readable: false, queued: false, queueState: null, position: null, raw: text || 'mergify queue show failed' }
+  if (/not in the merge queue|not queued|not found/i.test(text)) return { readable: true, queued: false, queueState: 'not-queued', position: null, batchPrNumber: null, raw: text }
+  return { readable: false, queued: false, queueState: null, position: null, batchPrNumber: null, raw: text || 'mergify queue show failed' }
+}
+
+function positivePrNumber(value) {
+  const number = Number(value)
+  return Number.isInteger(number) && number > 0 ? number : null
+}
+
+// The batch relationship is only queried after a terminal dequeue verdict, so normal polls
+// remain the documented two reads. This one-shot enrichment cannot influence lifecycle state.
+function batchPrObservation({ repo, batchPrNumber, intervalSeconds, stallMinutes, admissionStallMinutes, maxMinutes, everActive }) {
+  const result = run('gh', ['pr', 'view', String(batchPrNumber), '--repo', repo, '--json', 'state,url,statusCheckRollup'], { timeout: readTimeoutForArgs({ intervalSeconds, stallMinutes, admissionStallMinutes, maxMinutes, everActive }) })
+  if (!result.ok) return { readable: false, failedChecks: [], error: result.stderr || result.stdout }
+  const data = parseJson(result.stdout)
+  if (!data) return { readable: false, failedChecks: [], error: 'gh pr view returned invalid JSON for synthetic batch PR' }
+  return { readable: true, state: data.state || null, url: data.url || null, ...summarizeStatusChecks(data.statusCheckRollup) }
+}
+
+export function classifyDequeue({ rawReason = null, failedChecks = [] } = {}) {
+  const statuses = new Set((Array.isArray(failedChecks) ? failedChecks : []).map((check) => String(check?.status || '').toUpperCase()))
+  if (['FAILURE', 'ERROR', 'TIMED_OUT', 'ACTION_REQUIRED', 'STARTUP_FAILURE'].some((status) => statuses.has(status))) return 'checks-failed'
+  if (statuses.has('CANCELLED')) return 'checks-cancelled'
+  const raw = String(rawReason || '').trim().toLowerCase()
+  if (/failing checks|checks failed/.test(raw)) return 'checks-failed'
+  if (/pull[- ]request.*updated|draft[- ]pull[- ]request.*changed/.test(raw)) return 'pull-request-updated'
+  if (/conflict/.test(raw)) return 'conflict'
+  if (/conditions[- ]unmet/.test(raw)) return 'conditions-unmet'
+  if (/frozen/.test(raw)) return 'frozen'
+  if (/manual|manually dequeued|dequeued by .*\bdequeue\b.*command/.test(raw)) return 'manual'
+  return 'unknown'
 }
 
 // Every poll's observation, as one compact NDJSON record — the watcher's heartbeat.
@@ -657,6 +719,7 @@ export async function runCli(argv) {
   let lastChangeMs = startedMs
   let observations = 0
   let phases = []
+  let lastBatchPrNumber = null
 
   for (;;) {
     // Pass everActive into the reads so their per-child timeout tracks the phase bound that
@@ -666,6 +729,9 @@ export async function runCli(argv) {
     const pr = prObservation({ ...args, everActive })
     const queue = queueObservation({ ...args, everActive })
     observations += 1
+    if (queue.readable !== false && queue.queued === true && queue.batchPrNumber) {
+      lastBatchPrNumber = queue.batchPrNumber
+    }
     const active = (Array.isArray(pr.labels) && pr.labels.includes('queued')) || queue.queued === true
     const readable = pr.readable !== false || queue.readable !== false
     if (active) {
@@ -687,16 +753,37 @@ export async function runCli(argv) {
     if (verdict.seenQueued === true) seenQueued = true
     if (verdict.preAdmission === true) phases = nextPhases(phases, 'NOT_YET_QUEUED')
     phases = nextPhases(phases, verdict.outcome)
+    let dequeue = null
+    if (verdict.outcome === 'DEQUEUED') {
+      const info = pr.dequeueInfo || { rawReason: null, batchPrNumber: null, providerFailedChecks: [] }
+      const batchPrNumber = lastBatchPrNumber ?? info.batchPrNumber ?? null
+      const batch = batchPrNumber ? batchPrObservation({ ...args, everActive, batchPrNumber }) : null
+      const failedChecks = batch?.readable && batch.failedChecks.length > 0
+        ? batch.failedChecks
+        : (info.providerFailedChecks || [])
+      const classifiedReason = classifyDequeue({ rawReason: info.rawReason, failedChecks })
+      dequeue = {
+        reason: classifiedReason === 'unknown' && !info.rawReason && failedChecks.length === 0
+          ? verdict.reason
+          : classifiedReason,
+        rawReason: info.rawReason || null,
+        batchPrNumber,
+        failedChecks,
+        batch,
+      }
+    }
     const payload = {
       outcome: verdict.outcome,
       terminal: verdict.terminal,
-      reason: verdict.reason || null,
+      reason: dequeue?.reason || verdict.reason || null,
+      rawReason: dequeue?.rawReason || null,
       detail: verdict.detail || null,
       mergedSha: verdict.mergedSha || null,
+      batchPrNumber: dequeue?.batchPrNumber || lastBatchPrNumber,
       seenQueued,
       everActive,
       phases,
-      failedChecks: verdict.failedChecks || pr.failedChecks || [],
+      failedChecks: dequeue?.failedChecks || verdict.failedChecks || pr.failedChecks || [],
       missingActiveReads,
       observations,
       elapsedMs: Date.now() - startedMs,
@@ -711,7 +798,21 @@ export async function runCli(argv) {
         failedChecks: pr.failedChecks || [],
         pendingChecks: pr.pendingChecks || [],
       },
-      queue: { queued: queue.queued === true, queueState: queue.queueState || null, position: queue.position ?? null, readable: queue.readable !== false },
+      queue: {
+        queued: queue.queued === true,
+        queueState: queue.queueState || null,
+        position: queue.position ?? null,
+        batchPrNumber: queue.batchPrNumber || null,
+        lastBatchPrNumber,
+        readable: queue.readable !== false,
+      },
+      batchPr: dequeue?.batch ? {
+        number: dequeue.batchPrNumber,
+        state: dequeue.batch.state || null,
+        url: dequeue.batch.url || null,
+        readable: dequeue.batch.readable !== false,
+        error: dequeue.batch.error || null,
+      } : null,
     }
 
     if (verdict.terminal) {

package/skills/engineering/engineering-runtime/coherence/workflow.json

@@ -383,7 +383,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
       "contentDigest": "eff6c7b5931bce5b2265a619bccddd371a89df6ce7bc2edc74f11d00060a71dd",
       "digestExcludes": []
@@ -396,7 +396,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
       "contentDigest": "d97abeff7bdc5ae2e4be2f631d09dba46d4753ce1e67334793364329af59f066",
       "digestExcludes": []
@@ -409,7 +409,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
       "contentDigest": "00cfdd3e5bfbc3e37b1369ad93aae91161e671829760a8867ea9be25047ba461",
       "digestExcludes": []
@@ -422,7 +422,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
       "contentDigest": "58b0556228a9271cf9e33727a05fc08a4fdfd29512ec0936b169f0a55d60e6ef",
       "digestExcludes": []
@@ -435,9 +435,9 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
-      "contentDigest": "38347c30820ba7e8b10433aeb351b7df4fa457b143e4a109293ab53fda961459",
+      "contentDigest": "4664873230f22de2fcf46b7b529570cfedabdc850620031d8f96baf89fcdc5b4",
       "digestExcludes": []
     },
     {
@@ -448,9 +448,9 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
-      "contentDigest": "d7daa7080dbaefcd13f3d17a811bd5ad64d7cb9f7506b29b7d3558243bfd3683",
+      "contentDigest": "3016f025b4acf3b7f61628ff3043ca55e680d0fabc7cf9fb4b4c46424d9b22ed",
       "digestExcludes": []
     },
     {
@@ -461,7 +461,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
       "contentDigest": "01c192d8b4fd416af4ea02e8000e5fce0cee723a6ac2f8c0c48372087e1a262e",
       "digestExcludes": []
@@ -474,7 +474,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
       "contentDigest": "ffba0c83491676794c74721f4c6dbae430f5bc186e5a55f0764e29eaeb13829b",
       "digestExcludes": []
@@ -487,7 +487,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
       "contentDigest": "f048fd00c69f2dc666fc7a3096cfeee6dfba73933bfb69602f3f0e26159798cc",
       "digestExcludes": []
@@ -500,7 +500,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
       "contentDigest": "90a7c4e1ad6da1e632ea2c5259e4967ffebb84353adccbca8dfc5d6bc50b60c1",
       "digestExcludes": []
@@ -513,15 +513,15 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       },
-      "contentDigest": "03b9c17251069f297b55577809eb3c49291650d95effd6a00348807eb8944e91",
+      "contentDigest": "6ef7cf062d899835774d3010dbba511587b0d60835447417d4b74a5afe25b184",
       "digestExcludes": [
         "coherence/workflow.json"
       ]
     }
   ],
-  "releaseIdentity": "3dec5c21fb1bfc991338f1d62b4c91d3967e2ff28f04ba412ec50e74b28a2122",
+  "releaseIdentity": "63593db8810d932c5774b375f3403578b821c9df6ca6e8a866f12f2b8fc4fd47",
   "lifecycleAuthority": "native-skills-cli",
   "repairRecipe": {
     "id": "engineering-workflow-dependency-first",
@@ -579,7 +579,7 @@
         "sourceId": "first-party",
         "sourceType": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1",
+        "version": "0.19.3",
         "installPath": null,
         "members": [
           "harness-runtime",
@@ -597,7 +597,7 @@
         "commands": [
           {
             "transport": "npm",
-            "command": "npx @1aboveio/skills@0.19.1 install --group engineering-workflow --yes"
+            "command": "npx @1aboveio/skills@0.19.3 install --group engineering-workflow --yes"
           }
         ],
         "onFailure": {

package/skills/engineering/engineering-runtime/scripts/workflow-policy.mjs

@@ -119,7 +119,7 @@ export const WORKFLOW_TRUSTED_SOURCES = deepFreeze({
     id: 'first-party',
     type: 'first-party',
     package: '@1aboveio/skills',
-    version: '0.19.1',
+    version: '0.19.3',
   },
   matt: {
     id: 'matt-pocock',

package/skills/engineering/resolve-issues/generated/workflow-repair-policy.json

@@ -237,7 +237,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     },
     {
@@ -248,7 +248,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     },
     {
@@ -259,7 +259,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     },
     {
@@ -270,7 +270,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     },
     {
@@ -281,7 +281,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     },
     {
@@ -292,7 +292,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     },
     {
@@ -303,7 +303,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     },
     {
@@ -314,7 +314,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     },
     {
@@ -325,7 +325,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     },
     {
@@ -336,7 +336,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     },
     {
@@ -347,7 +347,7 @@
         "id": "first-party",
         "type": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1"
+        "version": "0.19.3"
       }
     }
   ],
@@ -468,7 +468,7 @@
         "sourceId": "first-party",
         "sourceType": "first-party",
         "package": "@1aboveio/skills",
-        "version": "0.19.1",
+        "version": "0.19.3",
         "installPath": null,
         "members": [
           "harness-runtime",
@@ -486,7 +486,7 @@
         "commands": [
           {
             "transport": "npm",
-            "command": "npx @1aboveio/skills@0.19.1 install --group engineering-workflow --yes"
+            "command": "npx @1aboveio/skills@0.19.3 install --group engineering-workflow --yes"
           }
         ],
         "onFailure": {

package/skills/engineering/resolve-issues/scripts/run-state.mjs

@@ -3412,7 +3412,7 @@ export const WORKFLOW_PREFLIGHT_COMMANDS = Object.freeze([
 
 const WORKFLOW_VERIFIER_URL = new URL('../../engineering-runtime/scripts/workflow-coherence.mjs', import.meta.url)
 const WORKFLOW_FALLBACK_POLICY_URL = new URL('../generated/workflow-repair-policy.json', import.meta.url)
-export const WORKFLOW_TRUSTED_FALLBACK_POLICY_SHA256 = '916d7e26b51f761140a1d9377810b27f9f51c482fc63a220bb0fbcc34d2eee7a'
+export const WORKFLOW_TRUSTED_FALLBACK_POLICY_SHA256 = 'b3ae9760db370098e3737c7b23bcfd5e03d61e30586857858826b6875e3b4a2f'
 const WORKFLOW_REPAIR_RECIPE_REFERENCE = Object.freeze({
   id: 'engineering-workflow-dependency-first',
   generatedFrom: 'skills/distribution/generated/recipes.json',

package/skills/engineering/rush-issues/SKILL.md

@@ -72,6 +72,10 @@ before its stage; do not invent an unlinked substitute.
   canary and requires validation plus a fresh canary on the new HEAD.
 - Review facts independently. Producer summaries, claims, logs, and evidence
   may locate work but cannot establish correctness for the reviewer.
+- Treat review P0/P1 findings as blocking. P2/P3 findings do not expand the
+  current PR, but each must be linked to a concrete follow-up before review
+  succeeds; a finding that proves a current AC or mandatory standard is unmet
+  must be reclassified as P1, not deferred under a softer label.
 - Do not manufacture review evidence collateral. Keep only the stage result,
   commands actually run, findings, task-plan transitions, and profiling events.
 - Persist each task-plan transition and profiling event under one monotonically
@@ -144,8 +148,8 @@ the original spec and repository standards, computes its own diff fixed point,
 inspects the implementation, and runs checks needed to verify findings. It does
 not accept producer evidence as proof. Fix blocking findings on the combined
 branch, validate, rerun the warehouse canary when required, then run a fresh
-review until successful; after 2 failed fix/review cycles, diagnose and continue
-with a revised approach.
+review until every P0/P1 is resolved and every P2/P3 has a tracked follow-up;
+after 2 failed fix/review cycles, diagnose and continue with a revised approach.
 
 ### 7. CICD
 

package/skills/engineering/rush-issues/references/review.md

@@ -24,17 +24,41 @@ new evidence collateral as a substitute for verification.
    for the current exact HEAD. Then invoke the absolute `code-review` skill path
    on the combined HEAD.
 2. Review both axes: repository **Standards** and original **Spec**.
+   Treat `code-review` as a barrier: buffer individual Standards and Spec
+   completions, and do not classify, defer, or fix any finding until both axes
+   have returned and one aggregated review result exists.
 3. Independently run or reproduce the checks needed to support each material
    conclusion. A producer-provided green log is not a factual substitute.
-4. Return findings with severity and file/line references, plus commands the
-   reviewer actually ran. The review result is coordination state, not an
+4. Return findings with P0-P3 severity and file/line references, plus commands
+   the reviewer actually ran. The review result is coordination state, not an
    evidence-generation deliverable.
-5. Succeed only with no Spec gap/wrongness/creep and no hard Standards
-   violation. Record non-blocking baseline observations as deferrals.
+5. Apply the severity/disposition policy below. Succeed only when every finding
+   has an explicit resolved or deferred disposition.
+
+## Severity and disposition
+
+- **P0/P1 are blocking.** Fix them on the combined branch, validate, rerun the
+  required canary, and obtain a fresh review before recording `reviewedHead`.
+- **P2/P3 are non-blocking by default.** Do not expand the current PR to address
+  them. Create or link a concrete follow-up issue before review succeeds and
+  record its URL with the finding.
+- **No finding disappears.** Each finding is either `resolved` on the exact
+  reviewed HEAD or `deferred` with a follow-up URL. A prose note without a
+  trackable issue is not a disposition.
+- **Severity cannot waive the current contract.** If a purported P2/P3 proves
+  that a current acceptance criterion is unmet, required behavior is wrong, or
+  a mandatory repository standard or gate is violated, ask the reviewer to
+  reclassify it as P1. Do not silently override the reviewer and do not defer it
+  under the softer label.
+
+P2/P3 follow-ups are appropriate for optional hardening, cleanup, cosmetic
+improvements, and architecture work outside the current acceptance criteria.
+Link each follow-up to the combined PR and original spec, and deduplicate it
+against existing issues before creating a new one.
 
 ## Fix loop
 
-For blocking findings, fix the combined PR branch, run relevant lint/build/
+For P0/P1 findings, fix the combined PR branch, run relevant lint/build/
 test/smoke, rerun [canary.md](canary.md) when required, then spawn a fresh
 review of the new HEAD. Record that exact SHA as `reviewedHead` only after
 success. Never treat a fix as accepted before validation, required canary, and

package/skills/engineering/rush-issues/references/task-plan.md

@@ -47,7 +47,11 @@ Run-level fields include `planRevision`, models/efforts, `targetBranch`, run
 workspace/branch, original spec locator, explicit merge authorization when one
 was supplied, exploration path, combined PR/HEAD, `reviewedHead`, and
 `warehouseCanaryRequired`, its classification reason, durable canary result
-path, and start/update timestamps.
+path, `reviewFindings`, and start/update timestamps. Each `reviewFindings` entry
+records a stable finding id, P0-P3 `severity`, summary and source locator,
+`status` (`open`, `resolved`, or `deferred`), the exact `resolvedHead` when
+resolved, and `followUpUrl` when deferred. P0/P1 cannot be deferred; P2/P3
+cannot remain open when `reviewedHead` is recorded.
 
 Persist the machine-readable plan at:
 

package/skills/payment/payment-analysis/SKILL.md

@@ -5,9 +5,10 @@ description: >
   extracts (optional chargebacks): executive summary, top statistics, payment
   journey Sankey, and topics (volume, WoW trend, auth rate, BIN-country
   contribution, decline-by-reason, decline-by-country). Amounts report in USD
-  (Forex Service daily conversion). Chargebacks use Visa same-month and
-  Mastercard lagged 拒付率. 运营影响 is 3DS / 风控拦截 / soft-decline retry
-  only. Use whenever the user asks for payment overview, auth-rate analysis,
+  (Forex Service daily conversion). Chargebacks separate normal and
+  pre-dispute cases; Visa pre-disputes are excluded from VAMP-style metrics
+  and calculated separately, while Mastercard 拒付率 is lagged. 运营影响 is
+  3DS / 风控拦截 / soft-decline retry only. Use whenever the user asks for payment overview, auth-rate analysis,
   decline mix, BIN/issuer-country contribution, settlement GMV, payment journey,
   Sankey funnel, FX-to-USD, chargeback rate, 运营影响, or "business analysis of
   transactions" — even if they do not say payment-analysis. Do NOT use for
@@ -57,7 +58,8 @@ Compute auth + settlement metrics from [metrics.md](references/metrics.md).
 Convert non-USD amounts per [fx.md](references/fx.md) before any sum or share.
 If chargebacks are present, monthly 拒付率 follows
 [chargebacks.md](references/chargebacks.md) (Visa same-month, Mastercard lagged,
-skip empty brand-months, no blended Visa+Mastercard ratio).
+Visa pre-disputes excluded from the normal/VAMP-style numerator and calculated
+separately, skip empty brand-months, no blended Visa+Mastercard ratio).
 
 ### 3 — Journey Sankey
 
@@ -98,6 +100,8 @@ Do not change numbers, joins, or chart data.
 - [ ] Amount axes/legends include currency (`授权尝试金额 USD`, …)
 - [ ] No supervised fraud-rule metrics
 - [ ] Non-USD amounts converted per fx.md; all-USD books say 金额均为 USD
+- [ ] Normal chargebacks, pre-disputes, and unclassified cases are distinct
+- [ ] Visa pre-disputes are excluded from VAMP-style metrics and calculated separately
 - [ ] Chargeback monthly rates skip empty brand-months; no blended Visa+MC ratio
 - [ ] 运营影响 only from auth-rate-actions.md when triggered
 - [ ] Language matches terminology.md; banned strings have no unexplained hits

package/skills/payment/payment-analysis/references/chargebacks.md

@@ -1,4 +1,4 @@
-# Chargeback / dispute rate (Visa vs Mastercard)
+# Chargeback / dispute rate (normal vs pre-dispute; Visa vs Mastercard)
 
 Topic **4.8 拒付 / 争议**. Put the Visa / Mastercard formulas as a **note
 under the monthly rate chart**. Count rates follow card-network monitoring
@@ -10,43 +10,67 @@ below are the processor restatements used in production monitoring
 (Stripe, Braintree). Caption the report as **network-style estimates
 from this extract**, not as a Visa/Mastercard identification notice.
 
+## Classify case stage first
+
+Before calculating rates, classify each row from an explicit processor or
+network case-stage/type/status field:
+
+- **Normal chargeback / dispute**: a formally opened chargeback/dispute.
+- **Pre-dispute**: explicitly identified as pre-dispute, RDR, CDRN, early
+  resolution, or the processor's equivalent pre-dispute product.
+- **Unclassified**: the extract does not reliably identify the case stage.
+
+Use the processor's data dictionary when labels are unclear. Do not infer
+pre-dispute status from reason code, amount, timing, outcome, or free-text
+description alone. Report counts and amounts for all three classes separately;
+never silently treat pre-dispute or unclassified rows as normal chargebacks.
+
+If no reliable classification field exists, report the separation as
+unavailable. An all-case Visa dispute rate may be shown as descriptive only,
+but it must not be called a normal chargeback rate or VAMP-style estimate.
+
 ## When a point is drawn
 
-A monthly point for a card brand is drawn **only if**
+A monthly point for a brand and case-stage series is drawn **only if**
 
-- numerator (chargebacks **received** that calendar month for that brand) > 0, and
+- numerator for that specific series **received** in that calendar month > 0, and
 - denominator (sales count for that brand, month as defined below) > 0.
 
 Otherwise **omit the point**. Do not plot `0`. Do not invent a prior-month
-sale count. If a brand has no drawable points, omit the series. If no
-series remain, omit the rate chart (keep the reason-category bars if CBs
-exist).
+sale count. If a series has no drawable points, omit it. If no series remain,
+omit the rate chart (keep case-stage and reason-category bars if cases exist).
 
 ## Formulas (count)
 
-Numerator for both brands: chargebacks **received** in calendar month `M`
-(`Chargeback date`), `Payment method` = that brand. Not original
-transaction month. Inquiries / RDR-cleared cases are not in this extract;
-count every CB row.
+Numerators use cases **received** in calendar month `M` (`Chargeback date`),
+`Payment method` = that brand. Do not use original transaction month. Apply
+the case-stage classification before counting.
 
-| Brand | Programme (current) | Rate |
+| Brand / series | Programme alignment | Rate |
 |---|---|---|
-| Visa | VAMP dispute/sales count (same month) | `CB_Visa(M) / Sales_Visa(M)` |
-| Mastercard | ECP / ECM chargeback rate (lagged sales) | `CB_MC(M) / Sales_MC(M−1)` |
+| Visa normal chargeback | VAMP dispute/sales timing (same month) | `Normal_CB_Visa(M) / Sales_Visa(M)` |
+| Visa pre-dispute | Descriptive; excluded from VAMP | `PreDispute_Visa(M) / Sales_Visa(M)` |
+| Mastercard normal chargeback | ECP / ECM chargeback timing (lagged sales) | `Normal_CB_MC(M) / Sales_MC(M−1)` |
 
 `Sales_*` = settlement type Sale, that brand, **transaction/capture month**.
 Do not mix refunds into the denominator.
 
 Mastercard **must** use the previous calendar month’s sales. If `M−1`
-sales are missing from the extract, skip Mastercard for month `M`.
+sales are missing from the extract, skip Mastercard for month `M`. Keep any
+Mastercard pre-dispute rows separate from its normal chargeback numerator; this
+skill does not calculate a Mastercard pre-dispute rate unless the user asks.
 
 ## Visa notes (do not over-claim VAMP)
 
 Since 2025-04 Visa folded VDMP/VFMP into **VAMP**. Full VAMP Count is
 `opened Visa chargebacks (TC15) + reported fraud (TC40 EFW)`, same-month
-sales in the denominator. This skill’s extract usually has chargebacks
-only → report **Visa 拒付率 = Visa CB count / Visa same-month sales**.
-Do not label it “VAMP ratio” unless TC40/EFW is in the file.
+sales in the denominator. **Pre-dispute cases are not opened chargebacks and
+must be excluded from the TC15/VAMP-style numerator.** This skill's extract
+usually has chargebacks only → report **Visa normal 拒付率 = normal Visa CB
+count / Visa same-month sales**, plus **Visa pre-dispute rate = Visa
+pre-dispute count / Visa same-month sales** as a separate descriptive series.
+Do not add the two series together. Do not label the normal rate “VAMP ratio”
+unless TC40/EFW is present and the extract supports the full VAMP definition.
 
 VAMP also has volume and enumeration legs; those are out of scope here.
 
@@ -62,7 +86,8 @@ it for ECP.
 ## Amount rate (optional footnote)
 
 `abs(dispute amount) / sale amount` with the **same month alignment as
-the count rate** for that brand. Secondary; the line chart is count %.
+the count rate** for that brand. Keep normal and pre-dispute amounts separate.
+Secondary; the line chart is count %.
 
 ## Window caveat
 

package/skills/payment/payment-analysis/references/event-layers.md

@@ -53,6 +53,10 @@ Reporting amounts are USD. Conversion rules: [fx.md](fx.md).
 Chargeback **programme 拒付率** uses received month (`Chargeback date`) per
 [chargebacks.md](chargebacks.md). If you also show origination-month incidence,
 label that separately so it is not mistaken for the Visa/Mastercard rate.
+Before calculating a programme-style rate, identify the processor field that
+distinguishes normal chargebacks from pre-disputes. Keep unclassified cases
+separate; pre-disputes are excluded from Visa VAMP-style metrics and reported
+as a separate Visa rate.
 
 ## Decline taxonomy (auth)
 

package/skills/payment/payment-analysis/references/metrics.md

@@ -38,18 +38,20 @@ Do not equalize settled sales to approved auth amount without a timing caveat.
 
 ## Chargebacks
 
-Monthly **拒付率** by brand is [chargebacks.md](chargebacks.md): Visa
-same-month sales, Mastercard previous-month sales, skip empty brand-months,
-no blended Visa+Mastercard ratio. The table below is mix / match, not that
-programme rate.
+Monthly **拒付率** by brand is [chargebacks.md](chargebacks.md): classify normal,
+pre-dispute, and unclassified cases first; Visa uses same-month sales and
+reports pre-disputes separately; Mastercard normal chargebacks use
+previous-month sales. Skip empty brand-months and do not blend Visa+Mastercard.
+The table below is mix / match, not that programme rate.
 
 | KPI | Formula | Notes |
 |---|---|---|
-| CB count / dispute amount | as filed | Amounts USD after [fx.md](fx.md); use abs for magnitude if signed |
+| Normal / pre-dispute / unclassified count and amount | as classified | Amounts USD after [fx.md](fx.md); use abs for magnitude if signed |
 | Reason mix | by Reason category / code | Fraud ≠ all CBs |
 | Match rate to auths | matched / CB rows | State join key |
-| Visa monthly 拒付率 | CB_Visa(M) / Sales_Visa(M) | Received month; not VAMP unless TC40 in file |
-| Mastercard monthly 拒付率 | CB_MC(M) / Sales_MC(M−1) | Skip M if M−1 sales missing |
+| Visa normal monthly 拒付率 | Normal_CB_Visa(M) / Sales_Visa(M) | Excludes pre-disputes; received month; not VAMP unless TC40 is present |
+| Visa pre-dispute rate | PreDispute_Visa(M) / Sales_Visa(M) | Separate descriptive series; excluded from VAMP-style numerator |
+| Mastercard normal monthly 拒付率 | Normal_CB_MC(M) / Sales_MC(M−1) | Excludes pre-disputes; skip M if M−1 sales missing |
 
 Lag: chargeback date is later than original auth. Programme rates use
 **received** month, not origination vintage.

package/skills/payment/payment-analysis/references/report-template.md

@@ -54,8 +54,8 @@ KPI cards / table from auth + settlement: attempts, approvals, auth rate,
 attempt amount, approved amount, sale count/amount, refund count/amount, net
 settled, distinct PAN/BIN/countries, portfolio constants (MID, MCC, provider).
 
-Chinese labels: 授权尝试, 授权成功, 授权成功率, 授权成功金额, 清算销售, 退款,
-净清算, 发卡行国家.
+Chinese labels: 授权尝试, 授权成功, 授权成功率, 授权成功金额,
+已清算交易笔数, 已清算金额, 退款, 净清算, 发卡行国家.
 
 ### 3. Payment journey (Sankey) / 支付旅程
 
@@ -79,7 +79,7 @@ Each topic: short lede + chart(s) + supporting table.
 | 4.5 Decline reason | count bars |
 | 4.6 Decline by country | stacked count bars |
 | 4.7 Settlements | sale/refund amount bars; country contribution dual axis |
-| 4.8 Chargebacks | reason-category bars; Visa / Mastercard monthly 拒付率 line per [chargebacks.md](chargebacks.md) (note under the rate chart; skip empty brand-months) |
+| 4.8 Chargebacks | normal vs pre-dispute counts/amounts; reason-category bars; Visa normal 拒付率 and separate Visa pre-dispute-rate series; Mastercard normal monthly 拒付率 per [chargebacks.md](chargebacks.md) (note under the rate chart; skip empty brand-months) |
 
 Use both authorization and settlement data when both files are present.
 

package/skills/payment/payment-analysis/references/terminology.md

@@ -24,7 +24,11 @@ writing English or Chinese copy. After writing, run the proofread step in
 | BIN country | 发卡行国家 / BIN 国家 | 客户国家；收货国；发卡国 |
 | Settlement | 清算 | |
 | Sale / Refund | 销售 / 退款 | 把销售金额写成清算金额 |
+| Settled transaction count | 已清算交易笔数 | 清算销售 |
+| Settled amount | 已清算金额 | 清算销售金额 |
 | Chargeback / dispute | 拒付 / 争议 | 与清算混用 |
+| Normal chargeback / dispute | 正常拒付 / 正常争议 | 与预争议合并 |
+| Pre-dispute | 预争议 | 计入 VAMP；与正常拒付合并 |
 | Clerical | 差错 | 文书；文书错误 |
 | Quality | 产品服务质量 | 质量；质量争议 |
 | Incidence | 发生率（必须写出分母） | |
@@ -37,7 +41,8 @@ writing English or Chinese copy. After writing, run the proofread step in
 | This analysis window | 当前分析时段内 | 本窗口 |
 | SCA | SCA | 强客户认证（可在首次括注后只用 SCA） |
 | Authentication / 3DS | 鉴权 / 认证 / 3DS | 把 3DS 叫转化 |
-| Visa / Mastercard 拒付率 | Visa / Mastercard 拒付率 | VAMP ratio（无 TC40 时）；ECM（从本抽取断言商户在项目中） |
+| Visa normal 拒付率 / Visa pre-dispute rate | Visa 正常拒付率 / Visa 预争议率 | 合并二者；把预争议计入 VAMP；VAMP ratio（无 TC40 时） |
+| Mastercard normal 拒付率 | Mastercard 正常拒付率 | ECM（从本抽取断言商户在项目中） |
 | Amounts in USD | 金额均为 USD | 未做汇率折算（当全部已是 USD） |
 | Count-heavy / amount-light | 授权尝试笔数多但金额小 | 走廊；笔数负担型走廊 |
 

package/skills/payment/payment-analysis/references/visualization.md

@@ -22,7 +22,7 @@ ECharts (Sankey). Markdown tables remain required beside charts.
 ## Axis hygiene
 
 - Label every axis with the full metric name. Amount axes/legends include
-  currency (`授权尝试金额 USD`, `授权拒绝金额 USD`, `清算销售金额 USD`,
+  currency (`授权尝试金额 USD`, `授权拒绝金额 USD`, `已清算金额 USD`,
   `拒付金额 USD`). Do not use bare `笔数` / `金额` / `%`.
 - Only one axis draws the main grid on dual-axis charts.
 - Stacked bars = mix within a group (e.g. decline reasons by country), never rate.