@cloudbase/manager-node 5.8.1 → 5.8.3

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## @cloudbase/manager-node v5.8.2 版本发布 🚀(2026-08-25)
+
+- 新增 support requestFn injection to bypass TC3 signing
+
+---
+
+## @cloudbase/manager-node v5.8.1 版本发布 🚀(2026-08-21)
+
+- 新增 支持一致性发布
+
+---
+
 ## @cloudbase/manager-node v5.8.0 版本发布 🚀(2026-08-20)
 
 - 新增 声明式部署编排（hosting 本地构建/gateway 域名绑定/certId 自动查询）

package/lib/context.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudBaseContext = void 0;
 const constant_1 = require("./constant");
 class CloudBaseContext {
-    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '', envType = '', useInternalEndpoint = undefined, internalEndpointRegion = undefined }) {
+    constructor({ secretId = '', secretKey = '', token = '', proxy = '', region = '', envType = '', useInternalEndpoint = undefined, internalEndpointRegion = undefined, requestFn = undefined }) {
         this.secretId = secretId;
         this.secretKey = secretKey;
         this.token = token;
@@ -12,6 +12,7 @@ class CloudBaseContext {
         this.envType = envType;
         this.useInternalEndpoint = useInternalEndpoint;
         this.internalEndpointRegion = internalEndpointRegion;
+        this.requestFn = requestFn;
     }
     isInternalEndpoint() {
         return this.useInternalEndpoint !== undefined ? this.useInternalEndpoint : constant_1.USE_INTERNAL_ENDPOINT;

package/lib/database/index.js

@@ -40,17 +40,13 @@ class DatabaseService {
         return this.environment;
     }
     getDatabaseConfig() {
-        const currEnv = this.environment;
-        const { Databases } = currEnv.lazyEnvironmentConfig;
         return {
-            Tag: Databases[0].InstanceId
+            Tag: this.getDefaultDatabaseInstanceId()
         };
     }
     getMongoConnector() {
-        const currEnv = this.environment;
-        const { Databases } = currEnv.lazyEnvironmentConfig;
         return {
-            DatabaseName: Databases[0].InstanceId,
+            DatabaseName: this.getDefaultDatabaseInstanceId(),
             InstanceId: 'flexdb'
         };
     }
@@ -500,6 +496,15 @@ class DatabaseService {
             TaskId
         });
     }
+    getDefaultDatabaseInstanceId() {
+        var _a, _b, _c;
+        const currEnv = this.environment;
+        const instanceId = (_c = (_b = (_a = currEnv.lazyEnvironmentConfig) === null || _a === void 0 ? void 0 : _a.Databases) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.InstanceId;
+        if (!instanceId) {
+            throw new error_1.CloudBaseError('当前环境未开通文档型数据库');
+        }
+        return instanceId;
+    }
 }
 exports.DatabaseService = DatabaseService;
 DatabaseService.tcbServiceVersion = {

package/lib/deploy/DeployOrchestrator.js

@@ -44,8 +44,8 @@ class DeployOrchestrator {
      * - database 失败始终强制中断（无论是否 continueOnError）
      */
     async deploy(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        const { config, envId, dryRun, cwd = process.cwd(), log, concurrency = 1, continueOnError = false } = options;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const { config, envId, dryRun, cwd = process.cwd(), log, concurrency = 5, continueOnError = false } = options;
         // 1. 轻量 inline 守卫（validateProject 未接入时的兜底）
         this.guardConfig(config);
         const plan = await this.buildPlan(config, options);
@@ -119,8 +119,25 @@ class DeployOrchestrator {
                 const tasks = toExecute.map((item) => async () => {
                     var _a, _b, _c, _d, _e;
                     try {
-                        const stepResult = await this.executeStep({ item, config, envId, cwd });
-                        results.push({ type: item.type, name: item.name, ok: true, url: stepResult });
+                        const stepResult = await this.executeStep({
+                            item,
+                            config,
+                            envId,
+                            cwd,
+                            onProgress: options.onProgress
+                        });
+                        if (item.type === 'functions') {
+                            results.push({
+                                type: item.type,
+                                name: item.name,
+                                ok: true,
+                                url: stepResult === null || stepResult === void 0 ? void 0 : stepResult.url,
+                                detail: stepResult
+                            });
+                        }
+                        else {
+                            results.push({ type: item.type, name: item.name, ok: true, url: stepResult });
+                        }
                     }
                     catch (e) {
                         const message = (e === null || e === void 0 ? void 0 : e.message) || String(e);
@@ -130,8 +147,10 @@ class DeployOrchestrator {
                             ((_b = e === null || e === void 0 ? void 0 : e.original) === null || _b === void 0 ? void 0 : _b.RequestId) ||
                             ((_c = e === null || e === void 0 ? void 0 : e.response) === null || _c === void 0 ? void 0 : _c.requestId) ||
                             ((_d = e === null || e === void 0 ? void 0 : e.response) === null || _d === void 0 ? void 0 : _d.RequestId);
-                        (_e = log === null || log === void 0 ? void 0 : log.error) === null || _e === void 0 ? void 0 : _e.call(log, `[${item.type}] ${item.name} 部署失败: ${message}`);
-                        results.push(Object.assign({ type: item.type, name: item.name, ok: false, error: message }, (requestId ? { requestId } : {})));
+                        if (!(item.type === 'functions' && options.onProgress)) {
+                            (_e = log === null || log === void 0 ? void 0 : log.error) === null || _e === void 0 ? void 0 : _e.call(log, `[${item.type}] ${item.name} 部署失败: ${message}`);
+                        }
+                        results.push(Object.assign(Object.assign(Object.assign({ type: item.type, name: item.name, ok: false, error: message }, ((e === null || e === void 0 ? void 0 : e.code) ? { errorCode: e.code } : {})), ((e === null || e === void 0 ? void 0 : e.failedStage) ? { failedStage: e.failedStage } : {})), (requestId ? { requestId } : {})));
                         segmentFailed = true;
                         if (item.type === 'database') {
                             segmentDbFailed = true;
@@ -147,7 +166,6 @@ class DeployOrchestrator {
                         return { plan, results };
                     }
                     if (!continueOnError) {
-                        (_h = log === null || log === void 0 ? void 0 : log.error) === null || _h === void 0 ? void 0 : _h.call(log, '存在资源部署失败，中断部署');
                         return { plan, results };
                     }
                 }
@@ -161,7 +179,7 @@ class DeployOrchestrator {
                     await this.persistState({ config, plan, results, cwd, envId: options.envId });
                 }
                 catch (e) {
-                    (_j = log === null || log === void 0 ? void 0 : log.warn) === null || _j === void 0 ? void 0 : _j.call(log, `状态快照写入失败：${(e === null || e === void 0 ? void 0 : e.message) || String(e)}`);
+                    (_h = log === null || log === void 0 ? void 0 : log.warn) === null || _h === void 0 ? void 0 : _h.call(log, `状态快照写入失败：${(e === null || e === void 0 ? void 0 : e.message) || String(e)}`);
                 }
             }
         }
@@ -566,7 +584,7 @@ class DeployOrchestrator {
      * 执行单个计划步骤
      */
     async executeStep(options) {
-        const { item, config, envId, cwd } = options;
+        const { item, config, envId, cwd, onProgress } = options;
         switch (item.type) {
             case 'database': {
                 const dbConfig = config.database;
@@ -585,14 +603,10 @@ class DeployOrchestrator {
                 const functionPath = fn.dir
                     ? path_1.default.resolve(cwd, fn.dir)
                     : path_1.default.join(functionRootPath, fn.name);
-                // 声明式部署幂等语义：函数已存在则覆盖更新（force=true），支持重跑续传
-                const result = await this.functionDeployer.deploy({
-                    func: fn,
-                    functionRootPath,
-                    functionPath,
-                    force: true
+                const deployConfig = Object.assign(Object.assign({}, fn), { functionPath });
+                return this.functionDeployer.deployFunction(deployConfig, {
+                    onProgress: event => onProgress === null || onProgress === void 0 ? void 0 : onProgress(Object.assign(Object.assign({}, event), { resourceType: 'functions', resourceName: item.name }))
                 });
-                return result.url;
             }
             case 'app': {
                 const result = await this.staticDeployer.deployApp({ config: config.app, cwd });

package/lib/deploy/FunctionDeployer.js

@@ -26,6 +26,8 @@ const GatewayDeployer_1 = require("./GatewayDeployer");
 const domain_1 = require("./domain");
 const image_preflight_1 = require("./function/image-preflight");
 const local_builder_1 = require("./function/local-builder");
+const enterprise_tcr_1 = require("./function/enterprise-tcr");
+const personal_tcr_1 = require("./function/personal-tcr");
 const planner_1 = require("./function/planner");
 const preflight_1 = require("./function/preflight");
 const types_1 = require("./types");
@@ -41,16 +43,21 @@ const AUTHZ_USER_REGO_KEY = 'authz.user.rego';
  *
  * 已支持代码包、已有镜像、云端构建、本地构建、匿名访问与网关路径收敛；
  * 函数类型、运行时或协议等创建期字段变化时不会自动删除函数，而是引导用户
- * 在控制台确认并手工删除后重新部署。local 企业版 TCR 等未实现能力会显式报错。
+ * 在控制台确认并手工删除后重新部署。
  */
 class FunctionDeployer {
     constructor(environment, deps) {
-        var _a;
+        var _a, _b, _c;
         this.environment = environment;
         this.functionService = environment.getFunctionService();
         this.imagePreflightDeps = deps === null || deps === void 0 ? void 0 : deps.imagePreflightDeps;
         this.cloudBuildServiceFactory =
             (_a = deps === null || deps === void 0 ? void 0 : deps.cloudBuildServiceFactory) !== null && _a !== void 0 ? _a : (() => (0, cloud_build_service_1.createCloudBuildService)(this.environment.getCloudAppService()));
+        this.localBuilderDeps = deps === null || deps === void 0 ? void 0 : deps.localBuilderDeps;
+        this.tcrServiceFactory =
+            (_b = deps === null || deps === void 0 ? void 0 : deps.tcrServiceFactory) !== null && _b !== void 0 ? _b : (() => (0, enterprise_tcr_1.createTcrApiService)(this.environment));
+        this.personalTcrServiceFactory =
+            (_c = deps === null || deps === void 0 ? void 0 : deps.personalTcrServiceFactory) !== null && _c !== void 0 ? _c : (() => (0, personal_tcr_1.createPersonalTcrService)(this.environment));
     }
     /**
      * 兼容既有声明式部署入口
@@ -214,27 +221,52 @@ class FunctionDeployer {
                 steps: ctx.steps,
                 warnings,
                 startTime,
-                dryRun: true
+                dryRun: true,
+                options
             });
         }
         // 不可原地更新的变更必须在任何可能产生副作用的 Preflight 之前中止。
         // 尤其避免镜像拉取授权自动补齐等云端写操作先发生，再提示用户手工删除函数。
         this.assertPlanExecutable(plan);
-        await this.runStep(ctx, 'preflight', async () => {
-            const report = (0, preflight_1.runLocalPreflight)(normalized);
-            this.appendWarnings(warnings, report);
-            this.assertPreflightReady(report);
-        });
-        await this.runStep(ctx, 'preflight', async () => {
-            const report = await (0, cam_preflight_1.runImagePullAuthPreflight)(this.createCamPreflightAdapter(), normalized, options.autoGrant !== false);
-            this.appendWarnings(warnings, report);
-            this.assertPreflightReady(report);
-        });
-        await this.runStep(ctx, 'preflight', async () => {
-            const report = await (0, image_preflight_1.runImageRemotePreflight)(normalized, this.resolveDeployRegion(), this.imagePreflightDeps);
-            this.appendWarnings(warnings, report);
-            this.assertPreflightReady(report);
-        });
+        if (normalized.type === 'HTTP' &&
+            (normalized.buildStrategy === 'cloud' || normalized.buildStrategy === 'zip')) {
+            await this.runLabeledStep(ctx, {
+                stage: 'preflight',
+                handler: async () => {
+                    const report = (0, preflight_1.runLocalPreflight)(normalized);
+                    this.appendWarnings(warnings, report);
+                    this.assertPreflightReady(report);
+                },
+                label: normalized.buildStrategy === 'cloud'
+                    ? '检查云端构建上下文'
+                    : '检查函数代码包'
+            });
+        }
+        if (normalized.type === 'HTTP' &&
+            (normalized.buildStrategy === 'image' ||
+                normalized.buildStrategy === 'local' ||
+                normalized.buildStrategy === 'cloud')) {
+            await this.runLabeledStep(ctx, {
+                stage: 'preflight',
+                handler: async () => {
+                    const report = await (0, cam_preflight_1.runImagePullAuthPreflight)(this.createCamPreflightAdapter(), normalized, options.autoGrant !== false);
+                    this.appendWarnings(warnings, report);
+                    this.assertPreflightReady(report);
+                },
+                label: '检查镜像仓库访问权限'
+            });
+        }
+        if (normalized.type === 'HTTP' && normalized.buildStrategy === 'image') {
+            await this.runLabeledStep(ctx, {
+                stage: 'preflight',
+                handler: async () => {
+                    const report = await (0, image_preflight_1.runImageRemotePreflight)(normalized, this.resolveDeployRegion(), this.imagePreflightDeps);
+                    this.appendWarnings(warnings, report);
+                    this.assertPreflightReady(report);
+                },
+                label: '检查远端镜像与地域'
+            });
+        }
         // noop：函数本身无变更，但仍可能需要收敛访问配置
         if (plan.action === 'noop') {
             await this.applyAccessPlan(ctx, normalized, plan);
@@ -244,7 +276,8 @@ class FunctionDeployer {
                 steps: ctx.steps,
                 warnings,
                 startTime,
-                dryRun: false
+                dryRun: false,
+                options
             });
         }
         const artifact = await this.prepareArtifact(ctx, normalized, warnings);
@@ -257,6 +290,7 @@ class FunctionDeployer {
             warnings,
             startTime,
             dryRun: false,
+            options,
             artifact
         });
     }
@@ -310,6 +344,21 @@ class FunctionDeployer {
             return undefined;
         }
     }
+    resolveEnvironmentId() {
+        try {
+            return this.environment.getEnvId();
+        }
+        catch (_a) {
+            return '';
+        }
+    }
+    requireDeployRegion() {
+        const region = this.resolveDeployRegion();
+        if (!region) {
+            throw new error_1.CloudBaseError('企业版 TCR 自动发现需要明确部署地域，请在环境配置中设置 region。', { code: types_1.FUNCTION_DEPLOY_ERROR.TCR_REGION_MISSING });
+        }
+        return region;
+    }
     /**
      * 构造镜像拉取授权 Preflight 所需的 CAM 适配器
      *
@@ -398,6 +447,64 @@ class FunctionDeployer {
                 '\n部署器不会自动删除已有云函数。请先在云开发控制台确认触发器、访问配置和服务中断影响，手工删除该函数后重新部署。', { code: types_1.FUNCTION_DEPLOY_ERROR.FUNCTION_RECREATE_REQUIRED });
         }
     }
+    async prepareEnterpriseBuildConfig(ctx, config) {
+        const repository = config.build.repository || '';
+        const hasPreparedTarget = Boolean((config.registryId || config.build.registryId) && repository.split('/').length >= 3);
+        if (config.imageType !== 'enterprise' || hasPreparedTarget) {
+            return { config };
+        }
+        const prepared = await this.runLabeledStep(ctx, {
+            stage: 'preflight',
+            label: '准备企业版 TCR 目标仓库',
+            handler: () => (0, enterprise_tcr_1.prepareEnterpriseTcrTarget)(config, {
+                envId: this.resolveEnvironmentId(),
+                region: this.requireDeployRegion(),
+                service: this.tcrServiceFactory()
+            })
+        });
+        return { config: prepared.config, target: prepared.target };
+    }
+    async preparePersonalBuildConfig(ctx, config) {
+        var _a, _b, _c;
+        if (config.imageType !== 'personal') {
+            return config;
+        }
+        const envId = this.resolveEnvironmentId();
+        const configuredNamespace = (_a = config.build.namespace) === null || _a === void 0 ? void 0 : _a.trim();
+        const hasConfiguredRepository = Boolean((_b = config.build.repository) === null || _b === void 0 ? void 0 : _b.trim());
+        const configuredRepository = ((_c = config.build.repository) === null || _c === void 0 ? void 0 : _c.trim()) || config.name;
+        const parsedRepository = (0, config_guard_1.parseImageReference)(configuredRepository);
+        if (!parsedRepository || parsedRepository.tag || parsedRepository.digest) {
+            throw new error_1.CloudBaseError('个人版 TCR repository 不合法。', {
+                code: types_1.FUNCTION_DEPLOY_ERROR.BUILD_REPOSITORY_INVALID
+            });
+        }
+        const repositoryParts = parsedRepository.repository.split('/');
+        const repository = repositoryParts[repositoryParts.length - 1];
+        const repositoryNamespace = repositoryParts.length > 1 ? repositoryParts.slice(0, -1).join('/') : undefined;
+        const namespace = configuredNamespace || repositoryNamespace || envId;
+        const hasConfiguredNamespace = Boolean(configuredNamespace || repositoryNamespace);
+        const registry = parsedRepository.registry || personal_tcr_1.DEFAULT_PERSONAL_TCR_REGISTRY;
+        const credential = config.build.registryCredential;
+        if (!(credential === null || credential === void 0 ? void 0 : credential.username) || !credential.password) {
+            throw new error_1.CloudBaseError('个人版 TCR 构建缺少推送凭证。', {
+                code: types_1.FUNCTION_DEPLOY_ERROR.CLOUD_REGISTRY_CREDENTIAL_MISSING
+            });
+        }
+        await this.runLabeledStep(ctx, {
+            stage: 'preflight',
+            label: '准备个人版 TCR 目标仓库',
+            handler: () => this.personalTcrServiceFactory().ensurePushTarget({
+                namespace,
+                repository,
+                ensureNamespace: !hasConfiguredNamespace,
+                ensureRepository: !hasConfiguredRepository
+            })
+        });
+        const targetRepository = `${registry}/${namespace}/${repository}`;
+        const preparedConfig = Object.assign(Object.assign({}, config), { build: Object.assign(Object.assign({}, config.build), { namespace, repository: targetRepository, registryCredential: credential }) });
+        return preparedConfig;
+    }
     /**
      * 准备部署物
      *
@@ -406,8 +513,22 @@ class FunctionDeployer {
      * 其余策略走同步的 pack。
      */
     async prepareArtifact(ctx, config, warnings) {
+        var _a;
         if (config.buildStrategy === 'cloud') {
-            const cloudConfig = config;
+            const prepared = await this.prepareEnterpriseBuildConfig(ctx, config);
+            const cloudConfig = await this.preparePersonalBuildConfig(ctx, prepared.config);
+            // 企业版登录凭证在触发 CloudApp 构建前换取，构建容器只消费 Secrets，
+            // 不再自行签名调用 TCR API。
+            const cloudRegistryId = ((_a = prepared.target) === null || _a === void 0 ? void 0 : _a.registryId) ||
+                cloudConfig.build.registryId ||
+                cloudConfig.registryId;
+            const enterpriseCredential = cloudConfig.imageType === 'enterprise' && cloudRegistryId
+                ? await this.runLabeledStep(ctx, {
+                    stage: 'preflight',
+                    label: '获取企业版 TCR 临时登录凭证',
+                    handler: () => (0, enterprise_tcr_1.createEnterpriseTcrCredential)(this.tcrServiceFactory(), cloudRegistryId)
+                })
+                : undefined;
             const buildResult = await this.runStep(ctx, 'build', async () => {
                 const cloudBuildService = this.cloudBuildServiceFactory();
                 return (0, cloud_1.buildImageOnCloud)(cloudConfig, cloudBuildService, {
@@ -416,27 +537,99 @@ class FunctionDeployer {
                         status: 'start',
                         message: line
                     }),
-                    region: this.resolveDeployRegion()
+                    enterpriseCredential
                 });
             });
-            return (0, artifact_1.createImageArtifactFromCloudBuild)(config, buildResult);
+            return (0, artifact_1.createImageArtifactFromCloudBuild)(cloudConfig, buildResult);
         }
         if (config.buildStrategy === 'local') {
-            await this.runStep(ctx, 'preflight', async () => {
-                const report = await (0, docker_preflight_1.runDockerPreflight)();
-                this.appendWarnings(warnings, report);
-                this.assertPreflightReady(report);
+            await this.runLabeledStep(ctx, {
+                stage: 'preflight',
+                handler: async () => {
+                    const report = await (0, docker_preflight_1.runDockerPreflight)();
+                    this.appendWarnings(warnings, report);
+                    this.assertPreflightReady(report);
+                },
+                label: '检查本地 Docker 环境'
             });
-            const localConfig = config;
-            const buildResult = await this.runStep(ctx, 'build', async () => {
-                return (0, local_builder_1.buildAndPushImage)(localConfig, line => this.emitProgress(ctx.options, { stage: 'build', status: 'start', message: line }));
-            });
-            return (0, artifact_1.createImageArtifactFromBuild)(config, buildResult);
+            const prepared = await this.prepareEnterpriseBuildConfig(ctx, config);
+            const localConfig = await this.preparePersonalBuildConfig(ctx, prepared.config);
+            const credential = await this.resolveLocalRegistryCredential(localConfig);
+            const dockerConfig = credential ? (0, local_builder_1.createTemporaryDockerConfig)() : undefined;
+            const commandOptions = dockerConfig ? { env: dockerConfig.env } : undefined;
+            try {
+                if (credential) {
+                    await this.runStep(ctx, 'login', async () => {
+                        await (0, local_builder_1.loginDockerRegistry)(this.resolveRegistryFromRepository(localConfig.build.repository), credential, { deps: this.localBuilderDeps, commandOptions });
+                    });
+                }
+                const buildResult = await this.runStep(ctx, 'build', async () => {
+                    return (0, local_builder_1.buildLocalImage)(localConfig, line => this.emitProgress(ctx.options, {
+                        stage: 'build',
+                        status: 'start',
+                        message: line
+                    }), { deps: this.localBuilderDeps, commandOptions });
+                });
+                const pushResult = await this.runStep(ctx, 'push', async () => {
+                    return (0, local_builder_1.pushLocalImage)(buildResult.imageUri, line => this.emitProgress(ctx.options, {
+                        stage: 'push',
+                        status: 'start',
+                        message: line
+                    }), { deps: this.localBuilderDeps, commandOptions });
+                });
+                if (localConfig.imageType === 'personal') {
+                    await this.runLabeledStep(ctx, {
+                        stage: 'push',
+                        label: '清理历史镜像标签',
+                        handler: () => this.personalTcrServiceFactory().cleanupTags({
+                            namespace: localConfig.build.namespace,
+                            repository: localConfig.build.repository,
+                            retain: localConfig.build.retainedTags
+                        })
+                    });
+                }
+                return (0, artifact_1.createImageArtifactFromBuild)(localConfig, {
+                    imageUri: buildResult.imageUri,
+                    imageDigest: pushResult.imageDigest
+                });
+            }
+            finally {
+                dockerConfig === null || dockerConfig === void 0 ? void 0 : dockerConfig.cleanup();
+            }
         }
         return this.runStep(ctx, 'pack', async () => {
             return this.createArtifact(config);
         });
     }
+    async resolveLocalRegistryCredential(config) {
+        var _a, _b, _c;
+        const imageType = (_a = config.imageType) !== null && _a !== void 0 ? _a : (((_b = config.registryId) !== null && _b !== void 0 ? _b : config.build.registryId) ? 'enterprise' : 'personal');
+        if (imageType === 'enterprise') {
+            const registryId = (_c = config.registryId) !== null && _c !== void 0 ? _c : config.build.registryId;
+            if (!registryId) {
+                throw new error_1.CloudBaseError('企业版 TCR local 构建缺少 registryId。', {
+                    code: types_1.FUNCTION_DEPLOY_ERROR.IMAGE_REGISTRY_ID_MISSING
+                });
+            }
+            const credential = await (0, enterprise_tcr_1.createEnterpriseTcrCredential)(this.tcrServiceFactory(), registryId);
+            return { username: credential.username, secret: credential.token };
+        }
+        const credential = config.build.registryCredential;
+        if (!credential) {
+            return undefined;
+        }
+        return { username: credential.username, secret: credential.password };
+    }
+    resolveRegistryFromRepository(repository) {
+        const normalized = typeof repository === 'string' ? repository.trim() : '';
+        const slashIndex = normalized.indexOf('/');
+        if (slashIndex <= 0) {
+            throw new error_1.CloudBaseError('local 策略的目标镜像地址缺少仓库域名', {
+                code: types_1.FUNCTION_DEPLOY_ERROR.LOCAL_BUILD_REPOSITORY_MISSING
+            });
+        }
+        return normalized.slice(0, slashIndex);
+    }
     /** 生成部署物 */
     createArtifact(config) {
         if (config.buildStrategy === 'image') {
@@ -499,24 +692,53 @@ class FunctionDeployer {
             });
         }
     }
-    /** 执行单个步骤并记录耗时与进度 */
+    /** 执行普通步骤并记录耗时与进度 */
     async runStep(ctx, stage, handler) {
+        return this.executeStep(ctx, { stage, handler });
+    }
+    /** 执行带具体名称的步骤并记录耗时与进度 */
+    async runLabeledStep(ctx, options) {
+        return this.executeStep(ctx, options);
+    }
+    async executeStep(ctx, options) {
+        var _a, _b, _c, _d, _e;
+        const { stage, handler, label } = options;
         const startTime = Date.now();
-        this.emitProgress(ctx.options, { stage, status: 'start' });
+        this.emitProgress(ctx.options, { stage, label, status: 'start' });
         try {
             const result = await handler();
-            ctx.steps.push({ stage, status: 'success', elapsedTime: Date.now() - startTime });
-            this.emitProgress(ctx.options, { stage, status: 'success' });
+            const elapsedTime = Date.now() - startTime;
+            ctx.steps.push({ stage, label, status: 'success', elapsedTime });
+            this.emitProgress(ctx.options, { stage, label, status: 'success', elapsedTime });
             return result;
         }
         catch (error) {
+            const elapsedTime = Date.now() - startTime;
             ctx.steps.push({
                 stage,
+                label,
+                status: 'failed',
+                elapsedTime,
+                detail: error === null || error === void 0 ? void 0 : error.message,
+                errorCode: error === null || error === void 0 ? void 0 : error.code
+            });
+            this.emitProgress(ctx.options, {
+                stage,
+                label,
                 status: 'failed',
-                elapsedTime: Date.now() - startTime,
-                detail: error === null || error === void 0 ? void 0 : error.message
+                message: error === null || error === void 0 ? void 0 : error.message,
+                elapsedTime,
+                errorCode: error === null || error === void 0 ? void 0 : error.code,
+                requestId: (error === null || error === void 0 ? void 0 : error.requestId) ||
+                    (error === null || error === void 0 ? void 0 : error.RequestId) ||
+                    ((_a = error === null || error === void 0 ? void 0 : error.original) === null || _a === void 0 ? void 0 : _a.requestId) ||
+                    ((_b = error === null || error === void 0 ? void 0 : error.original) === null || _b === void 0 ? void 0 : _b.RequestId) ||
+                    ((_d = (_c = error === null || error === void 0 ? void 0 : error.original) === null || _c === void 0 ? void 0 : _c.Response) === null || _d === void 0 ? void 0 : _d.RequestId) ||
+                    ((_e = error === null || error === void 0 ? void 0 : error.response) === null || _e === void 0 ? void 0 : _e.RequestId)
             });
-            this.emitProgress(ctx.options, { stage, status: 'failed', message: error === null || error === void 0 ? void 0 : error.message });
+            if (error && !error.failedStage) {
+                error.failedStage = stage;
+            }
             throw error;
         }
     }
@@ -567,11 +789,19 @@ class FunctionDeployer {
         return result;
     }
     emitProgressDone(params) {
+        const elapsedTime = Date.now() - params.startTime;
         params.steps.push({
             stage: 'done',
             status: 'success',
-            elapsedTime: Date.now() - params.startTime
+            elapsedTime
         });
+        if (params.options) {
+            this.emitProgress(params.options, {
+                stage: 'done',
+                status: 'success',
+                elapsedTime
+            });
+        }
     }
 }
 exports.FunctionDeployer = FunctionDeployer;

package/lib/deploy/StaticDeployer.js

@@ -73,7 +73,13 @@ class StaticDeployer {
         const hostingOptions = {
             localPath: outputDir,
             cloudPath,
-            ignore: config.ignore || ['.DS_Store']
+            ignore: config.ignore || ['.DS_Store'],
+            // 声明式配置名为 entryFile，透传到 uploadFiles 时对应 entryFiles
+            entryFiles: config.entryFile,
+            // 一致性发布开关：任一开启即走一致性上传（uploadDirectoryConsistent）
+            verify: config.verify,
+            safe: config.safe,
+            prune: config.prune
         };
         await this.environment.getHostingService().uploadFiles(hostingOptions);
         const url = await this.resolveHostingUrl(cloudPath);