@optima-chat/dev-skills 0.7.43 → 0.8.1

package/dist/bin/helpers/generate-test-token.js

@@ -64,6 +64,14 @@ const ENV_CONFIG = {
         // 注意不要换成同名的 confidential client `commerce-cli-cn-prod-*`，那个需要 client_secret，走不通 CLI 的 public ROPC flow。
         clientId: 'dev-skill-cli-cn-pro-acvkmcuq',
         envName: 'cn-prod'
+    },
+    'cn-stage': {
+        // 阿里云预发（独立于 AWS stage `.optima.onl`）。域名 *.stage.optima.chat。
+        authUrl: 'https://auth.stage.optima.chat',
+        apiUrl: 'https://commerce.stage.optima.chat',
+        // cn-stage user-auth 里注册的 public client（开 password grant，ROPC flow）。
+        clientId: 'dev-skill-cli-cn-sta-3dvsxzdo',
+        envName: 'cn-stage'
     }
 };
 async function httpRequest(url, options = {}) {
@@ -166,6 +174,7 @@ async function main() {
     let phone;
     let address;
     let environment = 'ci';
+    let skipMerchant = false;
     // 解析命令行参数
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
@@ -184,13 +193,16 @@ async function main() {
         else if (arg === '--address' && args[i + 1]) {
             address = args[++i];
         }
+        else if (arg === '--skip-merchant') {
+            skipMerchant = true;
+        }
         else if (arg === '--env' && args[i + 1]) {
             const envArg = args[++i];
-            if (envArg === 'ci' || envArg === 'stage' || envArg === 'prod' || envArg === 'cn-prod') {
+            if (envArg === 'ci' || envArg === 'stage' || envArg === 'prod' || envArg === 'cn-prod' || envArg === 'cn-stage') {
                 environment = envArg;
             }
             else {
-                console.error(`❌ Invalid environment: ${envArg}. Must be 'ci', 'stage', 'prod', or 'cn-prod'.`);
+                console.error(`❌ Invalid environment: ${envArg}. Must be 'ci', 'stage', 'prod', 'cn-prod', or 'cn-stage'.`);
                 process.exit(1);
             }
         }
@@ -204,20 +216,24 @@ Options:
   --business-name <name>       Merchant business name (default: auto-generated)
   --phone <phone>              Merchant phone number (optional)
   --address <address>          Merchant address (optional)
-  --env <environment>          Environment: ci (default), stage, prod, or cn-prod
+  --skip-merchant              只注册用户 + 拿 token，跳过 Commerce merchant profile 设置
+                               （token-only；用于 gateway E2E、或 commerce 未就绪的环境）
+  --env <environment>          Environment: ci (default), stage, prod, cn-prod, or cn-stage
   --help, -h                   Show this help message
 
 Environments:
-  ci       CI 环境 (auth.optima.chat, api.optima.chat)
-  stage    Stage 环境 (auth.stage.optima.onl, api.stage.optima.onl)
-  prod     Prod 环境 (auth.optima.onl, api.optima.onl)
-  cn-prod  阿里云生产环境 (auth.yzsgo.com, commerce.yzsgo.com) [#201]
+  ci        CI 环境 (auth.optima.chat, api.optima.chat)
+  stage     Stage 环境 (auth.stage.optima.onl, api.stage.optima.onl)
+  prod      Prod 环境 (auth.optima.onl, api.optima.onl)
+  cn-prod   阿里云生产环境 (auth.yzsgo.com, commerce.yzsgo.com) [#201]
+  cn-stage  阿里云预发环境 (auth.stage.optima.chat, commerce.stage.optima.chat)
 
 Example:
   optima-generate-test-token
   optima-generate-test-token --env stage
   optima-generate-test-token --env prod
   optima-generate-test-token --env cn-prod
+  optima-generate-test-token --env cn-stage
   optima-generate-test-token --business-name "My Test Shop" --env stage
       `);
             process.exit(0);
@@ -237,8 +253,12 @@ Example:
         const user = await registerMerchant(email, password, businessName, config, phone, address);
         // 2. 获取 token
         const token = await getToken(email, password, config);
-        // 3. 设置 merchant profile（Commerce API）
-        const merchantProfile = await setupMerchantProfile(token, businessName, config);
+        // 3. 设置 merchant profile（Commerce API）；--skip-merchant 时跳过（token-only）
+        const merchantProfile = skipMerchant
+            ? { merchant_id: 'N/A (skipped)' }
+            : await setupMerchantProfile(token, businessName, config);
+        if (skipMerchant)
+            console.log('\n⏭️  Skipped merchant profile setup (--skip-merchant)');
         // 4. 保存 token 到临时文件
         const tmpDir = os.tmpdir();
         const tokenFileName = `optima-test-token-${Date.now()}.txt`;

package/dist/bin/helpers/grant-balance.js

@@ -19,13 +19,14 @@ $1 = 700 credits (P15 unified ledger; the USD wallet is retired).
 Options:
   --amount <usd>        USD amount to grant (required, e.g. 5 for $5.00 = 3500 credits)
   --description <text>  Description for audit trail (optional)
-  --env <env>           Environment: stage, prod, cn-prod (default: stage)
+  --env <env>           Environment: stage, prod, cn-prod, cn-stage (default: stage)
   -h, --help            Show this help
 
 Examples:
   optima-grant-balance user@example.com --amount 5 --env prod
   optima-grant-balance user@example.com --amount 10 --description "Service outage compensation"
-  optima-grant-balance user@example.com --amount 1 --env cn-prod   # ¥-priced env, still USD input ($1 = 700 credits)`);
+  optima-grant-balance user@example.com --amount 1 --env cn-prod   # ¥-priced env, still USD input ($1 = 700 credits)
+  optima-grant-balance user@example.com --amount 1 --env cn-stage  # 阿里云预发`);
         process.exit(0);
     }
     const email = args[0];
@@ -55,10 +56,10 @@ async function main() {
     console.log(`\n🎁 Granting $${amountUsd.toFixed(2)} (${Math.round(amountUsd * 700)} credits) to ${email} [${env.toUpperCase()}]\n`);
     if (description)
         console.log(`   Reason: ${description}`);
-    // cn-prod has no SSH tunnel into the Aliyun RDS — resolve via user-auth's
-    // internal lookup API instead of the direct SQL path.
+    // cn-prod / cn-stage have no SSH tunnel into the Aliyun RDS — resolve via
+    // user-auth's internal lookup API instead of the direct SQL path.
     let userId;
-    if (env === 'cn-prod') {
+    if (env === 'cn-prod' || env === 'cn-stage') {
         userId = await (0, billing_http_1.resolveUserIdByEmail)(env, email);
     }
     else {

package/dist/bin/helpers/grant-subscription.js

@@ -55,7 +55,7 @@ function assertPhoneMatch(inputPhone, accountPhone) {
  */
 function assertAwsEmailOnly(env, kind) {
     if ((env === 'stage' || env === 'prod') && kind !== 'email') {
-        throw new Error('stage/prod 仅支持 email 标识；手机号/userId 解析仅 cn-prod 可用');
+        throw new Error('stage/prod 仅支持 email 标识；手机号/userId 解析仅 cn-prod / cn-stage 可用');
     }
 }
 // cn-prod sells the CNY-priced -cn plans (P12); the bare USD plan ids also
@@ -65,6 +65,8 @@ const PLANS_BY_ENV = {
     stage: ['trial', 'starter', 'pro', 'enterprise'],
     prod: ['trial', 'starter', 'pro', 'enterprise'],
     'cn-prod': ['trial', 'starter-cn', 'pro-cn', 'enterprise-cn'],
+    // cn-stage 卖同一套 CNY -cn plan（billing plan 目录与 cn-prod 一致）
+    'cn-stage': ['trial', 'starter-cn', 'pro-cn', 'enterprise-cn'],
 };
 function parseArgs(args) {
     if (args.length === 0 || args[0] === '--help' || args[0] === '-h') {
@@ -72,9 +74,9 @@ function parseArgs(args) {
 
 Options:
   --plan <id>       Plan: trial, starter, pro, enterprise (default: pro)
-                    cn-prod plans: trial, starter-cn, pro-cn, enterprise-cn (default: pro-cn)
+                    cn-prod/cn-stage plans: trial, starter-cn, pro-cn, enterprise-cn (default: pro-cn)
   --months <n>      Duration in months (default: 1)
-  --env <env>       Environment: stage, prod, cn-prod (default: stage)
+  --env <env>       Environment: stage, prod, cn-prod, cn-stage (default: stage)
   -h, --help        Show this help`);
         process.exit(0);
     }
@@ -94,7 +96,7 @@ Options:
         }
     }
     (0, billing_http_1.validateEnvCnProd)(env);
-    plan = plan ?? (env === 'cn-prod' ? 'pro-cn' : 'pro');
+    plan = plan ?? (env === 'cn-prod' || env === 'cn-stage' ? 'pro-cn' : 'pro');
     const allowed = PLANS_BY_ENV[env];
     if (!allowed.includes(plan)) {
         console.error(`Unknown plan for ${env}: ${plan}. Available: ${allowed.join(', ')}`);
@@ -113,12 +115,12 @@ async function main() {
     console.log(`\n🎁 Granting ${plan} subscription to ${identifier} (${kind}) for ${months} month(s) [${env.toUpperCase()}]\n`);
     // identity is the verified target account to print on success. AWS keeps the
     // pre-change behavior (email-only, no internal HTTP reverse-verify); only
-    // cn-prod runs the full classify→resolve→getUserById→phone-assert防呆 path.
+    // cn-prod / cn-stage run the full classify→resolve→getUserById→phone-assert防呆 path.
     let userId;
     let identity;
-    if (env === 'cn-prod') {
-        // cn-prod has no SSH tunnel into the Aliyun RDS — resolve via user-auth,
-        // and its dev-skills token carries internal:users:write for the lookups.
+    if (env === 'cn-prod' || env === 'cn-stage') {
+        // cn-prod / cn-stage have no SSH tunnel into the Aliyun RDS — resolve via
+        // user-auth, and the dev-skills token carries internal:users:write for lookups.
         if (kind === 'userId') {
             userId = identifier;
         }

package/dist/bin/helpers/query-db.js

@@ -170,7 +170,7 @@ async function main() {
         console.error('Usage: query-db.ts <service> <sql> [environment]');
         console.error('');
         console.error('Services: commerce-backend, user-auth, agentic-chat, bi-backend, session-gateway, gateway-core, optima-logistics, billing, ads-backend, amazon-backend, browser-backend, shopify-backend, optima-generation, optima-sentinel');
-        console.error('Environments: ci (default), stage, prod, cn (阿里云 cn-prod)');
+        console.error('Environments: ci (default), stage, prod, cn-prod (阿里云生产), cn-stage (阿里云预发)');
         console.error('');
         console.error('Example: query-db.ts user-auth "SELECT COUNT(*) FROM users" prod');
         process.exit(1);
@@ -184,19 +184,22 @@ async function main() {
     // cn-prod（阿里云）：独立 Infisical + 经 buildbox 跳板连内网 RDS（动态端口隧道）。
     // 两类 cred：① shared-secrets/database-users（按 prefix）② 服务自己的 DATABASE_URL（展开引用）。
     if ((0, db_utils_1.isCnEnv)(environment)) {
+        // cn-prod / cn-stage 共用 SERVICE_DB_MAP[*].prod 的 userKey/databaseUrlPath（prefix、
+        // /services/<svc> 路径两环境一致）；connectCn* 按 env 切 cn Infisical 环境 + RDS 实例。
+        const label = environment === 'cn-stage' ? 'CN-STAGE' : 'CN-PROD';
         const prodCfg = SERVICE_DB_MAP[service].prod;
         let db;
         if (prodCfg?.userKey) {
             const prefix = prodCfg.userKey.replace(/_DB_USER$/, '');
-            console.log(`\n🔍 Querying ${service} (CN-PROD, prefix ${prefix})...`);
-            db = (0, db_utils_1.connectCnDB)(prefix);
+            console.log(`\n🔍 Querying ${service} (${label}, prefix ${prefix})...`);
+            db = (0, db_utils_1.connectCnDB)(prefix, environment);
         }
         else if (prodCfg?.databaseUrlPath) {
-            console.log(`\n🔍 Querying ${service} (CN-PROD, DATABASE_URL @ ${prodCfg.databaseUrlPath})...`);
-            db = (0, db_utils_1.connectCnDBFromUrl)(prodCfg.databaseUrlPath);
+            console.log(`\n🔍 Querying ${service} (${label}, DATABASE_URL @ ${prodCfg.databaseUrlPath})...`);
+            db = (0, db_utils_1.connectCnDBFromUrl)(prodCfg.databaseUrlPath, environment);
         }
         else {
-            console.error(`cn-prod query 暂不支持 ${service}（既无 userKey 也无 databaseUrlPath）。见 optima-dev-skills#21。`);
+            console.error(`${label} query 暂不支持 ${service}（既无 userKey 也无 databaseUrlPath）。见 optima-dev-skills#21。`);
             process.exit(1);
         }
         console.log('\n' + db.query(sql));

package/dist/bin/helpers/show-env.js

@@ -31,11 +31,15 @@ const SUPPORTED_SERVICES = [
     'optima-sentinel-worker',
     'shopify-backend',
 ];
-// 环境到 Infisical environment 的映射
+// 环境到 AWS Infisical environment 的映射（cn 走独立 cn Infisical，见下方分支）
 const ENV_MAP = {
     stage: 'staging',
     prod: 'prod'
 };
+/** 该 environment 是否被支持（AWS stage/prod 或阿里云 cn-prod/cn-stage）。 */
+function isSupportedEnv(env) {
+    return ENV_MAP[env] !== undefined || (0, db_utils_1.isCnEnv)(env);
+}
 // NOTE: getInfisicalSecrets is kept local because it encodes secretPath (encodeURIComponent),
 // unlike db-utils' raw-path variant; getGitHubVariable/getInfisicalConfig/getInfisicalToken are shared from db-utils.
 function getInfisicalSecrets(config, token, environment, secretPath) {
@@ -53,17 +57,22 @@ Usage: optima-show-env <service> <environment> [options]
 
 Arguments:
   service      Service name (${SUPPORTED_SERVICES.join(', ')})
-  environment  Environment (stage, prod)
+  environment  Environment (stage, prod, cn-prod, cn-stage)
 
 Options:
   --filter     Filter by key pattern (e.g., --filter DATABASE)
   --keys-only  Show only key names, not values
   --help       Show this help message
 
+Note:
+  cn-prod / cn-stage 读阿里云 cn Infisical（需 INFISICAL_CN_EMAIL/PASSWORD 环境变量，
+  admin user，见 optima-dev-skills#21）。stage/prod 读 AWS Infisical（GitHub Variables）。
+
 Examples:
   optima-show-env commerce-backend stage
   optima-show-env user-auth prod --filter DATABASE
-  optima-show-env bi stage --keys-only
+  optima-show-env gateway-core cn-stage
+  optima-show-env bi-backend stage --keys-only
 `);
 }
 async function main() {
@@ -101,22 +110,32 @@ async function main() {
         process.exit(1);
     }
     // 验证环境
-    if (!ENV_MAP[environment]) {
+    if (!isSupportedEnv(environment)) {
         console.error(`Error: Unknown environment '${environment}'`);
-        console.error('Available environments: stage, prod');
+        console.error('Available environments: stage, prod, cn-prod, cn-stage');
         process.exit(1);
     }
     // Infisical 路径为 /services/<service-name>
     const secretPath = `/services/${service}`;
     console.log(`\n🔍 Fetching environment variables for ${service} (${environment.toUpperCase()})...\n`);
     try {
-        const infisicalConfig = (0, db_utils_1.getInfisicalConfig)();
-        console.log('✓ Loaded Infisical config from GitHub Variables');
-        const token = (0, db_utils_1.getInfisicalToken)(infisicalConfig);
-        console.log('✓ Obtained Infisical access token');
-        const infisicalEnv = ENV_MAP[environment];
-        const secrets = getInfisicalSecrets(infisicalConfig, token, infisicalEnv, secretPath);
-        console.log(`✓ Retrieved secrets from Infisical (path: ${secretPath})\n`);
+        let secrets;
+        if ((0, db_utils_1.isCnEnv)(environment)) {
+            // 阿里云 cn Infisical（独立实例，admin email/password 认证；prod / staging 双环境）
+            const cnToken = (0, db_utils_1.getCnInfisicalToken)();
+            console.log('✓ Obtained cn Infisical access token');
+            secrets = (0, db_utils_1.getCnSecrets)(cnToken, secretPath, false, (0, db_utils_1.cnInfisicalEnv)(environment));
+            console.log(`✓ Retrieved secrets from cn Infisical (env: ${(0, db_utils_1.cnInfisicalEnv)(environment)}, path: ${secretPath})\n`);
+        }
+        else {
+            const infisicalConfig = (0, db_utils_1.getInfisicalConfig)();
+            console.log('✓ Loaded Infisical config from GitHub Variables');
+            const token = (0, db_utils_1.getInfisicalToken)(infisicalConfig);
+            console.log('✓ Obtained Infisical access token');
+            const infisicalEnv = ENV_MAP[environment];
+            secrets = getInfisicalSecrets(infisicalConfig, token, infisicalEnv, secretPath);
+            console.log(`✓ Retrieved secrets from Infisical (path: ${secretPath})\n`);
+        }
         const keys = Object.keys(secrets).sort();
         if (keys.length === 0) {
             console.log('No environment variables found.');

package/dist/bin/helpers/verify-health.js

@@ -66,16 +66,17 @@ const https = __importStar(require("node:https"));
 // 服务 × 环境 FQDN 表。某服务某环境没部署 → 该 env 键缺省,探时跳过。
 // cn-prod 真实 subdomain 抄自 optima-terraform alicloud/stacks/cn-prod-ingress-sae/main.tf。
 // #201 (2026-06-12): yzsgo.com 全量迁移完成,旧 *-cn.optima.chat 路由已下线。
+// cn-stage（阿里云预发）域名 *.stage.optima.chat，抄自 cn-stage-ingress-sae services map。
 const SERVICES = {
-    'user-auth': { path: '/health', stage: 'auth-stage.optima.onl', prod: 'auth.optima.onl', cn: 'auth.yzsgo.com' },
-    'agentic-chat': { path: '/api/health', stage: 'ai-stage.optima.onl', prod: 'ai.optima.onl', cn: 'app.yzsgo.com' },
-    'commerce-backend': { path: '/health', stage: 'api-stage.optima.onl', prod: 'api.optima.onl', cn: 'commerce.yzsgo.com', cn_path: '/health/live' },
+    'user-auth': { path: '/health', stage: 'auth-stage.optima.onl', prod: 'auth.optima.onl', cn: 'auth.yzsgo.com', 'cn-stage': 'auth.stage.optima.chat' },
+    'agentic-chat': { path: '/api/health', stage: 'ai-stage.optima.onl', prod: 'ai.optima.onl', cn: 'app.yzsgo.com', 'cn-stage': 'app.stage.optima.chat' },
+    'commerce-backend': { path: '/health', stage: 'api-stage.optima.onl', prod: 'api.optima.onl', cn: 'commerce.yzsgo.com', cn_path: '/health/live', 'cn-stage': 'commerce.stage.optima.chat', 'cn-stage_path': '/health/live' },
     'mcp-host': { path: '/health', stage: 'mcp-stage.optima.onl', prod: 'mcp.optima.onl' },
-    'gateway-core': { path: '/health', cn: 'gw.yzsgo.com' },
-    'optima-scout': { path: '/health', cn: 'scout.yzsgo.com' },
-    'optima-skills': { path: '/health', cn: 'skills.yzsgo.com' },
+    'gateway-core': { path: '/health', cn: 'gw.yzsgo.com', 'cn-stage': 'gw.stage.optima.chat' },
+    'optima-scout': { path: '/health', cn: 'scout.yzsgo.com', 'cn-stage': 'scout.stage.optima.chat' },
+    'optima-skills': { path: '/health', cn: 'skills.yzsgo.com', 'cn-stage': 'skills.stage.optima.chat' },
 };
-const ENVS = ['stage', 'prod', 'cn'];
+const ENVS = ['stage', 'prod', 'cn', 'cn-stage'];
 const G = '\x1b[32m', R = '\x1b[31m', Y = '\x1b[33m', B = '\x1b[34m', N = '\x1b[0m';
 const MARK = { ok: `${G}✅${N}`, fail: `${R}❌${N}`, warn: `${Y}⚠️ ${N}`, na: `${B}··${N}` };
 const verdict = (ls) => ls.some((l) => l.result === 'fail') ? 'fail' : ls.some((l) => l.result === 'warn') ? 'warn' : 'pass';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optima-chat/dev-skills",
-  "version": "0.7.43",
+  "version": "0.8.1",
   "description": "Claude Code Skills for Optima development team - cross-environment collaboration tools",
   "main": "index.js",
   "bin": {