@lark-apaas/miaoda-cli 0.1.4 → 0.1.5-beta.27ede41

package/dist/utils/coding-steering.js

@@ -0,0 +1,85 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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 STEERING_PACKAGE = '@lark-apaas/coding-steering';
+/**
+ * 把 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';
+    (0, logger_1.log)(logPrefix, `Fetching ${STEERING_PACKAGE}@${opts.version ?? 'latest'}...`);
+    const fetched = (0, npm_pack_1.fetchNpmPackage)({
+        packageName: STEERING_PACKAGE,
+        version: opts.version,
+    });
+    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');
+        // 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;
+        const techSrc = node_path_1.default.join(stackDir, 'tech.md');
+        if (node_fs_1.default.existsSync(techSrc)) {
+            node_fs_1.default.copyFileSync(techSrc, node_path_1.default.join(dstRoot, 'tech.md'));
+            techSynced = true;
+        }
+        const synced = [];
+        // 先拷 _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);
+                if (!node_fs_1.default.statSync(src).isDirectory())
+                    continue;
+                copyDir(src, node_path_1.default.join(dstSkillsDir, name));
+                synced.push(`_common/skills/${name}`);
+            }
+        }
+        const stackSkillsDir = node_path_1.default.join(stackDir, 'skills');
+        if (node_fs_1.default.existsSync(stackSkillsDir)) {
+            for (const name of node_fs_1.default.readdirSync(stackSkillsDir)) {
+                const src = node_path_1.default.join(stackSkillsDir, name);
+                if (!node_fs_1.default.statSync(src).isDirectory())
+                    continue;
+                const dst = node_path_1.default.join(dstSkillsDir, name);
+                if (node_fs_1.default.existsSync(dst))
+                    node_fs_1.default.rmSync(dst, { recursive: true, force: true });
+                copyDir(src, dst);
+                synced.push(`${opts.stack}/skills/${name}`);
+            }
+        }
+        (0, logger_1.log)(logPrefix, `Synced ${String(synced.length)} skill(s), tech.md ${techSynced ? 'yes' : 'no'}`);
+        return { version: fetched.version, syncedSkills: synced, techSynced };
+    }
+    finally {
+        fetched.cleanup();
+    }
+}
+function copyDir(src, dest) {
+    node_fs_1.default.mkdirSync(dest, { recursive: true });
+    for (const entry of node_fs_1.default.readdirSync(src, { withFileTypes: true })) {
+        const srcPath = node_path_1.default.join(src, entry.name);
+        const destPath = node_path_1.default.join(dest, entry.name);
+        if (entry.isDirectory()) {
+            copyDir(srcPath, destPath);
+        }
+        else {
+            node_fs_1.default.copyFileSync(srcPath, destPath);
+        }
+    }
+}

package/dist/utils/git.js

@@ -2,6 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurrentGitBranch = getCurrentGitBranch;
 const node_child_process_1 = require("node:child_process");
+const GIT_LOCAL_ENV_KEYS = new Set([
+    'GIT_ALTERNATE_OBJECT_DIRECTORIES',
+    'GIT_CONFIG',
+    'GIT_CONFIG_PARAMETERS',
+    'GIT_CONFIG_COUNT',
+    'GIT_OBJECT_DIRECTORY',
+    'GIT_DIR',
+    'GIT_WORK_TREE',
+    'GIT_IMPLICIT_WORK_TREE',
+    'GIT_GRAFT_FILE',
+    'GIT_INDEX_FILE',
+    'GIT_NO_REPLACE_OBJECTS',
+    'GIT_REPLACE_REF_BASE',
+    'GIT_PREFIX',
+    'GIT_INTERNAL_SUPER_PREFIX',
+    'GIT_SHALLOW_FILE',
+    'GIT_COMMON_DIR',
+]);
+function withoutGitLocalEnv() {
+    return Object.fromEntries(Object.entries(process.env).filter(([key]) => !GIT_LOCAL_ENV_KEYS.has(key)));
+}
 /**
  * 读取 cwd 所在仓库的当前分支名。
  *
@@ -13,6 +34,7 @@ function getCurrentGitBranch(cwd = process.cwd()) {
     try {
         result = (0, node_child_process_1.spawnSync)('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
             cwd,
+            env: withoutGitLocalEnv(),
             encoding: 'utf8',
             stdio: ['ignore', 'pipe', 'ignore'],
         });

package/dist/utils/http.js

@@ -60,13 +60,27 @@ function createClient(opts) {
     instance.interceptors.request.use(applyCanaryHeader);
     return instance;
 }
-/** 若 MIAODA_CANARY_HEADER 已设置，注入 x-tt-env 小流量头 */
+/**
+ * 默认灰度泳道。当前 miaoda CLI 接入的新接口（modern deploy 等）只在该泳道生效，
+ * 缺省走这个。MIAODA_CANARY_HEADER 可显式覆盖；设为空字符串则去掉头。
+ */
+const DEFAULT_CANARY_HEADER = 'boe_miaoda_doubao';
+/**
+ * 注入 x-tt-env 小流量头：env 显式设值 > DEFAULT_CANARY_HEADER。
+ *
+ * 当泳道形如 `ppe_xxx`（PPE 预发环境）时，额外加 `x-use-ppe: 1`；
+ * BOE 泳道（`boe_xxx`）只带 x-tt-env，不加该头。
+ */
 function applyCanaryHeader(reqConfig) {
-    const canary = process.env.MIAODA_CANARY_HEADER;
+    // env 显式设为空字符串视为"去掉灰度头"；未设置时用 DEFAULT_CANARY_HEADER
+    const canary = process.env.MIAODA_CANARY_HEADER ?? DEFAULT_CANARY_HEADER;
     if (!canary)
         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;
 }
