@cloudbase/manager-node 5.8.2 → 5.8.4

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## @cloudbase/manager-node v5.8.3 版本发布 🚀(2026-08-28)
+
+- 新增 完善云函数镜像部署闭环
+- 新增 support consistency deploy options in hosting declarative deploy
+- 修复 仅 cdn/空 domainType 调用 CDN 接口
+- 修复 handle missing document database config
+
+---
+
+## @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)
 
 - 新增 支持一致性发布

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

@@ -10,8 +10,7 @@ const DatabaseDeployer_1 = require("./DatabaseDeployer");
 const FunctionDeployer_1 = require("./FunctionDeployer");
 const StaticDeployer_1 = require("./StaticDeployer");
 const GatewayDeployer_1 = require("./GatewayDeployer");
-const StateStore_1 = require("./StateStore");
-const framework_1 = require("./framework");
+const config_guard_1 = require("./function/config-guard");
 const parallel_1 = require("../utils/parallel");
 /** 部署顺序（按依赖：database 最先，函数依赖新 Schema；gateway 最后，依赖函数/hosting） */
 const DEPLOY_ORDER = ['database', 'functions', 'app', 'hosting', 'gateway'];
@@ -32,7 +31,8 @@ class DeployOrchestrator {
      * 计算部署计划（dry-run 输出）
      */
     async deployPlan(options) {
-        return this.buildPlan(options.config, options);
+        const config = this.normalizeFunctionConfigs(options.config, options.envId, options.cwd);
+        return this.buildPlan(config, options);
     }
     /**
      * 执行部署
@@ -44,8 +44,9 @@ 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: inputConfig, envId, dryRun, cwd = process.cwd(), log, concurrency = 5, continueOnError = false } = options;
+        const config = this.normalizeFunctionConfigs(inputConfig, envId, cwd);
         // 1. 轻量 inline 守卫（validateProject 未接入时的兜底）
         this.guardConfig(config);
         const plan = await this.buildPlan(config, options);
@@ -59,114 +60,157 @@ class DeployOrchestrator {
         // gateway 段强制串行：executeStep 的 gateway 分支部署 config.gateway.routes 全部路由
         // （逐路由 plan item 仅用于展示 diff），并发执行会对同一批路由发起重复全量部署（竞态 create/modify 路由、bindCustomDomain）
         const globalLimit = Math.max(1, Math.min(Number(concurrency) || 1, 20));
-        try {
-            for (const segment of segments) {
-                // 段内并行度：gateway 段固定 1（全量部署语义）；其余段用全局 concurrency
-                const limit = ((_b = segment[0]) === null || _b === void 0 ? void 0 : _b.type) === 'gateway' ? 1 : globalLimit;
-                // 段内预判定（顺序执行，保留交互/冲突中断语义）
-                const toExecute = [];
-                let segmentFailed = false;
-                let segmentDbFailed = false;
-                for (const item of segment) {
-                    // skip：产物/配置未变更，静默跳过（不执行、不询问）
-                    if (item.status === 'skip') {
-                        (_c = log === null || log === void 0 ? void 0 : log.info) === null || _c === void 0 ? void 0 : _c.call(log, `[${item.type}] ${item.name}: ${item.action}`);
-                        results.push({ type: item.type, name: item.name, ok: true, reason: 'skip' });
-                        continue;
-                    }
-                    (_d = log === null || log === void 0 ? void 0 : log.info) === null || _d === void 0 ? void 0 : _d.call(log, `[${item.type}] ${item.name}: ${item.action}`);
-                    // conflict：数据库迁移冲突 → 中断整个部署（后续资源可能依赖新 Schema）
-                    if (item.status === 'conflict') {
-                        const message = '检测到冲突，已中断部署';
-                        (_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({ type: item.type, name: item.name, ok: false, error: message });
-                        if (item.type === 'database') {
-                            return { plan, results };
-                        }
-                        segmentFailed = true;
-                        continue;
-                    }
-                    // 覆盖确认：仅函数已存在（update）时触发，对齐 tcb fn deploy 的 FunctionConflictChecker 语义
-                    // yes=true 直接放行；注入 confirmUpdate 按回调决定；两者都无 → 保守跳过（no-confirm）
-                    if (item.type === 'functions' && item.status === 'update') {
-                        let confirmed = false;
-                        if (options.yes) {
-                            confirmed = true;
-                        }
-                        else if (options.confirmUpdate) {
-                            confirmed = await options.confirmUpdate(item);
-                        }
-                        if (!confirmed) {
-                            const reason = options.confirmUpdate
-                                ? 'skipped-by-user'
-                                : 'no-confirm';
-                            (_f = log === null || log === void 0 ? void 0 : log.warn) === null || _f === void 0 ? void 0 : _f.call(log, `[${item.type}] ${item.name} 跳过覆盖更新（${reason}）`);
-                            results.push({ type: item.type, name: item.name, ok: false, reason });
-                            continue;
-                        }
-                    }
-                    toExecute.push(item);
+        for (const segment of segments) {
+            // 段内并行度：gateway 段固定 1（全量部署语义）；其余段用全局 concurrency
+            const limit = ((_b = segment[0]) === null || _b === void 0 ? void 0 : _b.type) === 'gateway' ? 1 : globalLimit;
+            // 段内预判定（顺序执行，保留交互/冲突中断语义）
+            const toExecute = [];
+            let segmentFailed = false;
+            let segmentDbFailed = false;
+            for (const item of segment) {
+                // skip：产物/配置未变更，静默跳过（不执行、不询问）
+                if (item.status === 'skip') {
+                    (_c = log === null || log === void 0 ? void 0 : log.info) === null || _c === void 0 ? void 0 : _c.call(log, `[${item.type}] ${item.name}: ${item.action}`);
+                    results.push({ type: item.type, name: item.name, ok: true, reason: 'skip' });
+                    continue;
                 }
-                if (toExecute.length === 0) {
-                    // 段内无实际执行项：若本段已因 conflict 标记失败且 fail-fast，则中断
-                    if (segmentFailed && !continueOnError) {
+                (_d = log === null || log === void 0 ? void 0 : log.info) === null || _d === void 0 ? void 0 : _d.call(log, `[${item.type}] ${item.name}: ${item.action}`);
+                // conflict：数据库迁移冲突 → 中断整个部署（后续资源可能依赖新 Schema）
+                if (item.status === 'conflict') {
+                    const message = '检测到冲突，已中断部署';
+                    (_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({ type: item.type, name: item.name, ok: false, error: message });
+                    if (item.type === 'database') {
                         return { plan, results };
                     }
+                    segmentFailed = true;
                     continue;
                 }
-                // 段内并行执行
-                const controller = new parallel_1.AsyncTaskParallelController(limit);
-                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 });
-                    }
-                    catch (e) {
-                        const message = (e === null || e === void 0 ? void 0 : e.message) || String(e);
-                        const requestId = (e === null || e === void 0 ? void 0 : e.requestId) ||
-                            (e === null || e === void 0 ? void 0 : e.RequestId) ||
-                            ((_a = e === null || e === void 0 ? void 0 : e.original) === null || _a === void 0 ? void 0 : _a.requestId) ||
-                            ((_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 } : {})));
-                        segmentFailed = true;
-                        if (item.type === 'database') {
-                            segmentDbFailed = true;
-                        }
+                // 覆盖确认：仅函数已存在（update）时触发，对齐 tcb fn deploy 的 FunctionConflictChecker 语义
+                // yes=true 直接放行；注入 confirmUpdate 按回调决定；两者都无 → 保守跳过（no-confirm）
+                if (item.type === 'functions' && item.status === 'update') {
+                    let confirmed = false;
+                    if (options.yes) {
+                        confirmed = true;
                     }
-                });
-                controller.loadTasks(tasks);
-                await controller.run();
-                // 段内失败中断决策
-                if (segmentFailed) {
-                    if (segmentDbFailed) {
-                        (_g = log === null || log === void 0 ? void 0 : log.error) === null || _g === void 0 ? void 0 : _g.call(log, '数据库迁移失败，中断部署');
-                        return { plan, results };
+                    else if (options.confirmUpdate) {
+                        confirmed = await options.confirmUpdate(item);
                     }
-                    if (!continueOnError) {
-                        (_h = log === null || log === void 0 ? void 0 : log.error) === null || _h === void 0 ? void 0 : _h.call(log, '存在资源部署失败，中断部署');
-                        return { plan, results };
+                    if (!confirmed) {
+                        const reason = options.confirmUpdate
+                            ? 'skipped-by-user'
+                            : 'no-confirm';
+                        (_f = log === null || log === void 0 ? void 0 : log.warn) === null || _f === void 0 ? void 0 : _f.call(log, `[${item.type}] ${item.name} 跳过覆盖更新（${reason}）`);
+                        results.push({ type: item.type, name: item.name, ok: false, reason });
+                        continue;
                     }
                 }
+                toExecute.push(item);
             }
-        }
-        finally {
-            // 无论部署全部成功还是 fail-fast 中断，都将已成功资源的状态快照落盘
-            // （失败资源保留旧快照，下次 diff 仍会检测到差异）；快照写入失败不影响部署结果
-            if (!dryRun) {
+            if (toExecute.length === 0) {
+                // 段内无实际执行项：若本段已因 conflict 标记失败且 fail-fast，则中断
+                if (segmentFailed && !continueOnError) {
+                    return { plan, results };
+                }
+                continue;
+            }
+            // 段内并行执行
+            const controller = new parallel_1.AsyncTaskParallelController(limit);
+            const tasks = toExecute.map((item) => async () => {
+                var _a, _b, _c, _d, _e;
                 try {
-                    await this.persistState({ config, plan, results, cwd, envId: options.envId });
+                    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) {
-                    (_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)}`);
+                    const message = (e === null || e === void 0 ? void 0 : e.message) || String(e);
+                    const requestId = (e === null || e === void 0 ? void 0 : e.requestId) ||
+                        (e === null || e === void 0 ? void 0 : e.RequestId) ||
+                        ((_a = e === null || e === void 0 ? void 0 : e.original) === null || _a === void 0 ? void 0 : _a.requestId) ||
+                        ((_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);
+                    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;
+                    }
+                }
+            });
+            controller.loadTasks(tasks);
+            await controller.run();
+            // 段内失败中断决策
+            if (segmentFailed) {
+                if (segmentDbFailed) {
+                    (_g = log === null || log === void 0 ? void 0 : log.error) === null || _g === void 0 ? void 0 : _g.call(log, '数据库迁移失败，中断部署');
+                    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 };
                 }
             }
         }
         return { plan, results };
     }
+    /**
+     * 归一化声明式函数配置：直接消费 cloudbaserc 的嵌套形状（imageConfig.build），
+     * 不做字段平铺映射；非 HTTP 函数原样返回。
+     */
+    normalizeFunctionConfigs(config, envId, cwd = process.cwd()) {
+        if (!Array.isArray(config === null || config === void 0 ? void 0 : config.functions)) {
+            return config;
+        }
+        const functionRootPath = path_1.default.resolve(cwd, config.functionRoot || 'functions');
+        return Object.assign(Object.assign({}, config), { functions: config.functions.map((func) => {
+                var _a, _b;
+                // 直接消费 cloudbaserc 的嵌套形状（imageConfig.build），不再做字段平铺映射。
+                // 非镜像/构建策略由 prepareMinimalDeployConfig 内部识别并原样返回。
+                if ((func === null || func === void 0 ? void 0 : func.type) !== 'HTTP') {
+                    return func;
+                }
+                const funcAny = func;
+                const explicitCwd = (_b = (_a = funcAny.imageConfig) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.cwd;
+                const dir = funcAny.dir;
+                // 构建上下文根解析优先级：显式 build.cwd > dir > functionRoot/name。
+                // 相对路径一律以部署传入的项目 cwd 为基准解析为绝对路径，避免 preflight
+                // 与云端构建（builders/cloud.ts）以进程 CWD 兜底导致目录错位。
+                const resolvedContextRoot = typeof explicitCwd === 'string' && explicitCwd.trim()
+                    ? path_1.default.resolve(cwd, explicitCwd)
+                    : typeof dir === 'string' && dir.trim()
+                        ? path_1.default.resolve(cwd, dir)
+                        : undefined;
+                // 显式 build.cwd 归一为绝对路径写回，避免 applyMinimalDeployConfigDefaults
+                // 因 build.cwd 已存在而保留原始相对值。
+                const normalizedFunc = resolvedContextRoot && typeof explicitCwd === 'string' && explicitCwd.trim()
+                    ? Object.assign(Object.assign({}, funcAny), { imageConfig: Object.assign(Object.assign({}, funcAny.imageConfig), { build: Object.assign(Object.assign({}, funcAny.imageConfig.build), { cwd: resolvedContextRoot }) }) }) : func;
+                return (0, config_guard_1.prepareMinimalDeployConfig)(normalizedFunc, {
+                    envId,
+                    functionPath: resolvedContextRoot,
+                    functionRootPath
+                }).config;
+            }) });
+    }
     /**
      * 将扁平 plan 按「连续相同资源类型」切成有序 segments
      *
@@ -194,91 +238,19 @@ class DeployOrchestrator {
         }
         return segments;
     }
-    /**
-     * 部署成功后写回本地 state 快照
-     *
-     * - hosting：成功部署/未变更（skip）的项重算产物指纹；失败项保留旧快照
-     * - app：成功部署写 buildAppConfig 快照；skip 复用旧快照
-     * - gateway：保留旧快照（本轮不做路由级实时快照）
-     */
-    async persistState(options) {
-        var _a, _b, _c, _d, _e, _f;
-        const { config, plan, results, cwd, envId } = options;
-        const stateStore = new StateStore_1.StateStore({ cwd });
-        const prev = stateStore.read();
-        // hosting
-        const hostingEntries = [];
-        for (const h of config.hosting || []) {
-            const name = h.name || 'default';
-            const planItem = plan.find(p => p.type === 'hosting' && p.name === name);
-            const result = results.find(r => r.type === 'hosting' && r.name === name);
-            if (!result || !result.ok) {
-                // 未执行（fail-fast 中断，results 中无对应条目）或部署失败：
-                // 保留旧快照（下次 diff 仍会检测到差异）
-                const prevEntry = (_b = (_a = prev === null || prev === void 0 ? void 0 : prev.resources) === null || _a === void 0 ? void 0 : _a.hosting) === null || _b === void 0 ? void 0 : _b.find(s => s.name === name);
-                if (prevEntry) {
-                    hostingEntries.push(prevEntry);
-                }
-                continue;
-            }
-            if ((planItem === null || planItem === void 0 ? void 0 : planItem.status) === 'skip') {
-                const prevEntry = (_d = (_c = prev === null || prev === void 0 ? void 0 : prev.resources) === null || _c === void 0 ? void 0 : _c.hosting) === null || _d === void 0 ? void 0 : _d.find(s => s.name === name);
-                if (prevEntry) {
-                    hostingEntries.push(prevEntry);
-                    continue;
-                }
-            }
-            // 成功部署：重算当前指纹（含 size，供下次 diff 做 size 预判）
-            // 注意：deployHosting 可能执行本地构建，产物已更新，必须独立重算而非复用 plan 指纹
-            const root = path_1.default.resolve(cwd, h.root || '.');
-            // outputDir 与 StaticDeployer.deployHosting 完全复用同一解析逻辑
-            const outputDir = (0, framework_1.resolveHostingOutputDir)(h, root);
-            try {
-                const files = await stateStore.computeHostingFingerprints(outputDir, h.ignore || []);
-                hostingEntries.push({ name, deployPath: h.deployPath, files });
-            }
-            catch (_g) {
-                // 目录缺失 / 文件数超限：不写入（下次 diff 走云端兜底或全量部署）
-            }
-        }
-        // app
-        let appEntry;
-        if (config.app) {
-            const appResult = results.find(r => r.type === 'app');
-            if (appResult === null || appResult === void 0 ? void 0 : appResult.ok) {
-                appEntry = stateStore.buildAppConfig(config.app);
-            }
-            else {
-                appEntry = (_e = prev === null || prev === void 0 ? void 0 : prev.resources) === null || _e === void 0 ? void 0 : _e.app;
-            }
-        }
-        const resources = {};
-        if (hostingEntries.length) {
-            resources.hosting = hostingEntries;
-        }
-        if (appEntry) {
-            resources.app = appEntry;
-        }
-        if ((_f = prev === null || prev === void 0 ? void 0 : prev.resources) === null || _f === void 0 ? void 0 : _f.gateway) {
-            resources.gateway = prev.resources.gateway;
-        }
-        if (Object.keys(resources).length) {
-            stateStore.write({ resources, envId });
-        }
-    }
     /**
      * 构建完整部署计划（按依赖顺序 + only/skip 过滤）
      *
      * 通过查询云端状态判定每个资源的动作：
      * - database：先按迁移文件做 preview，再聚合成单条资源级计划项（pending→create，存在 conflict→conflict，全部 applied→不出现在 plan）
      * - functions：ListFunctions 判断是否已存在 → create / update（不做本地 hash / 字段 diff）
-     * - app：describeAppInfo 判断是否已存在 → create / update；本地 state 配置一致 → skip
-     * - hosting：本地 state 指纹 diff → 一致 skip（不重新上传）/ 有差异 deploy（带文件级明细）
+     * - app：describeAppInfo 判断是否已存在 → create / update
+     * - hosting：直传覆盖（无存在性概念）
      * - gateway：planRoutes 对比云端路由 → create / update / skip（含变更字段明细）
      * 云端查询失败时降级为保守判定（全 create），不影响 dry-run 展示。
      */
     async buildPlan(config, options) {
-        const { only, skip, refresh } = options;
+        const { only, skip } = options;
         const cwd = options.cwd || process.cwd();
         const envId = options.envId;
         const plan = [];
@@ -289,14 +261,7 @@ class DeployOrchestrator {
                 return false;
             return true;
         };
-        // 本地 state 快照（diff 基准）：--refresh 时忽略本地 skip 判定
-        const stateStore = new StateStore_1.StateStore({ cwd });
-        const rawState = refresh ? null : stateStore.read();
-        // 跨环境保护：快照记录的 envId 与目标环境不一致（或旧格式快照无 envId）时，
-        // 快照是其他环境部署后的指纹，不可作为 skip 依据 → 视为无快照，强制走全量部署，
-        // 避免切换环境后误判「产物未变更」导致新环境 COS 404
-        const state = rawState && rawState.envId === envId ? rawState : null;
-        const planCtx = { config, envId, stateStore, state, refresh, cwd };
+        const planCtx = { config, envId, cwd };
         for (const type of DEPLOY_ORDER) {
             if (!isEnabled(type))
                 continue;
@@ -309,7 +274,7 @@ class DeployOrchestrator {
      * 按资源类型构建计划（拆分自 buildPlan，控制圈复杂度）
      */
     async buildPlanForType(type, ctx) {
-        const { config, envId, stateStore, state, refresh, cwd } = ctx;
+        const { config, envId, cwd } = ctx;
         if (type === 'database') {
             return this.buildDatabasePlan(config, cwd, envId);
         }
@@ -347,10 +312,10 @@ class DeployOrchestrator {
             });
         }
         if (type === 'app') {
-            return this.buildAppPlan({ config, envId, stateStore, state, refresh });
+            return this.buildAppPlan({ config, envId });
         }
         if (type === 'hosting') {
-            return this.buildHostingPlans(config, ctx);
+            return this.buildHostingPlans(config);
         }
         return this.buildGatewayPlans(config, envId);
     }
@@ -407,100 +372,51 @@ class DeployOrchestrator {
         return [];
     }
     /**
-     * app 计划：本地 state 配置一致 → skip；否则按云端存在性 → create / update
+     * app 计划：按云端存在性 → create / update
      */
     async buildAppPlan(options) {
-        var _a;
-        const { config, envId, stateStore, state, refresh } = options;
+        const { config, envId } = options;
         if (!config.app)
             return [];
         const name = config.app.serviceName || 'app';
-        // 本地 state 配置一致 → skip（真增量，不重复构建版本）
-        const appEntry = stateStore.buildAppConfig(config.app);
-        const stateApp = (_a = state === null || state === void 0 ? void 0 : state.resources) === null || _a === void 0 ? void 0 : _a.app;
-        const appUnchanged = !refresh &&
-            stateApp !== undefined &&
-            appEntry !== undefined &&
-            this.deepEqual(stateApp, appEntry);
-        if (appUnchanged) {
-            return [
-                {
-                    type: 'app',
-                    name,
-                    status: 'skip',
-                    action: `云应用 ${name} 配置未变更，跳过`
-                }
-            ];
-        }
         const appExists = await this.appExists(name);
-        const changes = this.appConfigChanges(stateApp, appEntry);
         return [
-            Object.assign({ type: 'app', name, status: appExists ? 'update' : 'create', action: appExists
+            {
+                type: 'app',
+                name,
+                status: appExists ? 'update' : 'create',
+                action: appExists
                     ? `覆盖更新云应用 ${name}`
-                    : `新建云应用 ${name}` }, (changes.length ? { changes } : {}))
+                    : `新建云应用 ${name}`
+            }
         ];
     }
     /**
-     * hosting 计划：本地 state 指纹 diff → 一致 skip / 有差异 deploy（带文件级明细）
+     * hosting 计划：每次直传覆盖（无本地指纹 skip）
      */
-    async buildHostingPlans(config, ctx) {
-        var _a, _b;
-        const { stateStore, state, refresh, cwd } = ctx;
+    buildHostingPlans(config) {
         const plans = [];
         for (const h of config.hosting || []) {
             const name = h.name || 'default';
-            const root = path_1.default.resolve(cwd, h.root || '.');
-            const buildCommand = (0, framework_1.resolveBuildCommand)(h, root);
-            // outputDir 与 StaticDeployer.deployHosting 完全复用同一解析逻辑
-            const outputDir = (0, framework_1.resolveHostingOutputDir)(h, root);
-            const stateHosting = (_b = (_a = state === null || state === void 0 ? void 0 : state.resources) === null || _a === void 0 ? void 0 : _a.hosting) === null || _b === void 0 ? void 0 : _b.find(s => s.name === name);
-            // 懒加载 diff：size 预判 + 按需 hash（目录缺失 / 文件数超限 → 保守部署）
-            let fileDiff = null;
-            try {
-                fileDiff = await stateStore.diffHostingFiles(outputDir, stateHosting === null || stateHosting === void 0 ? void 0 : stateHosting.files, {
-                    ignore: h.ignore || []
-                });
-            }
-            catch (_c) {
-                fileDiff = null;
-            }
-            const unchanged = !refresh && fileDiff !== null && fileDiff.unchanged;
-            if (unchanged) {
-                plans.push({
-                    type: 'hosting',
-                    name,
-                    status: 'skip',
-                    action: `静态托管 ${name} 产物未变更，跳过`
-                });
-                continue;
-            }
             const hasBuild = !!h.buildCommand ||
                 (!!h.framework && h.framework !== 'static' && h.framework !== 'custom');
             const details = [
                 { label: '框架', value: h.framework || 'static' },
                 {
                     label: '构建',
-                    value: hasBuild
-                        ? `本地构建（${buildCommand || 'npm run build'}）→ 上传 ${outputDir}`
-                        : '无构建，直接上传'
+                    value: hasBuild ? '本地构建后上传' : '无构建，直接上传'
                 },
                 { label: '部署路径', value: h.deployPath || '/' }
             ];
-            if (fileDiff === null || fileDiff === void 0 ? void 0 : fileDiff.overLimit) {
-                details.push({ label: '指纹', value: '文件数超上限，降级为全量部署' });
-            }
-            plans.push(Object.assign({ type: 'hosting', name, status: 'deploy', action: hasBuild
+            plans.push({
+                type: 'hosting',
+                name,
+                status: 'deploy',
+                action: hasBuild
                     ? `本地构建后直传静态托管 ${name}`
-                    : `直传覆盖静态托管 ${name}`, details }, (fileDiff && !fileDiff.overLimit
-                ? {
-                    fileDiff: {
-                        added: fileDiff.added,
-                        modified: fileDiff.modified,
-                        deleted: fileDiff.deleted,
-                        totalChanged: fileDiff.totalChanged
-                    }
-                }
-                : {})));
+                    : `直传覆盖静态托管 ${name}`,
+                details
+            });
         }
         return plans;
     }
@@ -566,7 +482,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 +501,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 });
@@ -614,26 +526,6 @@ class DeployOrchestrator {
             }
         }
     }
-    /** 深比较（JSON 快照语义）：仅用于 app 配置快照等简单对象 */
-    deepEqual(a, b) {
-        return JSON.stringify(a) === JSON.stringify(b);
-    }
-    /** app 配置差异明细（from → to） */
-    appConfigChanges(prev, curr) {
-        const changes = [];
-        const keys = new Set([
-            ...Object.keys(prev || {}),
-            ...Object.keys(curr || {})
-        ]);
-        for (const key of keys) {
-            const from = prev === null || prev === void 0 ? void 0 : prev[key];
-            const to = curr === null || curr === void 0 ? void 0 : curr[key];
-            if (from !== to) {
-                changes.push({ field: String(key), from, to });
-            }
-        }
-        return changes;
-    }
     /**
      * 轻量 inline 守卫：配置合法 + 目录存在（validateProject 接线点）
      */