@lark-apaas/miaoda-cli 0.1.4-alpha.abaa17f → 0.1.4-alpha.dbe45ea

package/dist/services/deploy/modern/atoms/context.js

@@ -6,25 +6,22 @@ const spark_meta_1 = require("../../../../utils/spark-meta");
 const check_1 = require("../check");
 const template_key_map_1 = require("../template-key-map");
 /**
- * 准备 deploy 上下文：跑前置检查、读 .spark/meta.json、抽出 appId / template，
- * 并把 stack 短名映射成后端 templateKey。
+ * 准备 deploy 上下文：跑前置检查、读 .spark/meta.json 拿 stack，
+ * 并把 stack 短名映射成后端 templateKey。appId 由调用方从 env 解析后传入。
  *
  * 任何前置失败统一抛 AppError。返回值是后续 atom 唯一信任的入参源。
  */
-function prepareDeployContext(projectDir) {
+function prepareDeployContext(projectDir, appId) {
     (0, check_1.runDeployChecks)(projectDir);
     const meta = (0, spark_meta_1.readSparkMeta)(projectDir);
-    if (meta.appId === undefined || meta.appId === '') {
-        throw new error_1.AppError('DEPLOY_META_INCOMPLETE', '.spark/meta.json missing appId — run `miaoda app init` first');
-    }
-    if (meta.template === undefined || meta.template === '') {
-        throw new error_1.AppError('DEPLOY_META_INCOMPLETE', '.spark/meta.json missing template — run `miaoda app init` first');
+    if (meta.stack === undefined || meta.stack === '') {
+        throw new error_1.AppError('DEPLOY_META_INCOMPLETE', '.spark/meta.json missing stack — run `miaoda app init` first');
     }
     return {
         projectDir,
-        appId: meta.appId,
-        template: meta.template,
-        templateKey: (0, template_key_map_1.resolveTemplateKey)(meta.template),
+        appId,
+        stack: meta.stack,
+        templateKey: (0, template_key_map_1.resolveTemplateKey)(meta.stack),
         meta,
     };
 }

package/dist/services/deploy/modern/atoms/upload.js

@@ -8,21 +8,28 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_child_process_1 = require("node:child_process");
+const index_1 = require("../../../../api/deploy/index");
 const error_1 = require("../../../../utils/error");
 const logger_1 = require("../../../../utils/logger");
 const constants_1 = require("../constants");
 const protocol_1 = require("../protocol");
 const UPLOAD_PLAN = [
-    { dir: constants_1.OUTPUT_DIR, dataKey: protocol_1.DataKey.OUTPUT_TOS_UPLOAD_CREDENTIAL, required: true },
     {
+        kind: 'tos',
+        dir: constants_1.OUTPUT_DIR,
+        dataKey: protocol_1.DataKey.OUTPUT_TOS_UPLOAD_CREDENTIAL,
+        required: true,
+    },
+    {
+        kind: 'tos',
         dir: constants_1.OUTPUT_RESOURCE_DIR,
         dataKey: protocol_1.DataKey.OUTPUT_RESOURCE_TOS_UPLOAD_CREDENTIAL,
         required: false,
     },
     {
+        kind: 'paas_storage',
         dir: constants_1.OUTPUT_STATIC_DIR,
-        dataKey: protocol_1.DataKey.OUTPUT_STATIC_TOS_UPLOAD_CREDENTIAL,
-        required: false,
+        dataKey: protocol_1.DataKey.OUTPUT_STATIC_PAAS_STORAGE_CREDENTIAL,
     },
 ];
 function resolveTosutilPath() {
@@ -36,33 +43,28 @@ function resolveTosutilPath() {
     }
     throw new error_1.AppError('DEPLOY_TOSUTIL_MISSING', 'tosutil is not installed or not in PATH. modern deploy requires sandbox preinstalled tosutil.');
 }
-/** 把 data 里的凭证字段 JSON.parse 出来；非法 JSON / 缺字段都抛 AppError */
-function parseCredential(raw, dataKey) {
-    let parsed;
-    try {
-        parsed = JSON.parse(raw);
-    }
-    catch (err) {
-        throw new error_1.AppError('DEPLOY_CRED_INVALID_JSON', `preRelease.data["${dataKey}"] is not valid JSON: ${err.message}`);
-    }
-    if (typeof parsed !== 'object' || parsed === null) {
-        throw new error_1.AppError('DEPLOY_CRED_INVALID_JSON', `preRelease.data["${dataKey}"] is not an object`);
-    }
-    const c = parsed;
-    const required = [
-        'accessKeyID',
-        'secretAccessKey',
-        'sessionToken',
-        'endpoint',
-        'region',
-        'bucket',
-        'prefix',
-    ];
-    const missing = required.filter((k) => typeof c[k] !== 'string' || c[k] === '');
-    if (missing.length > 0) {
-        throw new error_1.AppError('DEPLOY_CRED_INCOMPLETE', `preRelease.data["${dataKey}"] credential missing fields: ${missing.join(', ')}`);
-    }
-    return c;
+function tosutilUploadFromTos(cred) {
+    return {
+        accessKeyID: cred.accessKeyID,
+        secretAccessKey: cred.secretAccessKey,
+        sessionToken: cred.sessionToken,
+        endpoint: cred.endpoint,
+        region: cred.region,
+        bucket: cred.bucket,
+        prefix: cred.prefix,
+    };
+}
+function tosutilUploadFromPaasStorage(cred, dataKey) {
+    const { bucket, prefix } = (0, protocol_1.parseTosUploadPrefix)(cred.uploadPrefix, dataKey);
+    return {
+        accessKeyID: cred.accessKeyID,
+        secretAccessKey: cred.secretAccessKey,
+        sessionToken: cred.sessionToken,
+        endpoint: cred.endpoint,
+        region: cred.region,
+        bucket,
+        prefix,
+    };
 }
 /**
  * 写一个 tosutil 临时 config 文件，注入 STS 凭证 + endpoint + region。
@@ -88,6 +90,16 @@ function writeTosutilConfig(tosutilPath, cred, label) {
     ], { stdio: 'pipe' });
     return confPath;
 }
+/** 把 tosutil 进程的输出按行回放到 stderr，便于线上排查（沙箱里无法 attach 进程）。 */
+function streamTosutilOutput(output) {
+    if (!output)
+        return;
+    for (const line of output.split('\n')) {
+        if (line.length === 0)
+            continue;
+        process.stderr.write(`[tosutil] ${line}\n`);
+    }
+}
 function normalizeTosDest(bucket, prefix) {
     const bucketPart = bucket.startsWith('tos://') ? bucket : `tos://${bucket}`;
     const normalized = prefix.replace(/^\/+/, '');
@@ -123,11 +135,14 @@ function uploadDirWithCredential(tosutilPath, sourceDir, cred, label) {
             '-conf',
             confPath,
         ], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+        streamTosutilOutput(output);
     }
     catch (err) {
         const e = err;
         const stderr = (e.stderr ?? '').trim();
         const stdout = (e.stdout ?? '').trim();
+        streamTosutilOutput(stdout);
+        streamTosutilOutput(stderr);
         throw new error_1.AppError('DEPLOY_UPLOAD_FAILED', `tosutil cp exited with status ${String(e.status ?? -1)} for ${sourceDir}\n` +
             `  stderr: ${stderr || '(empty)'}\n` +
             `  stdout: ${stdout.slice(0, 500) || '(empty)'}`);
@@ -151,42 +166,81 @@ function uploadDirWithCredential(tosutilPath, sourceDir, cred, label) {
         throw new error_1.AppError('DEPLOY_UPLOAD_EMPTY', `Upload failed: 0 files uploaded. source=${sourceDir}. Check tosutil credentials and bucket permissions.`);
     }
 }
+function uploadTosTarget(tosutilPath, target, localPath, data) {
+    const credRaw = target.required
+        ? (0, protocol_1.requireDataKey)(data, target.dataKey)
+        : (0, protocol_1.optionalDataKey)(data, target.dataKey);
+    if (credRaw === undefined) {
+        (0, logger_1.debug)(`upload: ${target.dir} exists but no credential configured, skipping`);
+        return false;
+    }
+    const cred = (0, protocol_1.parseTosUploadCredential)(credRaw, target.dataKey);
+    (0, logger_1.log)('deploy', `Uploading ${target.dir}...`);
+    uploadDirWithCredential(tosutilPath, localPath, tosutilUploadFromTos(cred), target.dir);
+    return true;
+}
+function uploadPaasStorageTarget(tosutilPath, target, localPath, data) {
+    // 空目录：直接跳过；callbackStatic 也不能调，否则会让后端把"未发生的上传"
+    // 误以为已完成。凭证本身 build 阶段已经消费过 downloadURLPrefix，这里不重复要求。
+    if (node_fs_1.default.readdirSync(localPath).length === 0) {
+        (0, logger_1.debug)(`upload: ${target.dir} is empty, skipping`);
+        return undefined;
+    }
+    const cred = (0, protocol_1.parsePaasStorageCredential)((0, protocol_1.requireDataKey)(data, target.dataKey), target.dataKey);
+    (0, logger_1.log)('deploy', `Uploading ${target.dir}...`);
+    uploadDirWithCredential(tosutilPath, localPath, tosutilUploadFromPaasStorage(cred, target.dataKey), target.dir);
+    return cred;
+}
 /**
- * 上传三类产物。每类的凭证来自 preRelease.data 中对应 *_tos_upload_credential 字段
- * （JSON.stringify 的 TosUploadCredential 对象）：
+ * 上传三类产物。output / output_resource 走 TOS STS 凭证；output_static 走 PaaS Storage
+ * 凭证（uploadPrefix 解出 tosutil cp 目的，上传完后再调 callbackStatic 把 uploadID
+ * 提交给后端核销）：
  *   - dist/output            (必传) → OUTPUT_TOS_UPLOAD_CREDENTIAL
  *   - dist/output_resource   (可选) → OUTPUT_RESOURCE_TOS_UPLOAD_CREDENTIAL
- *   - dist/output_static     (可选) → OUTPUT_STATIC_TOS_UPLOAD_CREDENTIAL
+ *   - dist/output_static     (可选) → OUTPUT_STATIC_PAAS_STORAGE_CREDENTIAL + callbackStatic
  *
  * 目录不存在的可选项跳过；output 不存在或凭证缺失抛错。
  */
-function uploadArtifacts(opts) {
+async function uploadArtifacts(opts) {
     const tosutilPath = resolveTosutilPath();
     const distDir = node_path_1.default.join(opts.projectDir, constants_1.DIST_DIR);
-    let uploaded = 0;
+    const outcome = { uploaded: 0 };
     for (const target of UPLOAD_PLAN) {
         const localPath = node_path_1.default.join(distDir, target.dir);
         const exists = node_fs_1.default.existsSync(localPath);
-        if (!exists) {
-            if (target.required) {
-                throw new error_1.AppError('DEPLOY_NO_BUILD_OUTPUT', `Required directory missing: ${constants_1.DIST_DIR}/${target.dir}`);
+        if (target.kind === 'tos') {
+            if (!exists) {
+                if (target.required) {
+                    throw new error_1.AppError('DEPLOY_NO_BUILD_OUTPUT', `Required directory missing: ${constants_1.DIST_DIR}/${target.dir}`);
+                }
+                (0, logger_1.debug)(`upload: dir not present, skipping ${target.dir}`);
+                continue;
+            }
+            if (uploadTosTarget(tosutilPath, target, localPath, opts.data)) {
+                outcome.uploaded++;
             }
-            (0, logger_1.debug)(`upload: dir not present, skipping ${target.dir}`);
             continue;
         }
-        const credRaw = target.required
-            ? (0, protocol_1.requireDataKey)(opts.data, target.dataKey)
-            : (0, protocol_1.optionalDataKey)(opts.data, target.dataKey);
-        if (credRaw === undefined) {
-            (0, logger_1.debug)(`upload: ${target.dir} exists but no credential configured, skipping`);
+        // PaaS Storage 分支
+        if (!exists) {
+            (0, logger_1.debug)(`upload: dir not present, skipping ${target.dir}`);
             continue;
         }
-        const cred = parseCredential(credRaw, target.dataKey);
-        (0, logger_1.log)('deploy', `Uploading ${target.dir}...`);
-        uploadDirWithCredential(tosutilPath, localPath, cred, target.dir);
-        uploaded++;
+        const cred = uploadPaasStorageTarget(tosutilPath, target, localPath, opts.data);
+        if (cred) {
+            outcome.staticUploaded = cred;
+            outcome.uploaded++;
+        }
     }
-    if (uploaded === 0) {
+    if (outcome.uploaded === 0) {
         throw new error_1.AppError('DEPLOY_UPLOAD_EMPTY', 'No artifacts uploaded — check build output.');
     }
+    if (outcome.staticUploaded) {
+        (0, logger_1.log)('deploy', 'Callbacking static upload...');
+        await (0, index_1.callbackStatic)({
+            appID: opts.appId,
+            bucketID: outcome.staticUploaded.bucketID,
+            uploadID: outcome.staticUploaded.uploadID,
+        });
+    }
 }

package/dist/services/deploy/modern/check.js

@@ -24,13 +24,8 @@ function runDeployChecks(projectDir) {
     else {
         try {
             const meta = JSON.parse(node_fs_1.default.readFileSync(metaPath, 'utf-8'));
-            const missing = [];
-            if (!meta.appId)
-                missing.push('appId');
-            if (!meta.template)
-                missing.push('template');
-            if (missing.length > 0) {
-                issues.push(`.spark/meta.json missing fields: ${missing.join(', ')}`);
+            if (!meta.stack) {
+                issues.push('.spark/meta.json missing fields: stack');
             }
         }
         catch {

package/dist/services/deploy/modern/pipelines/local.js

@@ -22,7 +22,7 @@ const index_1 = require("../atoms/index");
  * 任一步失败都会精准把该发布单标记为 Failed，避免遗留挂态。
  */
 async function localBuildLocalPublishPipeline(opts) {
-    const ctx = (0, index_1.prepareDeployContext)(opts.projectDir);
+    const ctx = (0, index_1.prepareDeployContext)(opts.projectDir, opts.appId);
     (0, logger_1.log)('deploy', 'Pre-releasing...');
     const pre = await (0, index_1.preRelease)(ctx.appId, ctx.templateKey);
     (0, logger_1.log)('deploy', `pre_release_id=${pre.preReleaseID} version=${pre.version}`);
@@ -46,7 +46,7 @@ async function localBuildLocalPublishPipeline(opts) {
     const release = await (0, index_1.createLocalRelease)(ctx.appId, pre.version);
     try {
         (0, logger_1.log)('deploy', 'Uploading artifacts...');
-        (0, index_1.uploadArtifacts)({ projectDir: ctx.projectDir, data });
+        await (0, index_1.uploadArtifacts)({ projectDir: ctx.projectDir, appId: ctx.appId, data });
         const saveResult = await (0, index_1.savePluginInstances)({
             projectDir: ctx.projectDir,
             appId: ctx.appId,
@@ -61,14 +61,14 @@ async function localBuildLocalPublishPipeline(opts) {
         await (0, index_1.finalizeLocalRelease)(ctx.appId, release.releaseID, index_1.LocalReleaseStatus.Failed);
         throw err;
     }
-    if (release.onlineURL !== undefined && release.onlineURL !== '') {
-        (0, spark_meta_1.writeSparkMeta)(ctx.projectDir, { ...ctx.meta, appUrl: release.onlineURL });
+    if (release.onlineUrl !== undefined && release.onlineUrl !== '') {
+        (0, spark_meta_1.writeSparkMeta)(ctx.projectDir, { appUrl: release.onlineUrl });
     }
     (0, logger_1.log)('deploy', 'Deployed successfully');
     return {
         appId: ctx.appId,
         version: pre.version,
-        url: release.onlineURL ?? '',
+        url: release.onlineUrl ?? '',
         releaseID: release.releaseID,
         preReleaseID: pre.preReleaseID,
     };

package/dist/services/deploy/modern/protocol.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataKey = void 0;
 exports.requireDataKey = requireDataKey;
 exports.optionalDataKey = optionalDataKey;
+exports.parseTosUploadCredential = parseTosUploadCredential;
+exports.parsePaasStorageCredential = parsePaasStorageCredential;
+exports.parseTosUploadPrefix = parseTosUploadPrefix;
 const error_1 = require("../../../utils/error");
 /**
  * modern deploy 对外协议常量集中地（SSOT）。
@@ -15,9 +18,7 @@ exports.DataKey = {
     // ── CDN 前缀（构建期注入到 build env，用于客户端资源访问） ──
     /** dist/output_resource 对应的 CDN 域名前缀 */
     RESOURCE_CDN_PREFIX: 'resource_cdn_prefix',
-    /** dist/output_static 对应的 CDN 域名前缀 */
-    STATIC_CDN_PREFIX: 'static_cdn_prefix',
-    // ── TOS 上传凭证（与三个产物目录一一对应，value 为 JSON.stringify 的凭证对象） ──
+    // ── TOS 上传凭证（output / output_resource 两条线，value 为 JSON.stringify 的凭证对象） ──
     // 凭证对象形态（camelCase）：
     //   { accessKeyID, secretAccessKey, sessionToken, endpoint, region, bucket, prefix }
     // CLI 端 JSON.parse 后写 tosutil 临时 config，cp 到 tos://bucket/prefix。
@@ -25,8 +26,13 @@ exports.DataKey = {
     OUTPUT_TOS_UPLOAD_CREDENTIAL: 'output_tos_upload_credential',
     /** dist/output_resource 上传凭证（仅当目录存在时使用） */
     OUTPUT_RESOURCE_TOS_UPLOAD_CREDENTIAL: 'output_resource_tos_upload_credential',
+    // ── PaaS Storage 静态资源凭证（dist/output_static 专用） ──
+    // 形态：JSON.stringify 后的 PaasStorageCredential（见下方 interface）。
+    // 上传走 tosutil（从 uploadPrefix 解析出 bucket/prefix）；上传完成后再调
+    // callbackStatic(appID, bucketID, uploadID) 把本次上传核销给后端；
+    // downloadURLPrefix 替代原 static_cdn_prefix 注入 build env。
     /** dist/output_static 上传凭证（仅当目录存在时使用） */
-    OUTPUT_STATIC_TOS_UPLOAD_CREDENTIAL: 'output_static_tos_upload_credential',
+    OUTPUT_STATIC_PAAS_STORAGE_CREDENTIAL: 'output_static_paas_storage_credential',
 };
 /** 取必传 key，缺失抛 AppError（带 key 名，便于后端 tcc 配置排查） */
 function requireDataKey(data, key) {
@@ -41,3 +47,76 @@ function optionalDataKey(data, key) {
     const v = data[key];
     return v === undefined || v === '' ? undefined : v;
 }
+const TOS_CREDENTIAL_REQUIRED_FIELDS = [
+    'accessKeyID',
+    'secretAccessKey',
+    'sessionToken',
+    'endpoint',
+    'region',
+    'bucket',
+    'prefix',
+];
+const PAAS_STORAGE_CREDENTIAL_REQUIRED_FIELDS = [
+    'accessKeyID',
+    'secretAccessKey',
+    'sessionToken',
+    'endpoint',
+    'region',
+    'uploadPrefix',
+    'downloadURLPrefix',
+    'uploadID',
+    'bucketID',
+];
+function parseCredentialObject(raw, dataKey) {
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch (err) {
+        throw new error_1.AppError('DEPLOY_CRED_INVALID_JSON', `preRelease.data["${dataKey}"] is not valid JSON: ${err.message}`);
+    }
+    if (typeof parsed !== 'object' || parsed === null) {
+        throw new error_1.AppError('DEPLOY_CRED_INVALID_JSON', `preRelease.data["${dataKey}"] is not an object`);
+    }
+    return parsed;
+}
+function assertStringFields(obj, required, dataKey) {
+    const missing = required.filter((k) => {
+        const v = obj[k];
+        return typeof v !== 'string' || v === '';
+    });
+    if (missing.length > 0) {
+        throw new error_1.AppError('DEPLOY_CRED_INCOMPLETE', `preRelease.data["${dataKey}"] credential missing fields: ${missing.join(', ')}`);
+    }
+    return obj;
+}
+/** JSON.parse + 字段完整性校验：output / output_resource 凭证 */
+function parseTosUploadCredential(raw, dataKey) {
+    const obj = parseCredentialObject(raw, dataKey);
+    return assertStringFields(obj, TOS_CREDENTIAL_REQUIRED_FIELDS, dataKey);
+}
+/** JSON.parse + 字段完整性校验：output_static PaaS Storage 凭证 */
+function parsePaasStorageCredential(raw, dataKey) {
+    const obj = parseCredentialObject(raw, dataKey);
+    return assertStringFields(obj, PAAS_STORAGE_CREDENTIAL_REQUIRED_FIELDS, dataKey);
+}
+/**
+ * 解析 `tos://<storage-bucket>/<segments...>/` 形态的 uploadPrefix。
+ * 返回的 bucket 是 tosutil cp 视角的 TOS 物理 bucket（uploadPrefix 第一段），
+ * prefix 是其余路径（不含开头斜杠，保留可能存在的尾部斜杠以贴合 tosutil 习惯）。
+ *
+ * 注意：这里返回的 bucket 与 PaasStorageCredential.bucketID 不是同一个概念
+ * （bucketID 是 PaaS Storage 逻辑 bucket，给 callbackStatic 用）。
+ */
+function parseTosUploadPrefix(uploadPrefix, dataKey) {
+    const match = /^tos:\/\/([^/]+)\/(.*)$/.exec(uploadPrefix);
+    if (!match) {
+        throw new error_1.AppError('DEPLOY_CRED_INCOMPLETE', `preRelease.data["${dataKey}"].uploadPrefix must look like "tos://<bucket>/<prefix>/", got: ${uploadPrefix}`);
+    }
+    const bucket = match[1];
+    const prefix = match[2];
+    if (bucket === '' || prefix === '') {
+        throw new error_1.AppError('DEPLOY_CRED_INCOMPLETE', `preRelease.data["${dataKey}"].uploadPrefix missing bucket or prefix segment: ${uploadPrefix}`);
+    }
+    return { bucket, prefix };
+}

package/dist/services/deploy/modern/template-key-map.js

@@ -1,29 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveTemplateKey = resolveTemplateKey;
-const error_1 = require("../../../utils/error");
 /**
  * 本地 stack 短名 → 后端发布模板 key 的映射。
  *
- * .spark/meta.json.template 存的是脚手架模板短名（vite-react / vue-react / html ...），
+ * .spark/meta.json.stack 存的是脚手架模板短名（vite-react / html ...），
  * 而服务端 preRelease 接受的 templateKey 是"部署类别"维度，由后端 tcc 注册。
- * 同一类别的多个脚手架共享一个部署 key（典型：所有纯前端 stack → client_local_deploy）。
- *
- * 加新 stack：在表里加一行；新增类别同步跟后端 tcc 配置对齐。
+ * 当前所有支持的 stack 都属于纯前端类别，默认映射到 client_local_deploy；
+ * 未来出现需要走别的 templateKey 的 stack，再在表里加一行覆盖默认。
  */
+const DEFAULT_TEMPLATE_KEY = 'client_local_deploy';
 const TEMPLATE_KEY_MAP = {
-    'vite-react': 'client_local_deploy',
-    'vue-react': 'client_local_deploy',
+    'vite-react': DEFAULT_TEMPLATE_KEY,
+    html: DEFAULT_TEMPLATE_KEY,
 };
 /**
- * 把本地 stack 短名映射到后端 templateKey。未配置的 stack 抛 AppError，
- * 避免拿原始短名直接打过去导致后端报"empty"或"出错了"等含糊错误。
+ * 把本地 stack 短名映射到后端 templateKey；未配置的 stack 走默认 client_local_deploy。
  */
 function resolveTemplateKey(template) {
-    const key = TEMPLATE_KEY_MAP[template];
-    if (key === undefined) {
-        throw new error_1.AppError('DEPLOY_TEMPLATE_KEY_UNMAPPED', `Template "${template}" has no mapping to backend templateKey. ` +
-            `Known: ${Object.keys(TEMPLATE_KEY_MAP).join(', ')}`);
-    }
-    return key;
+    return TEMPLATE_KEY_MAP[template] ?? DEFAULT_TEMPLATE_KEY;
 }

package/dist/services/skills/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readSkillsStatus = void 0;
+var status_1 = require("./status");
+Object.defineProperty(exports, "readSkillsStatus", { enumerable: true, get: function () { return status_1.readSkillsStatus; } });

package/dist/services/skills/status.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readSkillsStatus = readSkillsStatus;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+/**
+ * 扫描 <targetDir>/.agent/skills/steering/<stack>/，给出"当前装了什么"的快照。
+ * 不联网、不解析任何 SKILL.md 内容；只列目录名 + tech.md 是否在。
+ *
+ * stack 缺省（meta.json 缺 stack）时直接返回 present=false，
+ * 让 handler 把"先 init"的引导留给用户。
+ */
+function readSkillsStatus(opts) {
+    if (opts.stack === undefined || opts.stack === '') {
+        return { present: false, skills: [], techSynced: false };
+    }
+    const root = node_path_1.default.join(opts.targetDir, '.agent', 'skills', 'steering', opts.stack);
+    if (!node_fs_1.default.existsSync(root)) {
+        return { present: false, skills: [], techSynced: false };
+    }
+    const skillsDir = node_path_1.default.join(root, 'skills');
+    const skills = node_fs_1.default.existsSync(skillsDir)
+        ? node_fs_1.default
+            .readdirSync(skillsDir, { withFileTypes: true })
+            .filter((e) => e.isDirectory())
+            .map((e) => e.name)
+            .sort()
+        : [];
+    return {
+        present: true,
+        skills,
+        techSynced: node_fs_1.default.existsSync(node_path_1.default.join(root, 'tech.md')),
+    };
+}

package/dist/{services/app/init/steering.js → utils/coding-steering.js}

@@ -3,23 +3,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.syncSteering = syncSteering;
+exports.syncCodingSteering = syncCodingSteering;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const npm_pack_1 = require("../../../utils/npm-pack");
-const logger_1 = require("../../../utils/logger");
+const npm_pack_1 = require("../utils/npm-pack");
+const logger_1 = require("../utils/logger");
 const STEERING_PACKAGE = '@lark-apaas/coding-steering';
-function syncSteering(opts) {
-    (0, logger_1.log)('init', `Fetching ${STEERING_PACKAGE}@${opts.version ?? 'latest'}...`);
+// 临时:本地测试 alpha 链路用,默认 pin 到 0.1.6-alpha.0
+// (用户显式传 version,例如 `miaoda skills sync latest`,仍会 override 这个默认值)
+const DEFAULT_PINNED_VERSION = '0.1.6-alpha.0';
+/**
+ * 把 coding-steering 包内 _common/skills + <stack>/skills 同步到 <targetDir>/.agent/steering/skills/，
+ * 同名 stack 子目录覆盖 _common。tech.md 存在时也同步到 .agent/steering/tech.md。
+ *
+ * 纯本地 atom（pull npm package + 拷贝文件），不属于任何 cli 域；放在 utils 让
+ * app init handler 与独立 skills sync handler 都能复用。
+ */
+function syncCodingSteering(opts) {
+    const logPrefix = opts.logPrefix ?? 'skills';
+    const effectiveVersion = opts.version ?? DEFAULT_PINNED_VERSION;
+    (0, logger_1.log)(logPrefix, `Fetching ${STEERING_PACKAGE}@${effectiveVersion}...`);
     const fetched = (0, npm_pack_1.fetchNpmPackage)({
         packageName: STEERING_PACKAGE,
-        version: opts.version,
+        version: effectiveVersion,
     });
     try {
         const steeringRoot = node_path_1.default.join(fetched.extractDir, 'steering');
         const stackDir = node_path_1.default.join(steeringRoot, opts.stack);
         const commonSkillsDir = node_path_1.default.join(steeringRoot, '_common', 'skills');
-        const dstRoot = node_path_1.default.join(opts.targetDir, '.agent', 'steering');
+        // steering 落到 .agent/skills/steering/<stack>/。.agent/skills/ 是 agent skills 的
+        // 公共容器，steering 是其中一个 producer，<stack> 再做命名空间隔离。内部仍保留
+        // 包内 steering/<stack>/skills/ 的结构，便于按"包内子目录 → 本地子目录"一一对应排查。
+        const dstRoot = node_path_1.default.join(opts.targetDir, '.agent', 'skills', 'steering', opts.stack);
         const dstSkillsDir = node_path_1.default.join(dstRoot, 'skills');
         node_fs_1.default.mkdirSync(dstSkillsDir, { recursive: true });
         let techSynced = false;
@@ -29,7 +44,7 @@ function syncSteering(opts) {
             techSynced = true;
         }
         const synced = [];
-        // 先拷 _common/skills/，再拷 <stack>/skills/。stack 同名覆盖 common（设计 §8.4）
+        // 先拷 _common/skills/，再拷 <stack>/skills/。stack 同名覆盖 common
         if (node_fs_1.default.existsSync(commonSkillsDir)) {
             for (const name of node_fs_1.default.readdirSync(commonSkillsDir)) {
                 const src = node_path_1.default.join(commonSkillsDir, name);
@@ -52,7 +67,7 @@ function syncSteering(opts) {
                 synced.push(`${opts.stack}/skills/${name}`);
             }
         }
-        (0, logger_1.log)('init', `Steering synced: ${String(synced.length)} skill(s), tech.md ${techSynced ? 'yes' : 'no'}`);
+        (0, logger_1.log)(logPrefix, `Synced ${String(synced.length)} skill(s), tech.md ${techSynced ? 'yes' : 'no'}`);
         return { version: fetched.version, syncedSkills: synced, techSynced };
     }
     finally {

package/dist/utils/http.js

@@ -65,7 +65,12 @@ function createClient(opts) {
  * 缺省走这个。MIAODA_CANARY_HEADER 可显式覆盖；设为空字符串则去掉头。
  */
 const DEFAULT_CANARY_HEADER = 'boe_miaoda_doubao';
-/** 注入 x-tt-env 小流量头：env 显式设值 > DEFAULT_CANARY_HEADER */
+/**
+ * 注入 x-tt-env 小流量头：env 显式设值 > DEFAULT_CANARY_HEADER。
+ *
+ * 当泳道形如 `ppe_xxx`（PPE 预发环境）时，额外加 `x-use-ppe: 1`；
+ * BOE 泳道（`boe_xxx`）只带 x-tt-env，不加该头。
+ */
 function applyCanaryHeader(reqConfig) {
     // env 显式设为空字符串视为"去掉灰度头"；未设置时用 DEFAULT_CANARY_HEADER
     const canary = process.env.MIAODA_CANARY_HEADER ?? DEFAULT_CANARY_HEADER;
@@ -73,6 +78,9 @@ function applyCanaryHeader(reqConfig) {
         return reqConfig;
     const headers = new Headers(reqConfig.headers);
     headers.set('x-tt-env', canary);
+    if (canary.startsWith('ppe_')) {
+        headers.set('x-use-ppe', '1');
+    }
     reqConfig.headers = headers;
     return reqConfig;
 }
@@ -109,14 +117,14 @@ async function handleInnerEnvelope(response, url, opts) {
         throw new error_1.HttpError(response.status, url, `${opts.errPrefix}: ${String(response.status)} ${response.statusText}`);
     }
     const result = await response.json();
+    // verbose: 把完整响应体打到 stderr，便于排查（业务错误 / 字段缺失等）
+    if ((0, config_1.getConfig)().verbose) {
+        (0, logger_1.debug)(`  resp: ${truncateForLog(safeStringify(result), 2000)}`);
+    }
     if (typeof result === 'object' && result !== null && 'status_code' in result) {
         const env = result;
         if (env.status_code !== undefined && env.status_code !== '0') {
             const msg = env.message ?? env.error_msg ?? 'unknown error';
-            // verbose: 把完整业务错误信封打到 stderr，便于追溯
-            if ((0, config_1.getConfig)().verbose) {
-                (0, logger_1.debug)(`  envelope: ${truncateForLog(safeStringify(env), 1000)}`);
-            }
             const mapped = opts.mapErr?.(env.status_code, msg);
             if (mapped)
                 throw mapped;
@@ -169,12 +177,8 @@ function logResponseFailure(method, url, err, startMs) {
     const msgPart = e.message ? ` (${e.message})` : '';
     (0, logger_1.debug)(`✗ ${method} ${url} ${statusPart} ${String(elapsedMs)}ms${logidPart}${msgPart}`);
 }
-/** BAM gateway 在不同 PSM/版本上 logid 落在不同 header；按命中顺序取第一个非空。 */
 function pickLogid(headers) {
-    return (headers.get('x-tt-logid') ??
-        headers.get('x-logid') ??
-        headers.get('logid') ??
-        headers.get('x-tt-trace-tag'));
+    return headers.get('x-tt-logid');
 }
 function safeStringify(v) {
     try {