@@ -103,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;
@@ -163,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 {

package/dist/utils/npm-pack.js

@@ -0,0 +1,55 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchNpmPackage = fetchNpmPackage;
+const node_child_process_1 = require("node:child_process");
+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 error_1 = require("./error");
+const logger_1 = require("./logger");
+const DEFAULT_REGISTRY = 'https://registry.npmmirror.com/';
+/**
+ * `npm pack <pkg>@<ver> --registry <r>` + `tar -xzf`，解到临时目录。
+ * extractDir 是包内容根（含 package.json）。使用完必须 cleanup()。
+ */
+function fetchNpmPackage(opts) {
+    const registry = opts.registry ?? process.env.MIAODA_NPM_REGISTRY ?? DEFAULT_REGISTRY;
+    const version = opts.version ?? 'latest';
+    const pkgSpec = `${opts.packageName}@${version}`;
+    const tmpDir = node_fs_1.default.mkdtempSync(node_path_1.default.join(node_os_1.default.tmpdir(), 'miaoda-pack-'));
+    try {
+        (0, logger_1.debug)(`npm pack ${pkgSpec} --registry ${registry} → ${tmpDir}`);
+        const stdout = (0, node_child_process_1.execFileSync)('npm', ['pack', pkgSpec, '--pack-destination', tmpDir, '--json', '--registry', registry], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+        const packInfo = JSON.parse(stdout);
+        const tgzFilename = packInfo[0]?.filename;
+        const pkgVersion = packInfo[0]?.version ?? version;
+        if (!tgzFilename) {
+            throw new error_1.AppError('NPM_PACK_FAILED', `npm pack 未返回 filename：${pkgSpec}`);
+        }
+        const tgzPath = node_path_1.default.join(tmpDir, tgzFilename);
+        const extractDir = node_path_1.default.join(tmpDir, 'extracted');
+        node_fs_1.default.mkdirSync(extractDir, { recursive: true });
+        (0, node_child_process_1.execFileSync)('tar', ['-xzf', tgzPath, '-C', extractDir], {
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        return {
+            extractDir: node_path_1.default.join(extractDir, 'package'),
+            version: pkgVersion,
+            cleanup: () => {
+                node_fs_1.default.rmSync(tmpDir, { recursive: true, force: true });
+            },
+        };
+    }
+    catch (err) {
+        node_fs_1.default.rmSync(tmpDir, { recursive: true, force: true });
+        if (err instanceof error_1.AppError)
+            throw err;
+        const msg = err instanceof Error ? err.message : String(err);
+        throw new error_1.AppError('NPM_PACK_FAILED', `抓取 npm 包失败 (${pkgSpec}): ${msg}`, {
+            next_actions: [`确认包已发布到 registry：${registry}`, `检查版本号 / dist-tag 拼写`],
+        });
+    }
+}

package/dist/utils/spark-meta.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readSparkMeta = readSparkMeta;
+exports.writeSparkMeta = writeSparkMeta;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const SPARK_DIR = '.spark';
+const SPARK_META_FILE = 'meta.json';
+function readSparkMeta(appDir) {
+    const metaPath = node_path_1.default.join(appDir, SPARK_DIR, SPARK_META_FILE);
+    if (!node_fs_1.default.existsSync(metaPath))
+        return {};
+    try {
+        return JSON.parse(node_fs_1.default.readFileSync(metaPath, 'utf-8'));
+    }
+    catch {
+        return {};
+    }
+}
+/**
+ * merge 写入：已有字段保留，undefined 不覆盖；不再维护时间戳。
+ */
+function writeSparkMeta(appDir, meta) {
+    const sparkDir = node_path_1.default.join(appDir, SPARK_DIR);
+    node_fs_1.default.mkdirSync(sparkDir, { recursive: true });
+    const metaPath = node_path_1.default.join(sparkDir, SPARK_META_FILE);
+    let existing = {};
+    if (node_fs_1.default.existsSync(metaPath)) {
+        try {
+            existing = JSON.parse(node_fs_1.default.readFileSync(metaPath, 'utf-8'));
+        }
+        catch {
+            /* 读不出就当空 */
+        }
+    }
+    const defined = Object.fromEntries(Object.entries(meta).filter(([, v]) => v !== undefined));
+    const merged = { ...existing, ...defined };
+    node_fs_1.default.writeFileSync(metaPath, JSON.stringify(merged, null, 2) + '\n', 'utf-8');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-cli",
-  "version": "0.1.4",
+  "version": "0.1.5-beta.27ede41",
   "description": "Miaoda 平台命令行工具，面向 Agent 调用",
   "type": "commonjs",
   "bin": {