@alipay/alipay-aipay 1.6.6 → 1.6.7-beta

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

@@ -10,7 +10,7 @@ import { fileURLToPath } from 'node:url';
 
 import { isWindowsPlatform } from './platform_compat.mjs';
 import { renderMessage } from './render_customer_message.mjs';
-import { emitTerminalMetric, terminalMetricContextFromArgs } from './telemetry.mjs';
+import { emitStageMetricAsync, startTelemetryRun } from './telemetry.mjs';
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const inspectorPath = path.join(scriptDir, 'project_route_inspector.sh');
@@ -373,32 +373,8 @@ function runUnixInspector(args, failureContext, jsonContext) {
   return parseSingleJson(inspected.stdout, jsonContext);
 }
 
-function defaultNewProjectPath() {
-  const homeInput = process.env.HOME || os.homedir() || '';
-  if (!homeInput) throw new Error('无法确定用户目录；请提供明确的新项目路径');
-  const homePath = normalizeBasePath(homeInput);
-  const container = path.join(homePath, 'alipay-aipay-projects');
-  if (fs.existsSync(container)) {
-    const stat = fs.lstatSync(container);
-    if (!stat.isDirectory() || stat.isSymbolicLink()) {
-      throw new Error('默认项目父目录不可用；请提供明确的新项目路径');
-    }
-  }
-  for (let index = 1; index <= 50; index += 1) {
-    const suffix = index === 1 ? '' : `-${index}`;
-    const candidate = path.join(container, `pay-demo${suffix}`);
-    if (!fs.existsSync(candidate)) return candidate;
-    const stat = fs.lstatSync(candidate);
-    if (stat.isDirectory() && !stat.isSymbolicLink() && !hasDirectoryEntries(candidate)) return candidate;
-  }
-  throw new Error('默认项目目录已被占用；请提供明确的新项目路径');
-}
-
-function parseNewProjectPath(input, targetPath) {
-  if (targetPath !== undefined) return sanitizeProjectInput(targetPath);
-  if (looksLikeExplicitPath(input)) return input;
-  if (isDefaultNewProjectRequest(input)) return defaultNewProjectPath();
-  throw new Error('自然语言新建请求必须由 Agent 解析后通过 --target-path 提供明确目标；禁止把用户原话当作目录名');
+function parseNewProjectPath(projectPath) {
+  return sanitizeProjectInput(projectPath);
 }
 
 function normalizePotentialPath(candidate) {
@@ -830,13 +806,16 @@ function runResolveProject(args) {
   if (!['existing', 'new'].includes(intent)) throw new Error('intent 非法，仅支持 existing、new');
   const basePath = normalizeBasePath(required(args, 'base-path'));
   const input = sanitizeProjectInput(required(args, 'project-input'));
+  if (args['target-path'] !== undefined) {
+    throw new Error('参数 --target-path 已移除；现有项目和新建项目都使用 --project-path 传递真实路径');
+  }
+  const pathInput = sanitizeProjectInput(required(args, 'project-path'));
 
   if (intent === 'existing') {
-    if (args['target-path'] !== undefined) throw new Error('--target-path 仅支持 --intent new');
     if (isExplicitNewProjectRequest(input)) {
       throw new Error('明确新建项目请求必须使用 --intent new，不能改用当前项目');
     }
-    const existingInput = parseExistingProjectPath(input);
+    const existingInput = parseExistingProjectPath(pathInput);
     const candidate = currentProjectAliases.has(existingInput) ? basePath : resolveAgainstBase(existingInput, basePath);
     const projectPath = fs.existsSync(candidate) ? fs.realpathSync(candidate) : candidate;
     if (!fs.existsSync(projectPath) || !fs.statSync(projectPath).isDirectory()) {
@@ -846,7 +825,7 @@ function runResolveProject(args) {
       const prefix = currentProjectAliases.has(existingInput)
         ? '当前目录不是可识别的项目根，不能直接作为现有项目扫描'
         : '该路径未识别到项目根标记，不能确认是服务端项目根';
-      const searchBasePath = currentProjectAliases.has(input) ? basePath : projectPath;
+      const searchBasePath = currentProjectAliases.has(existingInput) ? basePath : projectPath;
       throw projectRootError(searchBasePath, prefix, basePath);
     }
     return JSON.stringify({
@@ -857,7 +836,7 @@ function runResolveProject(args) {
     });
   }
 
-  const newPathInput = parseNewProjectPath(input, args['target-path']);
+  const newPathInput = parseNewProjectPath(pathInput);
   if (currentProjectAliases.has(newPathInput)) {
     throw new Error('新项目必须明确尚不存在或为空的子目录名');
   }
@@ -1031,7 +1010,9 @@ function resolveFramework(args, projectPath, projectSelection, language) {
     ? sanitizeFramework(args.framework)
     : '';
   const suppliedSource = typeof args['framework-source'] === 'string' ? args['framework-source'] : '';
-  if (suppliedSource && !frameworkSources.has(suppliedSource)) throw new Error('framework-source 非法');
+  if (suppliedSource && !frameworkSources.has(suppliedSource)) {
+    throw new Error('framework-source 非法，仅支持 EXPLICIT、DEFAULT_NEW_PROJECT、PROJECT_INFERRED、PROJECT_STRUCTURE_FALLBACK');
+  }
 
   if (!suppliedSource) {
     return suppliedFramework
@@ -1054,7 +1035,7 @@ function runFrameworkResolve(args) {
   const language = normalizeLanguage(required(args, 'language'));
   const projectSelection = required(args, 'project-selection');
   if (!['NEW_PROJECT', 'PREPARED_NEW_PROJECT', 'CURRENT_PROJECT', 'OTHER_PROJECT'].includes(projectSelection)) {
-    throw new Error('project-selection 非法');
+    throw new Error('project-selection 非法，仅支持 CURRENT_PROJECT、OTHER_PROJECT、NEW_PROJECT、PREPARED_NEW_PROJECT');
   }
   let projectPath = '';
   if (projectSelection === 'CURRENT_PROJECT' || projectSelection === 'OTHER_PROJECT') {
@@ -1066,6 +1047,10 @@ function runFrameworkResolve(args) {
 }
 
 function startConfirmationFacts(args) {
+  const rootIntent = required(args, 'root-intent');
+  if (!['integration_only', 'full_process'].includes(rootIntent)) {
+    throw new Error('root-intent 仅支持 integration_only、full_process');
+  }
   const productType = required(args, 'product-type');
   const mapping = productVariants[productType];
   if (!mapping) throw new Error('product-type 非法，仅支持 aipay、webpay、apppay');
@@ -1098,6 +1083,7 @@ function startConfirmationFacts(args) {
   }
 
   return {
+    rootIntent,
     productType,
     variant: mapping.variant,
     productName,
@@ -1123,8 +1109,10 @@ function renderStartConfirmation(facts) {
   });
 }
 
-export function createStartConfirmation(args) {
-  return renderStartConfirmation(startConfirmationFacts(args));
+export async function createStartConfirmation(args) {
+  const facts = startConfirmationFacts(args);
+  await startTelemetryRun(facts.rootIntent, facts.productType);
+  return renderStartConfirmation(facts);
 }
 
 export function createChecklistScopeReceipt(productType, projectPath) {
@@ -1231,7 +1219,7 @@ function runProductClarify() {
 function runProductUnsupported(args) {
   return renderMessage('product.unsupported', 'DEFAULT', {
     productName: required(args, 'product-name')
-  }, terminalMetricContextFromArgs(args, { terminalReason: 'unsupported_product' }));
+  });
 }
 
 function runWindowsSandboxSetup() {
@@ -1313,12 +1301,6 @@ function checklistInputFromArgs(args) {
   return input;
 }
 
-function terminalReasonForChecklist(input) {
-  if (input.overallResult === '通过') return 'completed';
-  if (input.overallResult === '未通过' || input.blockingDefectState === 'PRESENT') return 'integration_blocked';
-  return 'partial_with_remaining_actions';
-}
-
 async function runChecklistResult(args) {
   const variant = required(args, 'variant');
   if (!['AIPAY', 'WEBPAY', 'APPPAY'].includes(variant)) throw new Error('variant 非法，仅支持 AIPAY、WEBPAY、APPPAY');
@@ -1361,17 +1343,8 @@ async function runChecklistResult(args) {
       input.nextFlowReminder = '代码开发校验通过后将自动进入支付产品-产品开通；未通过时停留在代码开发。';
     }
   }
+  emitStageMetricAsync('integration.complete_coding', { productType: variant.toLowerCase() });
   const rendered = renderMessage('integration.checklist.result', variant, input);
-  if (input.executionMode === '仅代码开发') {
-    emitTerminalMetric({
-      rootIntent: 'integration_only',
-      productType: variant,
-      ...terminalMetricContextFromArgs(args, {
-        rootIntent: 'integration_only',
-        terminalReason: terminalReasonForChecklist(input)
-      })
-    });
-  }
   return rendered;
 }
 
@@ -1386,7 +1359,7 @@ export async function runIntegrationMessageCli(argv = process.argv) {
     return;
   }
   if (command === 'start-confirm') {
-    console.log(createStartConfirmation(args));
+    console.log(await createStartConfirmation(args));
     process.stderr.write(`${internalPrefix}CUSTOMER_MESSAGE_DELIVERY_REQUIRED=integration.start.confirm\n`);
     return;
   }

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

@@ -4,7 +4,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
-import { recordTelemetryUserInputForCurrentPhase } from './telemetry.mjs';
+import { recordTelemetryUserInput } from './telemetry.mjs';
 
 const internalPrefix = 'ALIPAY_AIPAY_INTERNAL:';
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
@@ -125,7 +125,7 @@ export function runInteractionReplyCli(argv = process.argv) {
   if (command !== 'confirm' || typeof args.reply !== 'string' || !args.reply) {
     throw new Error('用法: interaction_reply.mjs confirm --reply <用户原始回复> --input-id <本地用户输入幂等键>');
   }
-  recordTelemetryUserInputForCurrentPhase(required(args, 'input-id'));
+  recordTelemetryUserInput(required(args, 'input-id'));
   const decision = isAffirmativeReply(args.reply) ? 'CONFIRMED' : 'REJECTED';
   process.stderr.write(`${internalPrefix}REPLY_DECISION=${decision}\n`);
   if (decision === 'REJECTED') process.exitCode = 2;

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

@@ -293,7 +293,6 @@ async function runDiscovery(args) {
   const salesCode = required(args, 'sales-code');
   if (salesCode !== productSalesCodes[productType]) throw new Error('sales-code 与 product-type 不匹配');
   const reusedSigning = reusedSigningBranch(args, productType);
-  emitStageMetricAsync('onboarding.discovery.start', { productType });
 
   const signingPromise = reusedSigning
     ? Promise.resolve(null)
@@ -324,6 +323,10 @@ async function runDiscovery(args) {
       : { query_status: 'NOT_APPLICABLE', applicable: false },
     application: applicationBranch(applicationResult)
   };
+  if (envelope.signing.query_status === 'SUCCESS'
+    && (envelope.signing.sign_status === 'SIGNED_EFFECTIVE' || envelope.signing.sign_status === 'SIGN_SUBMITTED')) {
+    emitStageMetricAsync('onboarding.confirm_signing', { productType });
+  }
   if (globalBlocker) {
     envelope.global_blocker = globalBlocker;
     envelope.auth_recovery_action = recoveryAction;

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

@@ -13,9 +13,7 @@ import {
 } from './render_customer_message.mjs';
 import {
   currentRunContext,
-  emitStageMetricAsync,
-  emitTerminalMetric,
-  terminalMetricContextFromArgs
+  startTelemetryRun,
 } from './telemetry.mjs';
 
 const internalPrefix = 'ALIPAY_AIPAY_INTERNAL:';
@@ -159,12 +157,31 @@ async function readStdin() {
 function runPlatformEntry(args = {}) {
   if (!isWindowsPlatform()) return '';
   const runContext = currentRunContext();
-  if (!runContext || runContext.terminal || !['onboarding_only', 'full_process'].includes(runContext.root_intent)) {
+  if (runContext?.terminal) {
+    throw new Error('Windows 产品开通引导缺少有效的当前 Onboarding run context');
+  }
+  const rootIntent = runContext?.root_intent || process.env.ALIPAY_AIPAY_ROOT_INTENT || process.env.ROOT_INTENT || '';
+  if (!['onboarding_only', 'full_process'].includes(rootIntent)) {
+    throw new Error('Windows 产品开通引导缺少有效的当前 Onboarding run context');
+  }
+  const platformId = runContext?.run_id
+    || platformIdFromEnv(process.env)
+    || '';
+  if (!platformId) {
     throw new Error('Windows 产品开通引导缺少有效的当前 Onboarding run context');
   }
   return renderMessage('onboarding.windows.redirect', 'DEFAULT', {
-    officialUrl: buildWindowsOnboardingRedirectUrl(runContext.run_id)
-  }, terminalMetricContextFromArgs(args, { terminalReason: 'unsupported_platform' }));
+    officialUrl: buildWindowsOnboardingRedirectUrl(platformId)
+  });
+}
+
+function platformIdFromEnv(env = process.env) {
+  const candidate = env.COZE_PROJECT_ID
+    || env.MEOO_PROJECT_ID
+    || (env.MIAODA ? env.VITE_APP_ID || env.PLATFORM_ID || '' : '');
+  return typeof candidate === 'string' && candidate && !/[\u0000-\u001f\u007f,^=]/u.test(candidate)
+    ? candidate
+    : '';
 }
 
 function parseJsonArg(args, name, label) {
@@ -188,15 +205,13 @@ function runEnterpriseUnsupported(args) {
   return renderMessage(
     'onboarding.enterprise.unsupported',
     variant,
-    {},
-    terminalMetricContextFromArgs(args, { terminalReason: 'enterprise_account_unsupported' })
+    {}
   );
 }
 
 async function runMccClarify(args) {
   const productType = required(args, 'product-type');
   const product = productFor({ ...args, 'product-type': productType });
-  emitStageMetricAsync('onboarding.mcc_prepare.start', { productType });
   return renderMessage('onboarding.mcc.clarify', 'DEFAULT', {
     productName: product.productName
   }, { productType });
@@ -693,8 +708,13 @@ function requireCustomerMessageDelivery(messageId, message) {
 }
 
 async function runPlanConfirm(args) {
+  const rootIntent = required(args, 'root-intent');
+  if (!['onboarding_only', 'full_process'].includes(rootIntent)) {
+    throw new Error('root-intent 仅支持 onboarding_only、full_process');
+  }
   const productType = required(args, 'product-type');
   productFor({ ...args, 'product-type': productType });
+  await startTelemetryRun(rootIntent, productType);
   const mccRunContext = captureMccRunContext();
   return requireCustomerMessageDelivery('onboarding.plan.confirm', renderPlanConfirm(productType, {
     mccCode: required(args, 'mcc-code'),
@@ -707,8 +727,11 @@ async function runPlanConfirm(args) {
 async function runMccResolvePlan(args) {
   const productType = required(args, 'product-type');
   productFor({ ...args, 'product-type': productType });
+  const rootIntent = currentRunContext(process.env)?.root_intent || process.env.ALIPAY_AIPAY_ROOT_INTENT || process.env.ROOT_INTENT || '';
+  if (['onboarding_only', 'full_process'].includes(rootIntent)) {
+    await startTelemetryRun(rootIntent, productType);
+  }
   const mccRunContext = captureMccRunContext();
-  emitStageMetricAsync('onboarding.mcc_prepare.start', { productType, runId: mccRunContext.runId });
   const query = required(args, 'query');
   const selected = optional(args, 'select');
   const selectionReceipt = optional(args, 'selection-receipt');
@@ -1117,19 +1140,6 @@ function closeoutInputFromArgs(args) {
 async function runCloseout(args) {
   const variables = closeoutInputFromArgs(args);
   const rendered = renderMessage('process.partial_result', 'DEFAULT', variables);
-  const terminalReason = args['root-intent'] === 'full_process' && variables.integrationResult !== '已完成'
-    ? 'partial_with_remaining_actions'
-    : variables.processResultTitle === '支付产品-产品开通已完成'
-      ? 'completed'
-      : 'partial_with_remaining_actions';
-  emitTerminalMetric({
-    productName: variables.productName,
-    rootIntent: args['root-intent'],
-    ...terminalMetricContextFromArgs(args, {
-      rootIntent: args['root-intent'],
-      terminalReason
-    })
-  });
   return rendered;
 }
 

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

@@ -5,7 +5,7 @@ import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 import { isAffirmativeReply } from './interaction_reply.mjs';
-import { recordTelemetryUserInputForCurrentPhase } from './telemetry.mjs';
+import { recordTelemetryUserInput } from './telemetry.mjs';
 
 const internalPrefix = 'ALIPAY_AIPAY_INTERNAL:';
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
@@ -34,7 +34,7 @@ function required(args, name) {
 }
 
 function assertRegisteredReply(args, kind) {
-  recordTelemetryUserInputForCurrentPhase(required(args, 'input-id'));
+  recordTelemetryUserInput(required(args, 'input-id'));
   if (!isAffirmativeReply(required(args, 'reply'))) {
     process.stderr.write(`${internalPrefix}RECOVERY_INPUT_REJECTED=${kind}\n`);
     process.exitCode = 2;

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

@@ -238,7 +238,7 @@ function expectedMccRunIdFromContext(context = {}) {
 
 function assertCurrentMccRun(receiptPayload, env = process.env, expectedRunId = '') {
   const currentRunId = normalizeExpectedMccRunId(expectedRunId) || activeMccRunId(env);
-  if (currentRunId && receiptPayload.run_id !== currentRunId) {
+  if (receiptPayload.run_id && receiptPayload.run_id !== currentRunId) {
     throw new Error('MCC 上下文回执不属于当前 run');
   }
 }
@@ -904,7 +904,7 @@ const managedEntrypoints = {
     reason: 'runner 按真实平台输出。'
   },
   'integration.start.confirm': {
-    command: 'node "<SKILL_DIR>/references/normal/scripts/runtime.mjs" integration-message start-confirm --product-type <aipay|webpay|apppay> --project-path <absPath> --project-selection <CURRENT_PROJECT|OTHER_PROJECT|PREPARED_NEW_PROJECT> --language <language> --framework <framework>',
+    command: 'node "<SKILL_DIR>/references/normal/scripts/runtime.mjs" integration-message start-confirm --root-intent <integration_only|full_process> --product-type <aipay|webpay|apppay> --project-path <absPath> --project-selection <CURRENT_PROJECT|OTHER_PROJECT|PREPARED_NEW_PROJECT> --language <language> --framework <framework>',
     reason: '绑定同次项目扫描事实。'
   },
   'integration.checklist.result': {
@@ -932,7 +932,7 @@ const managedEntrypoints = {
     reason: 'runner 执行发现并输出摘要。'
   },
   'onboarding.plan.confirm': {
-    command: 'node "<SKILL_DIR>/references/normal/scripts/runtime.mjs" mcc resolve-plan --query <经营描述|MCC编码> --product-type <aipay|webpay|apppay>，或已持有唯一动态 MCC 回执时使用 onboarding-message plan-confirm --product-type <...> --mcc-code <...> --mcc-name <...> --mcc-qualification <...> --mcc-context-receipt <...>',
+    command: 'node "<SKILL_DIR>/references/normal/scripts/runtime.mjs" mcc resolve-plan --query <经营描述|MCC编码> --product-type <aipay|webpay|apppay>，或已持有唯一动态 MCC 回执时使用 onboarding-message plan-confirm --root-intent <onboarding_only|full_process> --product-type <...> --mcc-code <...> --mcc-name <...> --mcc-qualification <...> --mcc-context-receipt <...>',
     reason: 'mcc.sh 绑定当前产品支持类目、详情和特殊资质；plan-confirm 只用于已验证唯一事实。'
   },
   'materials.category.collect': {

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

@@ -5,6 +5,8 @@ import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 
+import { startTelemetryRun } from './telemetry.mjs';
+
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const referencesDir = path.resolve(scriptDir, '../..');
 const flowDirs = Object.freeze({
@@ -128,25 +130,12 @@ function assertEnumOption(options, name, allowedValues, { required = true } = {}
   return value;
 }
 
-function appendOptionalTerminalCountOptions(targetArgs, options) {
-  for (const name of ['user-input-count-total', 'user-input-count-after-flow-start', 'flow-start-observed']) {
-    if (Object.prototype.hasOwnProperty.call(options, name)) targetArgs.push(`--${name}`, requiredOption(options, name));
-  }
-}
-
-async function startTelemetryRun(rootIntent, productType, inputId = '') {
-  const telemetryArgs = ['start-run', '--root-intent', rootIntent];
-  if (productType) telemetryArgs.push('--product-type', productType);
-  if (inputId) telemetryArgs.push('--input-id', inputId);
-  const { runTelemetryCli } = await import('./telemetry.mjs');
-  await runTelemetryCli(cliArgv(telemetryArgs));
-}
-
 async function runIntegrationBootstrap(args) {
   const options = parseRuntimeArgs(args);
   assertOnlyOptions(options, ['root-intent', 'product-type', 'input-id']);
   const rootIntent = assertEnumOption(options, 'root-intent', ['integration_only']);
   const productType = assertEnumOption(options, 'product-type', ['aipay', 'webpay', 'apppay'], { required: false });
+  process.env.ALIPAY_AIPAY_ROOT_INTENT = rootIntent;
   await startTelemetryRun(rootIntent, productType, options['input-id']);
   const { runFlowCli } = await import('./flow_loader.mjs');
   runFlowCli(cliArgv(['integration', 'entry']));
@@ -154,20 +143,13 @@ async function runIntegrationBootstrap(args) {
 
 async function runOnboardingBootstrap(args) {
   const options = parseRuntimeArgs(args);
-  assertOnlyOptions(options, [
-    'root-intent',
-    'product-type',
-    'input-id',
-    'user-input-count-total',
-    'user-input-count-after-flow-start',
-    'flow-start-observed'
-  ]);
+  assertOnlyOptions(options, ['root-intent', 'product-type', 'input-id']);
   const rootIntent = assertEnumOption(options, 'root-intent', ['onboarding_only']);
   const productType = assertEnumOption(options, 'product-type', ['aipay', 'webpay', 'apppay'], { required: false });
+  process.env.ALIPAY_AIPAY_ROOT_INTENT = rootIntent;
   await startTelemetryRun(rootIntent, productType, options['input-id']);
   const { runOnboardingMessageCli } = await import('./onboarding_message_runner.mjs');
   const platformEntryArgs = ['platform-entry'];
-  appendOptionalTerminalCountOptions(platformEntryArgs, options);
   await runOnboardingMessageCli(cliArgv(platformEntryArgs));
   const { isWindowsPlatform } = await import('./platform_compat.mjs');
   if (isWindowsPlatform()) return;