cabloy 5.1.141 → 5.1.142

package/scripts/upgrade.ts

@@ -59,14 +59,17 @@ const OVERWRITE_DIRS_CABLOY_BASIC: string[] = [
   'zova/src/suite/a-devui',
 ];
 
-const FRAMEWORK_E2E_DIRS_CABLOY_BASIC: string[] = [
-  'e2e/config',
-  'e2e/scripts',
-  'e2e/specs/cabloy-basic',
-  'e2e/specs/a-commerce',
+const FRAMEWORK_E2E_DIRS_CABLOY_BASIC: string[] = ['e2e/config', 'e2e/scripts'];
+
+const FRAMEWORK_E2E_FILES_CABLOY_BASIC: string[] = [
+  'e2e/specs/cabloy-basic.spec.ts',
+  'e2e/specs/account.spec.ts',
+  'e2e/specs/a-commerce.spec.ts',
 ];
 
-const FRAMEWORK_E2E_SCRIPT_NAMES_CABLOY_BASIC: string[] = [
+const FRAMEWORK_E2E_SCRIPT_NAMES_CABLOY_BASIC: string[] = ['test:e2e', 'test:e2e:fast'];
+
+const FRAMEWORK_E2E_LEGACY_SCRIPT_NAMES_CABLOY_BASIC: string[] = [
   'test:e2e:basic',
   'test:e2e:basic:web',
   'test:e2e:basic:admin',
@@ -75,15 +78,11 @@ const FRAMEWORK_E2E_SCRIPT_NAMES_CABLOY_BASIC: string[] = [
   'test:e2e:commerce:web',
   'test:e2e:commerce:admin',
   'test:e2e:commerce:clean',
+  'test:e2e:basic:flow',
 ];
 
 const FRAMEWORK_E2E_DEV_DEPENDENCY_CABLOY_BASIC = '@playwright/test';
 
-const OBSOLETE_FRAMEWORK_E2E_SCRIPTS_CABLOY_BASIC: Record<string, string> = {
-  'test:e2e:basic:flow':
-    'playwright test --config e2e/config/playwright.basic.config.ts --grep ATP-BASIC-FLOW-01',
-};
-
 const MERGE_DIRS: string[] = [
   // Claude project assets
   '.claude/commands',
@@ -231,24 +230,6 @@ async function extractTarball(tarballPath: string, targetDir: string): Promise<v
   }
 }
 
-function needsBasicE2eReconciliation(): boolean {
-  if (!isCabloyBasic()) return false;
-
-  for (const dir of FRAMEWORK_E2E_DIRS_CABLOY_BASIC) {
-    if (!existsSync(resolve(ROOT_DIR, dir))) return true;
-  }
-
-  const packageJson = readPackageJson(resolve(ROOT_DIR, 'package.json'));
-  for (const name of FRAMEWORK_E2E_SCRIPT_NAMES_CABLOY_BASIC) {
-    const script = packageJson.scripts?.[name];
-    if (!script?.includes('e2e/')) return true;
-  }
-  for (const [name, value] of Object.entries(OBSOLETE_FRAMEWORK_E2E_SCRIPTS_CABLOY_BASIC)) {
-    if (packageJson.scripts?.[name] === value) return true;
-  }
-  return !packageJson.devDependencies?.[FRAMEWORK_E2E_DEV_DEPENDENCY_CABLOY_BASIC];
-}
-
 function mergeFrameworkE2eAssets(dryRun?: boolean): void {
   if (!isCabloyBasic()) return;
 
@@ -264,6 +245,38 @@ function mergeFrameworkE2eAssets(dryRun?: boolean): void {
     }
     copyDirectory(src, dest);
   }
+
+  for (const file of FRAMEWORK_E2E_FILES_CABLOY_BASIC) {
+    const src = resolve(TEMP_DIR, file);
+    const dest = resolve(ROOT_DIR, file);
+    if (!existsSync(src)) {
+      throw new Error(`Expected framework E2E file in package: ${file}`);
+    }
+    if (dryRun) {
+      log(`  [dry-run] Overwrite framework E2E file: ${file}`);
+      continue;
+    }
+    mkdirSync(dirname(dest), { recursive: true });
+    cpSync(src, dest);
+  }
+
+  const legacyFrameworkFiles: string[] = [
+    'e2e/config/playwright.basic.config.ts',
+    'e2e/config/playwright.commerce.config.ts',
+    'e2e/config/playwright.shared.config.ts',
+    'e2e/specs/cabloy-basic/basic.spec.ts',
+    'e2e/specs/cabloy-basic/account.spec.ts',
+    'e2e/specs/a-commerce/commerce.spec.ts',
+  ];
+  for (const file of legacyFrameworkFiles) {
+    const dest = resolve(ROOT_DIR, file);
+    if (!existsSync(dest)) continue;
+    if (dryRun) {
+      log(`  [dry-run] Remove legacy framework E2E file: ${file}`);
+      continue;
+    }
+    rmSync(dest, { force: true });
+  }
 }
 
 function reconcileFrameworkE2ePackageJson(dryRun?: boolean): void {
@@ -324,18 +337,11 @@ function reconcileFrameworkE2ePackageJson(dryRun?: boolean): void {
     }
   }
 
-  for (const [name, value] of Object.entries(OBSOLETE_FRAMEWORK_E2E_SCRIPTS_CABLOY_BASIC)) {
-    const currentValue = projectPackage.scripts?.[name];
-    if (!currentValue) continue;
-    if (currentValue !== value) {
-      log(
-        `  Retain customized obsolete framework E2E script package.json scripts.${name}; remove it manually if no longer needed.`,
-      );
-      continue;
-    }
+  for (const name of FRAMEWORK_E2E_LEGACY_SCRIPT_NAMES_CABLOY_BASIC) {
+    if (!projectPackage.scripts?.[name]) continue;
     changed = true;
     if (dryRun) {
-      log(`  [dry-run] Remove obsolete framework E2E script package.json scripts.${name}`);
+      log(`  [dry-run] Remove legacy framework E2E script package.json scripts.${name}`);
     } else {
       delete projectPackage.scripts?.[name];
     }
@@ -513,41 +519,30 @@ async function main(): Promise<void> {
 
   const latestPackageInfo = await fetchLatestPackageInfo();
   const currentVersion = readVersionMarker();
-  const basicE2eIncomplete = needsBasicE2eReconciliation();
-
-  if (currentVersion) {
-    log(`Current project Cabloy version: ${currentVersion}`);
-  } else {
-    log(
-      `Warning: Missing ${VERSION_MARKER_FILE}, continuing with upgrade for backward compatibility.`,
+  if (!currentVersion) {
+    throw new Error(
+      `Missing ${VERSION_MARKER_FILE}; this project is not a supported Cabloy upgrade target.`,
     );
   }
+
+  log(`Current project Cabloy version: ${currentVersion}`);
   log(`Latest Cabloy version: ${latestPackageInfo.version}`);
 
-  if (currentVersion) {
-    const comparison = compareVersions(currentVersion, latestPackageInfo.version);
-    if (comparison === 0) {
-      if (basicE2eIncomplete) {
-        log(
-          `Cabloy is already up to date (current: ${currentVersion}), but the Cabloy Basic E2E baseline is incomplete. Repairing it in this upgrade; no additional upgrade command is required.\n`,
-        );
-      } else if (!dryRun) {
-        log(`Cabloy is already up to date (current: ${currentVersion}). Skipping upgrade.`);
-        return;
-      } else {
-        log(
-          `Cabloy is already up to date (current: ${currentVersion}). Continuing dry-run to show overwrite plan.\n`,
-        );
-      }
-    } else if (comparison > 0) {
-      throw new Error(
-        `Project Cabloy version ${currentVersion} is newer than npm latest ${latestPackageInfo.version}. Aborting upgrade.`,
-      );
-    } else {
-      log(`Upgrading Cabloy from ${currentVersion} to ${latestPackageInfo.version}...\n`);
+  const comparison = compareVersions(currentVersion, latestPackageInfo.version);
+  if (comparison === 0) {
+    if (!dryRun) {
+      log(`Cabloy is already up to date (current: ${currentVersion}). Skipping upgrade.`);
+      return;
     }
+    log(
+      `Cabloy is already up to date (current: ${currentVersion}). Continuing dry-run to show overwrite plan.\n`,
+    );
+  } else if (comparison > 0) {
+    throw new Error(
+      `Project Cabloy version ${currentVersion} is newer than npm latest ${latestPackageInfo.version}. Aborting upgrade.`,
+    );
   } else {
-    log(`Upgrading Cabloy to ${latestPackageInfo.version}...\n`);
+    log(`Upgrading Cabloy from ${currentVersion} to ${latestPackageInfo.version}...\n`);
   }
 
   try {

package/vona/packages-utils/lint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/lint",
-  "version": "5.1.31",
+  "version": "5.1.32",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Node Style Guide for Cabloy.",
   "files": [

package/vona/packages-utils/lint/src/oxc/lint.ts

@@ -452,7 +452,7 @@ const _configDefault: OxlintConfig = {
         propElementValues: 'always',
       },
     ],
-    '@stylistic/jsx-curly-newline': 'error',
+    '@stylistic/jsx-curly-newline': 'off',
     '@stylistic/jsx-curly-spacing': ['error', 'never'],
     '@stylistic/jsx-equals-spacing': 'error',
     '@stylistic/jsx-first-prop-new-line': 'error',

package/vona/packages-utils/lint/src/oxc/lintVue.ts

@@ -450,7 +450,7 @@ const _configDefault: OxlintConfig = {
         propElementValues: 'always',
       },
     ],
-    '@stylistic/jsx-curly-newline': 'error',
+    '@stylistic/jsx-curly-newline': 'off',
     '@stylistic/jsx-curly-spacing': ['error', 'never'],
     '@stylistic/jsx-equals-spacing': 'error',
     '@stylistic/jsx-first-prop-new-line': 'error',

package/vona/pnpm-lock.yaml

@@ -564,8 +564,8 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.150
-        version: 5.1.150(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.151
+        version: 5.1.151(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
         specifier: ^1.1.86
         version: 1.1.86(typescript@5.9.3)
@@ -597,8 +597,8 @@ importers:
         specifier: ^5.1.50
         version: 5.1.50
       zova-module-a-pay:
-        specifier: ^5.0.5
-        version: 5.0.5
+        specifier: ^5.0.6
+        version: 5.0.6
       zova-module-a-router:
         specifier: ^5.1.34
         version: 5.1.34
@@ -615,8 +615,8 @@ importers:
         specifier: ^5.1.38
         version: 5.1.38(vue@3.5.39(typescript@5.9.3))
       zova-module-pay-mock:
-        specifier: ^5.0.3
-        version: 5.0.3
+        specifier: ^5.0.4
+        version: 5.0.4
       zova-module-rest-resource:
         specifier: ^5.1.45
         version: 5.1.45
@@ -642,8 +642,8 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.150
-        version: 5.1.150(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.151
+        version: 5.1.151(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
         specifier: ^1.1.86
         version: 1.1.86(typescript@5.9.3)
@@ -675,8 +675,8 @@ importers:
         specifier: ^5.1.50
         version: 5.1.50
       zova-module-a-pay:
-        specifier: ^5.0.5
-        version: 5.0.5
+        specifier: ^5.0.6
+        version: 5.0.6
       zova-module-a-router:
         specifier: ^5.1.34
         version: 5.1.34
@@ -693,8 +693,8 @@ importers:
         specifier: ^5.1.38
         version: 5.1.38(vue@3.5.39(typescript@5.9.3))
       zova-module-pay-mock:
-        specifier: ^5.0.3
-        version: 5.0.3
+        specifier: ^5.0.4
+        version: 5.0.4
       zova-module-rest-resource:
         specifier: ^5.1.45
         version: 5.1.45
@@ -720,8 +720,8 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.150
-        version: 5.1.150(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.151
+        version: 5.1.151(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
         specifier: ^1.1.86
         version: 1.1.86(typescript@5.9.3)
@@ -753,8 +753,8 @@ importers:
         specifier: ^5.1.50
         version: 5.1.50
       zova-module-a-pay:
-        specifier: ^5.0.5
-        version: 5.0.5
+        specifier: ^5.0.6
+        version: 5.0.6
       zova-module-a-router:
         specifier: ^5.1.34
         version: 5.1.34
@@ -771,8 +771,8 @@ importers:
         specifier: ^5.1.38
         version: 5.1.38(vue@3.5.39(typescript@5.9.3))
       zova-module-pay-mock:
-        specifier: ^5.0.3
-        version: 5.0.3
+        specifier: ^5.0.4
+        version: 5.0.4
       zova-module-rest-resource:
         specifier: ^5.1.45
         version: 5.1.45
@@ -798,8 +798,8 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.150
-        version: 5.1.150(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+        specifier: ^5.1.151
+        version: 5.1.151(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
       zova-jsx:
         specifier: ^1.1.86
         version: 1.1.86(typescript@5.9.3)
@@ -831,8 +831,8 @@ importers:
         specifier: ^5.1.50
         version: 5.1.50
       zova-module-a-pay:
-        specifier: ^5.0.5
-        version: 5.0.5
+        specifier: ^5.0.6
+        version: 5.0.6
       zova-module-a-router:
         specifier: ^5.1.34
         version: 5.1.34
@@ -849,8 +849,8 @@ importers:
         specifier: ^5.1.38
         version: 5.1.38(vue@3.5.39(typescript@5.9.3))
       zova-module-pay-mock:
-        specifier: ^5.0.3
-        version: 5.0.3
+        specifier: ^5.0.4
+        version: 5.0.4
       zova-module-rest-resource:
         specifier: ^5.1.45
         version: 5.1.45
@@ -8994,8 +8994,8 @@ packages:
   zova-module-a-openapi@5.1.50:
     resolution: {integrity: sha512-ZrYFZaVARpBf5ByfCtCPD4z/2ByAZn42XsKUJZuqWcvVrccY7v3kaiXoCrfQAz9aDar+wqwXOo548eAHz4wzqg==}
 
-  zova-module-a-pay@5.0.5:
-    resolution: {integrity: sha512-+6TgviG9wuX37uhB//ezvF/zeUihq8RdysXEpkIY+wTQnA0ZwEnORrXDPaiboIz970zWQBJme8bfwv+1ntw/Vw==}
+  zova-module-a-pay@5.0.6:
+    resolution: {integrity: sha512-k1MXVsaN3zCgFDLQkUaUoN9W8Z02TWTsFr/h1A8ljUBAQccFiQusmt1035qvLYHidrHX64fC4R5F8SuIDLNf3w==}
 
   zova-module-a-router@5.1.34:
     resolution: {integrity: sha512-6XAia5GVmdJqUcwGW9r2vJ2JomnU0QMHK7y7QQoniUZ0JqDj7SWFbSYXd6WDlvLU7Kd5yt4WfyzE7GQVb/HcnA==}
@@ -9012,8 +9012,8 @@ packages:
   zova-module-a-ssrhmr@5.1.23:
     resolution: {integrity: sha512-BiwI/lodmJgWU5whwI4iEd3ZTbWCFIxG/V0YOejHaPqk85viFAVn9xlURNdpo3A9yFKRZDZja4IA8WuO6i0QAA==}
 
-  zova-module-a-ssrserver@5.1.25:
-    resolution: {integrity: sha512-Xq0vMR6TqErul8ik3X5ywXR4M62TKBehebEj6a6pPY75nJwNycEly2VWQZ6gF0dnnY+MBIKLhV9kstM0dxutKw==}
+  zova-module-a-ssrserver@5.1.26:
+    resolution: {integrity: sha512-1NK1hG1ruwGTvSgCGQ2fWCulTHi7PSOm8ZWVkrEQAhPnMs992IOTapKCXMl6mlGchnylfUfWRbpZ6OmzSGDICw==}
 
   zova-module-a-style@5.1.35:
     resolution: {integrity: sha512-i73I3wFvdQonj3l4fkovkKBZwSK4s6D4vL3AVfVvFJ4eIboKH2yw0hCILKRzLoESNQ0T+lNS6ozeimvtA4/6DQ==}
@@ -9027,17 +9027,17 @@ packages:
   zova-module-a-zova@5.1.101:
     resolution: {integrity: sha512-htiX0YX6kytmTiiiVuTH5lVcM5doff/AYIbiIxcoOU955q6vxrKNT4TQSGZiaAGY9cb45kr4n75nLunGxxaOPQ==}
 
-  zova-module-pay-mock@5.0.3:
-    resolution: {integrity: sha512-v4Zg+3kKOTnBufsRnUPV+1FHCwD8zQMiaP1et4jFeaSENzKYcuCwBqeHDTtRuBXC0+2J+fDi36YOQzMsM5fE3A==}
+  zova-module-pay-mock@5.0.4:
+    resolution: {integrity: sha512-olXNzUK7wuNThHiE8ND/8wu9eFhMODI7l/Tcdh7/fFe5EWRhPL37HCj8gjYy1gHcuFQdN3+gim3Zqmp7JG5nFw==}
 
   zova-module-rest-resource@5.1.45:
     resolution: {integrity: sha512-QqzqBaeObbnnVdfhQZLFaU6/gSaL9BJzmzgKR6d/GkucDWezDlfISyoPstp+NhkBs1VPR4yk5nhKVG9jRlx/6w==}
 
-  zova-suite-a-zova@5.1.149:
-    resolution: {integrity: sha512-Atwl93ucs8Ma3MBi/NK8sYcsTQimkKXLsHEoJ8LCXEdca/MQ9I43HoCLUOPjUhTIl9DRICQ+7ZzvhiGaXaFvzQ==}
+  zova-suite-a-zova@5.1.150:
+    resolution: {integrity: sha512-UZ/yRFWylL/MFKDvxlFYBZ6vb+WEW6NsOZSXztSfmOc8jevuZCy0I1lwgIZppR7wNWiBMdIt/jq7CqTHYhvMjw==}
 
-  zova@5.1.150:
-    resolution: {integrity: sha512-nRv1MICJQAU5nfyi5v6gBVQjHzoOEL8F8rgWu7kwLD9ChAcOnKyTk2DQLgRjTHu+khCqDMdoBFk5TDb4joSgcA==}
+  zova@5.1.151:
+    resolution: {integrity: sha512-ORpFNcMYRmoWtIGIGGswPpeLgrYiax9prStB3Em0umUFGxVLPg9Yt0R1/psFlFgcC9WionitSz4WBhjvcra8Xw==}
 
   zwitch@1.0.5:
     resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
@@ -15401,7 +15401,7 @@ snapshots:
       openapi3-ts: 4.6.0
       typestyle: 2.4.0
 
-  zova-module-a-pay@5.0.5: {}
+  zova-module-a-pay@5.0.6: {}
 
   zova-module-a-router@5.1.34: {}
 
@@ -15419,7 +15419,7 @@ snapshots:
       '@cabloy/socket': link:packages-utils/socket
       debounce: 3.0.0
 
-  zova-module-a-ssrserver@5.1.25:
+  zova-module-a-ssrserver@5.1.26:
     dependencies:
       ms: 2.1.3
 
@@ -15458,11 +15458,11 @@ snapshots:
       - typescript
       - vue
 
-  zova-module-pay-mock@5.0.3: {}
+  zova-module-pay-mock@5.0.4: {}
 
   zova-module-rest-resource@5.1.45: {}
 
-  zova-suite-a-zova@5.1.149(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova-suite-a-zova@5.1.150(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       zova-module-a-api: 5.1.22
       zova-module-a-app: 5.1.26
@@ -15484,7 +15484,7 @@ snapshots:
       zova-module-a-routertabs: 5.1.34
       zova-module-a-ssr: 5.1.37
       zova-module-a-ssrhmr: 5.1.23
-      zova-module-a-ssrserver: 5.1.25
+      zova-module-a-ssrserver: 5.1.26
       zova-module-a-style: 5.1.35
       zova-module-a-table: 5.1.38(vue@3.5.39(typescript@5.9.3))
       zova-module-a-zod: 5.1.37
@@ -15496,10 +15496,10 @@ snapshots:
       - typescript
       - vue
 
-  zova@5.1.150(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
+  zova@5.1.151(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3)):
     dependencies:
       zova-core: 5.1.86(patch_hash=144450bd7a567a6067e5857c0cf4c780981b7e90bc48745c09e1696a9b6f1b97)(typescript@5.9.3)
-      zova-suite-a-zova: 5.1.149(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
+      zova-suite-a-zova: 5.1.150(typescript@5.9.3)(vue@3.5.39(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - debug

package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/refundRecoveryView.tsx

@@ -62,8 +62,13 @@ export class DtoRefundRecoveryView {
   @Api.field(v.optional())
   finalizedAt?: Date;
 
-  @Api.field(z.enum(['none', 'reconcile_only', 'query_only', 'retry_same_key']))
-  recoveryDisposition: 'none' | 'reconcile_only' | 'query_only' | 'retry_same_key';
+  @Api.field(z.enum(['none', 'await_webhook', 'reconcile_only', 'query_only', 'retry_same_key']))
+  recoveryDisposition:
+    | 'none'
+    | 'await_webhook'
+    | 'reconcile_only'
+    | 'query_only'
+    | 'retry_same_key';
 
   @Api.field(v.required())
   recoveryMessage: string;

package/vona/src/suite/a-commerce/modules/commerce-trade/src/service/order.ts

@@ -880,6 +880,11 @@ export class ServiceOrder extends BeanBase {
     };
   }
 
+  private _providerSupportsRefundQuery(providerName: string, clientName: string) {
+    const { provider } = this.bean.payProvider.resolveByName(providerName, clientName);
+    return typeof provider.queryRefund === 'function';
+  }
+
   private _refundRecoveryView(
     linked: Awaited<ReturnType<typeof this.refundRecoveryLinkage>>,
   ): DtoRefundRecoveryView {
@@ -893,7 +898,14 @@ export class ServiceOrder extends BeanBase {
       hasUnresolvedReconciliation,
     } = linked;
     const canQuery = Boolean(
-      refundOperation.providerRefundId && providerOperation.state !== 'succeeded',
+      refundOperation.providerRefundId &&
+      providerOperation.state !== 'succeeded' &&
+      this._providerSupportsRefundQuery(paymentSession.providerName, paymentSession.clientName),
+    );
+    const canAwaitWebhook = Boolean(
+      refundOperation.providerRefundId &&
+      providerOperation.state !== 'succeeded' &&
+      !this._providerSupportsRefundQuery(paymentSession.providerName, paymentSession.clientName),
     );
     const canRetry =
       !refundOperation.providerRefundId &&
@@ -909,21 +921,25 @@ export class ServiceOrder extends BeanBase {
       providerOperation.errorCode === 'refund_submission_outcome_unknown' &&
       Boolean(providerOperation.submittedAt) &&
       !hasUnresolvedReconciliation;
-    const recoveryDisposition = canQuery
-      ? 'query_only'
-      : canRetry
-        ? 'retry_same_key'
-        : canReconcile
-          ? 'reconcile_only'
-          : 'none';
+    const recoveryDisposition = canAwaitWebhook
+      ? 'await_webhook'
+      : canQuery
+        ? 'query_only'
+        : canRetry
+          ? 'retry_same_key'
+          : canReconcile
+            ? 'reconcile_only'
+            : 'none';
     const recoveryMessage =
-      recoveryDisposition === 'query_only'
-        ? 'A verified provider refund identifier is available. Reconcile without resubmitting.'
-        : recoveryDisposition === 'reconcile_only'
-          ? 'Provider refund outcome is unknown. Record reconciliation before considering a retry.'
-          : recoveryDisposition === 'retry_same_key'
-            ? 'Reconciliation was unresolved. A single acknowledged retry may reuse the original provider request.'
-            : 'No provider refund submission is available. Do not create or manually declare a replacement refund.';
+      recoveryDisposition === 'await_webhook'
+        ? 'A provider refund identifier is available. Wait for the verified provider webhook; do not resubmit or reconcile by querying.'
+        : recoveryDisposition === 'query_only'
+          ? 'A verified provider refund identifier is available. Reconcile without resubmitting.'
+          : recoveryDisposition === 'reconcile_only'
+            ? 'Provider refund outcome is unknown. Record reconciliation before considering a retry.'
+            : recoveryDisposition === 'retry_same_key'
+              ? 'Reconciliation was unresolved. A single acknowledged retry may reuse the original provider request.'
+              : 'No provider refund submission is available. Do not create or manually declare a replacement refund.';
     return {
       orderId: order.id,
       refundRequestId: refundRequest.id,

package/vona/src/suite/a-home/modules/home-user/package.json

@@ -53,6 +53,7 @@
       "a-mail": "5.0.0",
       "a-ratelimit": "5.0.0",
       "a-redlock": "5.0.0",
+      "a-ssr": "5.0.0",
       "a-vona": "5.0.0",
       "auth-simple": "5.0.0"
     }

package/vona/src/suite/a-home/modules/home-user/src/service/account.ts

@@ -217,7 +217,11 @@ export class ServiceAccount extends BeanBase {
       const link = this._getActivationLinkWithToken(consumerLink, rawToken);
       await this.bean.mail.send({
         to: currentUser.email,
-        subject: this.scope.locale.ActivationEmailSubject(),
+        subject: replaceTemplate(this.scope.locale.ActivationEmailSubject(), {
+          userName: currentUser.name,
+          link,
+          siteName: this.ctx.instance.title || this.app.meta.env.APP_TITLE,
+        }),
         text: replaceTemplate(this.scope.locale.ActivationEmailBody(), {
           userName: currentUser.name,
           link,
@@ -559,12 +563,21 @@ export class ServiceAccount extends BeanBase {
 
   private _getActivationLink(consumerUrl: string): URL {
     const url = this._getConsumerLink(consumerUrl, 'activation');
-    if (url.pathname !== activationConsumerPath) {
+    if (!this._isActivationConsumerPath(url.pathname)) {
       this.app.throw(503, 'account activation consumer URL is invalid');
     }
     return url;
   }
 
+  private _isActivationConsumerPath(pathname: string) {
+    if (pathname === activationConsumerPath) return true;
+    const sites = this.app.scope('a-ssr').service.ssr.getSitesEnabled();
+    return sites.some(site => {
+      const publicPath = String(site.beanOptions.options?.publicPath ?? '');
+      return publicPath && pathname === `/${publicPath}${activationConsumerPath}`;
+    });
+  }
+
   private _getPasswordSetLink(consumerUrl: string): URL {
     return this._getConsumerLink(consumerUrl, 'password-set');
   }

package/vona/src/suite/a-home/modules/home-user/test/accountActivation.test.ts

@@ -5,6 +5,7 @@ import { acquireTestLock, app } from 'vona-mock';
 
 const activationConsumePath = '/home/user/account/activation/consume';
 const activationConsumerUrl = 'https://account.example.test/home/user/activation';
+const activationConsumerUrlAdmin = 'https://account.example.test/admin/home/user/activation';
 
 describe('accountActivation.test.ts', { concurrency: false, sequential: true }, () => {
   const releases: Array<() => void> = [];
@@ -73,6 +74,26 @@ describe('accountActivation.test.ts', { concurrency: false, sequential: true },
     }
   });
 
+  it('preserves an enabled SSR site public path in activation links', async () => {
+    let fixture: IFixture | undefined;
+    let restoreSites: (() => void) | undefined;
+    try {
+      fixture = await createFixture();
+      restoreSites = configureAdminSsrSite();
+      const issued = await issueActivationLink(fixture, activationConsumerUrlAdmin);
+      assert.equal(issued.path, '/admin/home/user/activation');
+      assert.deepEqual(await getActivationState(getDigest(issued.token)), {
+        purpose: 'account-activation',
+        userId: fixture.userId,
+        consumerPath: '/home/user/activation',
+        email: fixture.email,
+      });
+    } finally {
+      restoreSites?.();
+      if (fixture) await removeFixture(fixture);
+    }
+  });
+
   it('issues an activation link through registration and activates the registered user', async () => {
     let registration: IRegistration | undefined;
     try {
@@ -175,6 +196,17 @@ interface IRegistration extends IFixture {
   path: string;
 }
 
+function configureAdminSsrSite() {
+  const service = app.scope('a-ssr').service.ssr;
+  const getSitesEnabled = service.getSitesEnabled;
+  service.getSitesEnabled = (() => [
+    { beanOptions: { options: { publicPath: 'admin' } } },
+  ]) as typeof service.getSitesEnabled;
+  return () => {
+    service.getSitesEnabled = getSitesEnabled;
+  };
+}
+
 async function configureActivation() {
   return await app.bean.executor.mockCtx(async () => {
     const options =
@@ -288,7 +320,7 @@ async function removeFixture(fixture: IFixture) {
   });
 }
 
-async function issueActivationLink(fixture: IFixture) {
+async function issueActivationLink(fixture: IFixture, consumerUrl = activationConsumerUrl) {
   let text: unknown;
   const mail = app.bean.mail;
   const send = mail.send;
@@ -297,9 +329,7 @@ async function issueActivationLink(fixture: IFixture) {
   };
   try {
     await app.bean.executor.mockCtx(async () => {
-      await app
-        .scope('home-user')
-        .service.account.issueActivationLink(fixture.userId, activationConsumerUrl);
+      await app.scope('home-user').service.account.issueActivationLink(fixture.userId, consumerUrl);
     });
   } finally {
     mail.send = send;

package/vona/src/suite-vendor/a-cabloy/modules/a-markdown/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-markdown",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -58,6 +58,7 @@
   "title": "a-markdown",
   "vonaModule": {
     "dependencies": {
+      "a-image": "5.0.0",
       "a-vona": "5.0.0"
     }
   }