@lark-apaas/miaoda-cli 0.1.39-beta.6c1cd64 → 0.1.39-beta.77e3705
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +16 -0
- package/dist/cli/commands/app/index.js +1 -0
- package/dist/cli/commands/skills/index.js +10 -1
- package/dist/cli/handlers/app/init.js +2 -0
- package/dist/cli/handlers/skills/sync.js +3 -16
- package/dist/utils/coding-steering-files.js +55 -0
- package/dist/utils/coding-steering-flat.js +206 -0
- package/dist/utils/coding-steering.js +180 -326
- package/dist/utils/npm-pack.js +13 -1
- package/dist/utils/skills-extension.js +95 -0
- package/package.json +1 -1
- package/upgrade/templates/nestjs-react-fullstack/templates/scripts/build.sh +39 -22
- package/upgrade/templates/nestjs-react-fullstack/templates/scripts/prune-smart.js +20 -1
package/README.md
CHANGED
|
@@ -49,6 +49,7 @@ miaoda file ls --output json
|
|
|
49
49
|
| `miaoda comment ...` | 应用评论:查看评论列表、解决评论(仅 design-html 场景开放) |
|
|
50
50
|
| `miaoda registry ...` | 组件 registry:列出 / copy-in SDK 文件(本地执行) |
|
|
51
51
|
| `miaoda app ...` | 应用生命周期:元数据、初始化、外部项目导入、平台同步、源码导出、静态产物导出 |
|
|
52
|
+
| `miaoda skills ...` | 按项目技术栈同步 skill、查看同步状态 |
|
|
52
53
|
|
|
53
54
|
完整命令通过 `miaoda --help` 或 `miaoda <domain> --help` 查看。
|
|
54
55
|
|
|
@@ -72,6 +73,20 @@ miaoda file ls --output json
|
|
|
72
73
|
|
|
73
74
|
全栈 / design-stack 的 `postinstall` 只升级完整历史平台值(`fullstack-cli action-plugin init` 或 `npx -y @lark-apaas/fullstack-cli action-plugin init`),目标为 `npx -y @lark-apaas/fullstack-cli@latest action-plugin init`;`latest` 是渠道,不是固定版本。带追加命令、参数或用户指定版本的值保留。`migrate` 在原目录执行正常 npm 安装生命周期,包括用户脚本及依赖补丁;生命周期失败即 `install` 阶段失败,保留现场。
|
|
74
75
|
|
|
76
|
+
## 同步项目的技术栈 skill
|
|
77
|
+
|
|
78
|
+
`miaoda app init` 在初始化支持的技术栈时同步 steering。已有项目运行 `miaoda skills sync --local` 可更新项目内的 `.agents/skills/`。沙箱的 `miaoda skills sync --type <type>` 使用相同的 steering 来源规则。
|
|
79
|
+
|
|
80
|
+
宿主设置 `MIAODA_SANDBOX_PROVIDER=tae` 时,CLI 在公共包上叠加 bnpm 扩展包 `@byted-miaoda/coding-steering-extension-internal`。扩展包在 `package.json.miaodaSkillsExtension` 声明 `add`、`remove` 动作,CLI 按当前栈和开发模式计算最终集合;没有协议的旧包沿用目录叠加。miaoda-coding 的内容校验和发布门禁禁止新增条目与公共 skill 重名,CLI 保留原有底层覆盖能力。内网包独立选版,BOE 使用 `dev`,其他环境使用 `latest`。命令的 `--version` 和沙箱 lane 只选择公共版本。同步结果中的 `internalVersion`(`app init` 为 `internalSteeringVersion`)给出实际取得的内网版本。
|
|
81
|
+
|
|
82
|
+
协议版本为 `schemaVersion: 1`,目标为 `coding-steering`。动作包含 `op`、`stack`、`id`,`add` 另指定包内相对目录 `source`;可选 `modes` 为 `local`、`sandbox`,默认同时生效。只安装声明的新增目录,完整复制其引用文件。协议格式、版本、来源目录或动作冲突不合法时,拒绝本次 steering 同步,保留已有文件。
|
|
83
|
+
|
|
84
|
+
`remove` 只排除指定的基础 skill,目标不存在时为空操作。当前内网包移除 `anycross-forward`,公共包内容保持原样;`removedSkills` 返回本轮声明的排除 ID。沙箱按最终集合重建。本地只移除受管且未修改的条目,遇到同名自建或手改内容返回 `SKILLS_REMOVE_CONFLICT`,在写入其他条目前终止。
|
|
85
|
+
|
|
86
|
+
本地切回公共版,或扩展撤销 `remove` 后,再执行 `miaoda skills sync --local` 会从当前公共包恢复对应 skill,并清理仅内网提供的受管条目。移除后新建的本地同名内容仍会保留,`preservedLocalSkills` 列出恢复或覆盖时的冲突。来源、摘要和移除记录写入 `.agents/.miaoda-internal-steering.json`。
|
|
87
|
+
|
|
88
|
+
升级时先部署支持协议的 CLI,再发布协议扩展包;旧 CLI 无法执行 `remove`。协议定义与示例见 [skill 扩展协议](https://code.byted.org/apaas/miaoda-coding/blob/feat/internal-steering/docs/skills-extension-protocol.md)。
|
|
89
|
+
|
|
75
90
|
## 全栈应用的 MCP UI 检查
|
|
76
91
|
|
|
77
92
|
创建 MCP UI 时,Agent 在 `server/mcp/ui` 中同时生成 `tsconfig.json` 和 `eslint.config.cjs`,修改 UI 或其 shared 依赖后主动运行独立检查。模板和 CLI 不生成 UI 配置,也不将 UI 检查接入主工程 lint/type:check。
|
|
@@ -142,6 +157,7 @@ miaoda registry add deck-slide --overwrite # 目标已存在时覆盖(
|
|
|
142
157
|
## 环境变量
|
|
143
158
|
|
|
144
159
|
- `MIAODA_APP_ID`:默认应用 ID,等价于 `--app-id`。
|
|
160
|
+
- `MIAODA_SANDBOX_PROVIDER` 标识宿主的沙箱提供方。值为 `tae` 时追加内网 steering 包,其他值或未设置时仅同步公共包。
|
|
145
161
|
- `MIAODA_MIGRATE_STEP_TIMEOUT_MS`:`app migrate` 单个依赖安装 / 构建步骤的超时(毫秒),默认 20 分钟。
|
|
146
162
|
- `MIAODA_CANARY_HEADER`:HTTP 请求的 `x-tt-env` 小流量头取值。未设置时默认 `boe_miaoda_ccm`;设为空字符串则不带该头(例:`export MIAODA_CANARY_HEADER=boe_xxx`)。值形如 `ppe_xxx` 时额外带上 `x-use-ppe: 1`。
|
|
147
163
|
|
|
@@ -435,6 +435,7 @@ JSON 输出
|
|
|
435
435
|
"appId": "...", "appType": "modern_html", "sourceImported": true, "importedFileCount": 7,
|
|
436
436
|
"platformStackFound": true, "platformSyncedFiles": [...],
|
|
437
437
|
"installed": true, "installSource": "cache|npm|skipped", "installHash": "...", ...}}
|
|
438
|
+
宿主设置 MIAODA_SANDBOX_PROVIDER=tae 且内网包同步成功时,另返回 internalSteeringVersion。
|
|
438
439
|
async 模式:{"data": {"initialized": true, "asyncInstall": true, "installed": false,
|
|
439
440
|
"installSource": "async", "installPid": 123, "installLogPath": "...",
|
|
440
441
|
"eventReadyPath": "...", "eventFailedPath": "..."}}
|
|
@@ -23,7 +23,7 @@ function registerSkillsSync(parent) {
|
|
|
23
23
|
.command('sync')
|
|
24
24
|
.description('同步 skills 到 user app(默认 coding-steering;带 --type 时走 sandbox-skills)')
|
|
25
25
|
.option('--dir <path>', '项目目录,默认当前目录', '.')
|
|
26
|
-
.option('--version <ver>', 'coding-steering
|
|
26
|
+
.option('--version <ver>', '指定公共 coding-steering 包的版本或 dist-tag')
|
|
27
27
|
.option('--local', '走本地 dev / agent 输出形态:拷到 .agents/skills 平铺 + 创建 .claude/skills 软链。' +
|
|
28
28
|
'不传时退回老形态:拷到 .agent/skills/steering/<stack>/skills/(跟沙箱端 update-skills.sh 对齐)', false)
|
|
29
29
|
.option('--type <type>', '走 sandbox 分支:miaoda | miaoda-modern | miaoda-design | openclaw。有值时忽略 --local,' +
|
|
@@ -35,6 +35,13 @@ function registerSkillsSync(parent) {
|
|
|
35
35
|
前置要求
|
|
36
36
|
当前目录(或 --dir)已走过 'miaoda app init'(.spark/meta.json 含 stack)
|
|
37
37
|
|
|
38
|
+
技术栈 skill 来源
|
|
39
|
+
MIAODA_SANDBOX_PROVIDER=tae 时,从 bnpm 额外同步 @byted-miaoda/coding-steering-extension-internal。
|
|
40
|
+
有 miaodaSkillsExtension 协议时按 add/remove 动作同步;旧包沿用目录叠加。
|
|
41
|
+
remove 排除基础 skill,撤销动作或切回公共版后恢复当前公共版本。
|
|
42
|
+
内网包在 BOE 取 dev,其余环境取 latest。--version 和 --tgz-key 仅影响公共来源。
|
|
43
|
+
未设置或其他 provider 值时仅同步公共包。
|
|
44
|
+
|
|
38
45
|
输出形态(--local 切换)
|
|
39
46
|
默认(不传 --local):
|
|
40
47
|
.agent/skills/steering/<stack>/skills/<skill>/...
|
|
@@ -54,6 +61,8 @@ function registerSkillsSync(parent) {
|
|
|
54
61
|
JSON 输出
|
|
55
62
|
{"data": {"stack": "...", "version": "...", "syncedSkills": [...], "techSynced": true|false,
|
|
56
63
|
"claudeSkillsLink": "created|updated|noop|conflict|unsupported" // 仅 --local 时}}
|
|
64
|
+
内网包同步成功时包含 internalVersion;协议排除项列在 removedSkills。
|
|
65
|
+
本地移除遇到自建或手改条目时返回 SKILLS_REMOVE_CONFLICT;恢复或覆盖冲突列在 preservedLocalSkills。
|
|
57
66
|
|
|
58
67
|
传 --type 时:
|
|
59
68
|
{"data": {"mode": "sandbox", "type": "...", "packageName": "...", "version": "...",
|
|
@@ -190,6 +190,7 @@ async function handleAppInit(opts) {
|
|
|
190
190
|
templatePackage: tplResult.packageName,
|
|
191
191
|
templateVersion: tplResult.version,
|
|
192
192
|
steeringVersion: steeringResult.version,
|
|
193
|
+
internalSteeringVersion: steeringResult.internalVersion,
|
|
193
194
|
archType: tplResult.archType,
|
|
194
195
|
appId: opts.appId,
|
|
195
196
|
appType: opts.appType,
|
|
@@ -198,6 +199,7 @@ async function handleAppInit(opts) {
|
|
|
198
199
|
importedFileCount: sourceImport.importedFileCount,
|
|
199
200
|
sourceIgnoredReason: sourceImport.sourceIgnoredReason,
|
|
200
201
|
syncedSkills: steeringResult.syncedSkills,
|
|
202
|
+
preservedLocalSkills: steeringResult.preservedLocalSkills,
|
|
201
203
|
techSynced: steeringResult.techSynced,
|
|
202
204
|
steeringError,
|
|
203
205
|
gitHooks: hookActivation.action,
|
|
@@ -45,7 +45,7 @@ function syncSteeringForSandbox(params) {
|
|
|
45
45
|
// 配了 tgzKey 也永远命中不了。把 version 原样透传(未指定就是 undefined),让
|
|
46
46
|
// syncCodingSteering 一处算全链:version > lane > dev > latest。
|
|
47
47
|
try {
|
|
48
|
-
const
|
|
48
|
+
const result = (0, coding_steering_1.syncCodingSteering)({
|
|
49
49
|
stack,
|
|
50
50
|
targetDir: params.targetDir,
|
|
51
51
|
version: params.version,
|
|
@@ -62,14 +62,7 @@ function syncSteeringForSandbox(params) {
|
|
|
62
62
|
// 同理固定 nested:落 .agent/skills/steering/<stack>/,与老链路一致
|
|
63
63
|
outputLayout: 'nested',
|
|
64
64
|
});
|
|
65
|
-
return {
|
|
66
|
-
status: 'synced',
|
|
67
|
-
stack,
|
|
68
|
-
version: r.version,
|
|
69
|
-
syncedSkills: r.syncedSkills,
|
|
70
|
-
techSynced: r.techSynced,
|
|
71
|
-
prunedStacks: r.prunedStacks,
|
|
72
|
-
};
|
|
65
|
+
return { status: 'synced', stack, ...result };
|
|
73
66
|
}
|
|
74
67
|
catch (err) {
|
|
75
68
|
return { status: 'failed', reason: err.message };
|
|
@@ -183,14 +176,8 @@ function syncSteeringOnly(params) {
|
|
|
183
176
|
(0, output_1.emit)({
|
|
184
177
|
data: {
|
|
185
178
|
stack: meta.stack,
|
|
186
|
-
version: result.version,
|
|
187
179
|
versionSource,
|
|
188
|
-
|
|
189
|
-
techSynced: result.techSynced,
|
|
190
|
-
prunedStacks: result.prunedStacks,
|
|
191
|
-
...(result.claudeSkillsLink !== undefined
|
|
192
|
-
? { claudeSkillsLink: result.claudeSkillsLink }
|
|
193
|
-
: {}),
|
|
180
|
+
...result,
|
|
194
181
|
},
|
|
195
182
|
});
|
|
196
183
|
}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.isSafeSteeringId = isSafeSteeringId;
|
|
7
|
+
exports.copySkillTree = copySkillTree;
|
|
8
|
+
exports.treeDigest = treeDigest;
|
|
9
|
+
const node_crypto_1 = require("node:crypto");
|
|
10
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
11
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
12
|
+
const error_1 = require("../utils/error");
|
|
13
|
+
/** 包内与所有权记录里的 ID 只允许可移植的单个路径段。 */
|
|
14
|
+
function isSafeSteeringId(id) {
|
|
15
|
+
return (typeof id === 'string' &&
|
|
16
|
+
/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(id) &&
|
|
17
|
+
!id.endsWith('.') &&
|
|
18
|
+
!/^(con|prn|aux|nul|com[1-9]|lpt[1-9])(?:\.|$)/i.test(id));
|
|
19
|
+
}
|
|
20
|
+
function copySkillTree(src, dest) {
|
|
21
|
+
node_fs_1.default.mkdirSync(dest);
|
|
22
|
+
for (const entry of node_fs_1.default.readdirSync(src, { withFileTypes: true })) {
|
|
23
|
+
const from = node_path_1.default.join(src, entry.name);
|
|
24
|
+
const to = node_path_1.default.join(dest, entry.name);
|
|
25
|
+
if (entry.isDirectory())
|
|
26
|
+
copySkillTree(from, to);
|
|
27
|
+
else if (entry.isFile())
|
|
28
|
+
node_fs_1.default.copyFileSync(from, to);
|
|
29
|
+
else
|
|
30
|
+
throw new error_1.AppError('SKILLS_INVALID_PACKAGE', `skill 含软链或特殊文件:${from}`);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
/** 类型、文件名与内容都参与摘要,含新增空目录。用户改成软链/特殊文件时按修改处理。 */
|
|
34
|
+
function treeDigest(root) {
|
|
35
|
+
if (!node_fs_1.default.lstatSync(root).isDirectory())
|
|
36
|
+
return undefined;
|
|
37
|
+
const hash = (0, node_crypto_1.createHash)('sha256');
|
|
38
|
+
for (const name of node_fs_1.default.readdirSync(root).sort()) {
|
|
39
|
+
const child = node_path_1.default.join(root, name);
|
|
40
|
+
const stat = node_fs_1.default.lstatSync(child);
|
|
41
|
+
let digest;
|
|
42
|
+
if (stat.isDirectory())
|
|
43
|
+
digest = treeDigest(child);
|
|
44
|
+
else if (stat.isFile())
|
|
45
|
+
digest = (0, node_crypto_1.createHash)('sha256').update(node_fs_1.default.readFileSync(child)).digest('hex');
|
|
46
|
+
if (digest === undefined)
|
|
47
|
+
return undefined;
|
|
48
|
+
hash
|
|
49
|
+
.update(stat.isDirectory() ? 'd' : 'f')
|
|
50
|
+
.update(name)
|
|
51
|
+
.update('\0')
|
|
52
|
+
.update(digest);
|
|
53
|
+
}
|
|
54
|
+
return hash.digest('hex');
|
|
55
|
+
}
|
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.syncFlatSteering = syncFlatSteering;
|
|
7
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
+
const coding_steering_files_1 = require("../utils/coding-steering-files");
|
|
10
|
+
const error_1 = require("../utils/error");
|
|
11
|
+
const file_ops_1 = require("../utils/file-ops");
|
|
12
|
+
const logger_1 = require("../utils/logger");
|
|
13
|
+
const STATE_FILE = '.miaoda-internal-steering.json';
|
|
14
|
+
function isRecord(value) {
|
|
15
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
16
|
+
}
|
|
17
|
+
/** 严格验证整个状态后再使用任何一项;不跟随软链,也不接受上次写入一半的文件。 */
|
|
18
|
+
function readOwnership(file) {
|
|
19
|
+
const stat = node_fs_1.default.lstatSync(file, { throwIfNoEntry: false });
|
|
20
|
+
const owned = new Map();
|
|
21
|
+
if (stat === undefined)
|
|
22
|
+
return owned;
|
|
23
|
+
const invalid = new error_1.AppError('SKILLS_INVALID_STATE', `无效的内部 skills 所有权记录:${file}`);
|
|
24
|
+
if (!stat.isFile())
|
|
25
|
+
throw invalid;
|
|
26
|
+
const raw = node_fs_1.default.readFileSync(file, 'utf8');
|
|
27
|
+
let state;
|
|
28
|
+
try {
|
|
29
|
+
state = JSON.parse(raw);
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
throw invalid;
|
|
33
|
+
}
|
|
34
|
+
if (!isRecord(state) || state.version !== 1 || !Array.isArray(state.skills))
|
|
35
|
+
throw invalid;
|
|
36
|
+
const seen = new Set();
|
|
37
|
+
const add = (id, entry) => {
|
|
38
|
+
if (!(0, coding_steering_files_1.isSafeSteeringId)(id) || seen.has(id.toLowerCase()))
|
|
39
|
+
throw invalid;
|
|
40
|
+
owned.set(id, entry);
|
|
41
|
+
seen.add(id.toLowerCase());
|
|
42
|
+
};
|
|
43
|
+
// v1 的 skills 只记录内网目录。额外字段供新版判断切换前的社区版本和本地冲突。
|
|
44
|
+
for (const source of ['internal', 'community']) {
|
|
45
|
+
const entries = source === 'internal' ? state.skills : state.community;
|
|
46
|
+
if (entries === undefined)
|
|
47
|
+
continue;
|
|
48
|
+
if (!Array.isArray(entries))
|
|
49
|
+
throw invalid;
|
|
50
|
+
for (const item of entries) {
|
|
51
|
+
if (!isRecord(item) || typeof item.digest !== 'string' || !/^[a-f0-9]{64}$/.test(item.digest))
|
|
52
|
+
throw invalid;
|
|
53
|
+
add(item.id, { source, digest: item.digest });
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
if (state.local !== undefined) {
|
|
57
|
+
if (!Array.isArray(state.local))
|
|
58
|
+
throw invalid;
|
|
59
|
+
for (const id of state.local)
|
|
60
|
+
add(id, { source: 'local' });
|
|
61
|
+
}
|
|
62
|
+
if (state.removed !== undefined) {
|
|
63
|
+
if (!Array.isArray(state.removed))
|
|
64
|
+
throw invalid;
|
|
65
|
+
for (const item of state.removed) {
|
|
66
|
+
if (!isRecord(item) ||
|
|
67
|
+
typeof item.packageName !== 'string' ||
|
|
68
|
+
!item.packageName ||
|
|
69
|
+
!(0, coding_steering_files_1.isSafeSteeringId)(item.stack))
|
|
70
|
+
throw invalid;
|
|
71
|
+
add(item.id, { source: 'removed', packageName: item.packageName, stack: item.stack });
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
return owned;
|
|
75
|
+
}
|
|
76
|
+
function syncClaudeLink(root, prefix) {
|
|
77
|
+
const linkDir = node_path_1.default.join(root, '.claude');
|
|
78
|
+
const link = node_path_1.default.join(linkDir, 'skills');
|
|
79
|
+
const target = node_path_1.default.join('..', '.agents', 'skills');
|
|
80
|
+
const stat = node_fs_1.default.lstatSync(link, { throwIfNoEntry: false });
|
|
81
|
+
if (stat !== undefined) {
|
|
82
|
+
if (!stat.isSymbolicLink()) {
|
|
83
|
+
(0, logger_1.log)(prefix, '⚠ .claude/skills 已是普通目录/文件,跳过软链创建');
|
|
84
|
+
return 'conflict';
|
|
85
|
+
}
|
|
86
|
+
if (node_fs_1.default.readlinkSync(link) === target)
|
|
87
|
+
return 'noop';
|
|
88
|
+
}
|
|
89
|
+
node_fs_1.default.mkdirSync(linkDir, { recursive: true });
|
|
90
|
+
if (stat !== undefined)
|
|
91
|
+
node_fs_1.default.unlinkSync(link);
|
|
92
|
+
try {
|
|
93
|
+
node_fs_1.default.symlinkSync(target, link, 'dir');
|
|
94
|
+
}
|
|
95
|
+
catch (err) {
|
|
96
|
+
const hint = process.platform === 'win32' ? '(请开启开发者模式或以管理员运行)' : '';
|
|
97
|
+
(0, logger_1.log)(prefix, `⚠ .claude/skills 软链创建失败 ${String(err)}${hint};skills 仍在 .agents/skills 下可用`);
|
|
98
|
+
return 'unsupported';
|
|
99
|
+
}
|
|
100
|
+
return stat === undefined ? 'created' : 'updated';
|
|
101
|
+
}
|
|
102
|
+
function syncFlatSteering(targetDir, sources, publicStackDir, internalIds, communitySources, logPrefix, removals = new Map()) {
|
|
103
|
+
(0, file_ops_1.assertNoSymlinkedAncestor)(targetDir, ['.agents', 'skills']);
|
|
104
|
+
(0, file_ops_1.assertNoSymlinkedAncestor)(targetDir, ['.claude']);
|
|
105
|
+
const agents = node_path_1.default.join(targetDir, '.agents');
|
|
106
|
+
const skillsDir = node_path_1.default.join(agents, 'skills');
|
|
107
|
+
const statePath = node_path_1.default.join(agents, STATE_FILE);
|
|
108
|
+
const owned = readOwnership(statePath);
|
|
109
|
+
const next = new Map();
|
|
110
|
+
const preserved = new Set();
|
|
111
|
+
const desired = new Set(sources.keys());
|
|
112
|
+
const updates = [];
|
|
113
|
+
const allIds = new Set([...desired, ...removals.keys()]);
|
|
114
|
+
for (const [id, entry] of owned) {
|
|
115
|
+
if (entry.source === 'internal' || entry.source === 'removed')
|
|
116
|
+
allIds.add(id);
|
|
117
|
+
}
|
|
118
|
+
if (new Set(Array.from(allIds, (id) => id.toLowerCase())).size !== allIds.size) {
|
|
119
|
+
throw new error_1.AppError('SKILLS_ID_CONFLICT', '已有内部技能记录与当前包的 skill ID 大小写冲突');
|
|
120
|
+
}
|
|
121
|
+
for (const id of allIds) {
|
|
122
|
+
const target = node_path_1.default.join(skillsDir, id);
|
|
123
|
+
const previous = owned.get(id);
|
|
124
|
+
const existing = node_fs_1.default.lstatSync(target, { throwIfNoEntry: false });
|
|
125
|
+
const isInternal = internalIds.has(id);
|
|
126
|
+
const removal = removals.get(id);
|
|
127
|
+
if (removal !== undefined) {
|
|
128
|
+
if (existing !== undefined) {
|
|
129
|
+
let expected;
|
|
130
|
+
if (previous?.source === 'internal' || previous?.source === 'community')
|
|
131
|
+
expected = previous.digest;
|
|
132
|
+
else if (previous === undefined) {
|
|
133
|
+
const community = communitySources.get(id);
|
|
134
|
+
if (community !== undefined)
|
|
135
|
+
expected = (0, coding_steering_files_1.treeDigest)(community);
|
|
136
|
+
}
|
|
137
|
+
if (expected === undefined || (0, coding_steering_files_1.treeDigest)(target) !== expected)
|
|
138
|
+
throw new error_1.AppError('SKILLS_REMOVE_CONFLICT', `无法移除本地自建或已修改的 skill:${id}`);
|
|
139
|
+
updates.push({ target });
|
|
140
|
+
}
|
|
141
|
+
next.set(id, { source: 'removed', ...removal });
|
|
142
|
+
continue;
|
|
143
|
+
}
|
|
144
|
+
if (existing !== undefined &&
|
|
145
|
+
(isInternal ||
|
|
146
|
+
previous?.source === 'internal' ||
|
|
147
|
+
previous?.source === 'local' ||
|
|
148
|
+
previous?.source === 'removed')) {
|
|
149
|
+
const community = communitySources.get(id);
|
|
150
|
+
let expected = previous?.source === 'internal' || previous?.source === 'community'
|
|
151
|
+
? previous.digest
|
|
152
|
+
: undefined;
|
|
153
|
+
if (!previous && community !== undefined)
|
|
154
|
+
expected = (0, coding_steering_files_1.treeDigest)(community);
|
|
155
|
+
if (expected === undefined || (0, coding_steering_files_1.treeDigest)(target) !== expected) {
|
|
156
|
+
(0, logger_1.log)(logPrefix, `⚠ 保留本地 skill ${id}(${previous && previous.source !== 'local' && previous.source !== 'removed' ? '已手动修改' : '已有同名条目'}):${target}`);
|
|
157
|
+
preserved.add(id);
|
|
158
|
+
next.set(id, previous?.source === 'internal' ? previous : { source: 'local' });
|
|
159
|
+
continue;
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
const src = sources.get(id);
|
|
163
|
+
if (src !== undefined) {
|
|
164
|
+
const digest = (0, coding_steering_files_1.treeDigest)(src);
|
|
165
|
+
if (digest === undefined)
|
|
166
|
+
throw new error_1.AppError('SKILLS_INVALID_PACKAGE', `无效的 skill:${id}`);
|
|
167
|
+
next.set(id, { source: isInternal ? 'internal' : 'community', digest });
|
|
168
|
+
updates.push({ target, src });
|
|
169
|
+
}
|
|
170
|
+
else if (existing !== undefined) {
|
|
171
|
+
updates.push({ target });
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
node_fs_1.default.mkdirSync(skillsDir, { recursive: true });
|
|
175
|
+
for (const { target, src } of updates) {
|
|
176
|
+
(0, file_ops_1.forceRemove)(target);
|
|
177
|
+
if (src !== undefined)
|
|
178
|
+
(0, coding_steering_files_1.copySkillTree)(src, target);
|
|
179
|
+
}
|
|
180
|
+
const techSrc = node_path_1.default.join(publicStackDir, 'tech.md');
|
|
181
|
+
const techTarget = node_path_1.default.join(agents, 'tech.md');
|
|
182
|
+
if (node_fs_1.default.existsSync(techSrc))
|
|
183
|
+
node_fs_1.default.copyFileSync(techSrc, techTarget);
|
|
184
|
+
else
|
|
185
|
+
(0, file_ops_1.forceRemove)(techTarget);
|
|
186
|
+
const claudeSkillsLink = syncClaudeLink(targetDir, logPrefix);
|
|
187
|
+
if (next.size > 0) {
|
|
188
|
+
const skills = [];
|
|
189
|
+
const community = [];
|
|
190
|
+
const local = [];
|
|
191
|
+
const removed = [];
|
|
192
|
+
for (const [id, entry] of next) {
|
|
193
|
+
if (entry.source === 'local')
|
|
194
|
+
local.push(id);
|
|
195
|
+
else if (entry.source === 'removed')
|
|
196
|
+
removed.push({ id, packageName: entry.packageName, stack: entry.stack });
|
|
197
|
+
else
|
|
198
|
+
(entry.source === 'internal' ? skills : community).push({ id, digest: entry.digest });
|
|
199
|
+
}
|
|
200
|
+
node_fs_1.default.writeFileSync(statePath, JSON.stringify({ version: 1, skills, community, local, ...(removed.length > 0 ? { removed } : {}) }, null, 2) + '\n');
|
|
201
|
+
}
|
|
202
|
+
else if (owned.size > 0) {
|
|
203
|
+
(0, file_ops_1.forceRemove)(statePath);
|
|
204
|
+
}
|
|
205
|
+
return { claudeSkillsLink, preserved };
|
|
206
|
+
}
|
|
@@ -9,10 +9,14 @@ const node_path_1 = __importDefault(require("node:path"));
|
|
|
9
9
|
const npm_pack_1 = require("../utils/npm-pack");
|
|
10
10
|
const error_1 = require("../utils/error");
|
|
11
11
|
const file_ops_1 = require("../utils/file-ops");
|
|
12
|
+
const coding_steering_files_1 = require("../utils/coding-steering-files");
|
|
13
|
+
const coding_steering_flat_1 = require("../utils/coding-steering-flat");
|
|
12
14
|
const logger_1 = require("../utils/logger");
|
|
13
|
-
const logger_2 = require("../utils/logger");
|
|
14
15
|
const env_1 = require("../utils/env");
|
|
16
|
+
const skills_extension_1 = require("../utils/skills-extension");
|
|
15
17
|
const STEERING_PACKAGE = '@lark-apaas/coding-steering';
|
|
18
|
+
const INTERNAL_PACKAGE = '@byted-miaoda/coding-steering-extension-internal';
|
|
19
|
+
const INTERNAL_REGISTRY = 'https://bnpm.byted.org/';
|
|
16
20
|
/** nested 目标的祖先链,破坏性操作前逐段验真(见 `assertNoSymlinkedAncestor`)。 */
|
|
17
21
|
const NESTED_ANCESTORS = ['.agent', 'skills', 'steering'];
|
|
18
22
|
/**
|
|
@@ -30,9 +34,8 @@ const NESTED_ANCESTORS = ['.agent', 'skills', 'steering'];
|
|
|
30
34
|
*
|
|
31
35
|
* 首字符限定字母数字,顺带排掉了 `.` / `..` 与隐藏目录名。
|
|
32
36
|
*/
|
|
33
|
-
const STACK_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
|
|
34
37
|
function assertSafeStack(stack) {
|
|
35
|
-
if (!
|
|
38
|
+
if (!(0, coding_steering_files_1.isSafeSteeringId)(stack)) {
|
|
36
39
|
throw new error_1.AppError('SKILLS_INVALID_STACK', `stack 名非法:${JSON.stringify(stack)}。只允许单个路径段(首字符为字母数字,其余可含 . _ -);` +
|
|
37
40
|
`请检查 .spark/meta.json 的 stack 字段`);
|
|
38
41
|
}
|
|
@@ -41,357 +44,208 @@ function inferMode() {
|
|
|
41
44
|
// 沙箱(MIAODA_DEP_CACHE_DIR 非空)→ sandbox;本地 → local
|
|
42
45
|
return (0, env_1.isSandboxEnv)() ? 'sandbox' : 'local';
|
|
43
46
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
47
|
+
function selectSkills(pkg, opts, mode, logPrefix, internal) {
|
|
48
|
+
const { stack, templateVersion } = opts;
|
|
49
|
+
const root = node_path_1.default.join(pkg.extractDir, 'steering');
|
|
50
|
+
if (!node_fs_1.default.lstatSync(pkg.extractDir, { throwIfNoEntry: false })?.isDirectory() ||
|
|
51
|
+
!node_fs_1.default.lstatSync(root, { throwIfNoEntry: false })?.isDirectory()) {
|
|
52
|
+
throw new error_1.AppError('SKILLS_INVALID_PACKAGE', `包中缺少 steering 目录:${internal ? INTERNAL_PACKAGE : STEERING_PACKAGE}`);
|
|
53
|
+
}
|
|
54
|
+
const selected = [];
|
|
55
|
+
// 两包各自按 common < 专有层选取。缺栈/缺层为零条目。
|
|
56
|
+
for (const layer of ['skills_common', mode === 'sandbox' ? 'skills' : 'skills_local']) {
|
|
57
|
+
(0, file_ops_1.assertNoSymlinkedAncestor)(root, [stack, layer]);
|
|
58
|
+
const dir = node_path_1.default.join(root, stack, layer);
|
|
59
|
+
if (!node_fs_1.default.lstatSync(dir, { throwIfNoEntry: false }))
|
|
60
|
+
continue;
|
|
61
|
+
for (const entry of node_fs_1.default.readdirSync(dir, { withFileTypes: true })) {
|
|
62
|
+
if (entry.isFile())
|
|
63
|
+
continue; // README / 占位文件
|
|
64
|
+
const src = node_path_1.default.join(dir, entry.name);
|
|
65
|
+
if (!entry.isDirectory() || !(0, coding_steering_files_1.isSafeSteeringId)(entry.name)) {
|
|
66
|
+
throw new error_1.AppError('SKILLS_INVALID_PACKAGE', `无效的 skill 目录:${src}`);
|
|
67
|
+
}
|
|
68
|
+
if (!matchesTemplate(src, stack, templateVersion, logPrefix))
|
|
69
|
+
continue;
|
|
70
|
+
selected.push({
|
|
71
|
+
packageName: internal ? INTERNAL_PACKAGE : STEERING_PACKAGE,
|
|
72
|
+
id: entry.name,
|
|
73
|
+
src,
|
|
74
|
+
label: `${stack}/${layer}/${entry.name}`,
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return selected;
|
|
79
|
+
}
|
|
80
|
+
function selectExtension(pkg, opts, mode, logPrefix) {
|
|
81
|
+
const actions = (0, skills_extension_1.readSkillsExtension)(pkg.extractDir);
|
|
82
|
+
if (actions === undefined)
|
|
83
|
+
return { skills: selectSkills(pkg, opts, mode, logPrefix, true), removed: new Set() };
|
|
84
|
+
const skills = [];
|
|
85
|
+
const removed = new Set();
|
|
86
|
+
for (const action of actions) {
|
|
87
|
+
const src = action.op === 'add' ? (0, skills_extension_1.resolveExtensionSource)(pkg.extractDir, action) : undefined;
|
|
88
|
+
if (action.stack !== opts.stack || !action.modes.includes(mode))
|
|
89
|
+
continue;
|
|
90
|
+
if (action.op === 'remove')
|
|
91
|
+
removed.add(action.id);
|
|
92
|
+
else if (src !== undefined && matchesTemplate(src, opts.stack, opts.templateVersion, logPrefix))
|
|
93
|
+
skills.push({
|
|
94
|
+
packageName: INTERNAL_PACKAGE,
|
|
95
|
+
id: action.id,
|
|
96
|
+
src,
|
|
97
|
+
label: action.source.replace(/^steering\//, ''),
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
return { skills, removed };
|
|
101
|
+
}
|
|
102
|
+
function mergeSkills(publicSkills, internalSkills) {
|
|
103
|
+
// key 归一化以兼容大小写不敏感的文件系统,报错仍保留两个源条目的实际拼写。
|
|
104
|
+
const effective = new Map();
|
|
105
|
+
for (const skill of [...publicSkills, ...internalSkills]) {
|
|
106
|
+
const key = skill.id.toLowerCase();
|
|
107
|
+
const prior = effective.get(key);
|
|
108
|
+
if (prior !== undefined && prior.id !== skill.id) {
|
|
109
|
+
throw new error_1.AppError('SKILLS_ID_CONFLICT', `steering skill ID 冲突:${prior.packageName} 的 ${prior.label} 与 ${skill.packageName} 的 ${skill.label}`);
|
|
110
|
+
}
|
|
111
|
+
effective.set(key, skill);
|
|
112
|
+
}
|
|
113
|
+
return effective;
|
|
114
|
+
}
|
|
115
|
+
/** 公共和内网来源独立解析,合并当前栈生效的 skill 后在调用方持有的项目锁内提交。 */
|
|
68
116
|
function syncCodingSteering(opts) {
|
|
69
|
-
const logPrefix = opts.logPrefix ?? 'skills';
|
|
70
|
-
// 版本优先级:--version(显式 pin / 止血)> lane(TCC 定向灰度)> BOE 默认 @dev > @latest
|
|
71
|
-
//
|
|
72
|
-
// 与 sandbox-skills 的 syncSandboxSkills 完全同一套口径,只是包名不同。BOE 的 @dev
|
|
73
|
-
// 由 miaoda-coding develop 分支的自动发布维护;lane 必须压过 dev —— TCC 配了 tgzKey
|
|
74
|
-
// 就是定向到某个 feat 分支的快照,不该被"BOE 跟 develop"这条默认规则盖掉。
|
|
75
|
-
//
|
|
76
|
-
// BOE→dev 这一档在本函数里算,不由调用方预填:`skills sync --type` 分支会带 tgzKey
|
|
77
|
-
// 进来,调用方若先把 'dev' 塞进 version,version 档位更高,lane 就永远命不中。
|
|
78
|
-
// 本地分支 / app init 为了回报 versionSource 仍会自己算 dev 再传 version —— 那两条路
|
|
79
|
-
// 没有 tgzKey,lane 档天然为空,两处口径一致不会打架。
|
|
80
|
-
//
|
|
81
|
-
// lane 解析与 sandbox-skills 同一套:`extractLaneFromTgzKey` 反推 X,`pickLaneVersion`
|
|
82
|
-
// 过滤后缀 `-alpha.<X>`。**匹配只看后缀、不看 base 版本**,所以 coding-steering
|
|
83
|
-
// (`0.1.3x-alpha.<X>`)和 sandbox-skills(`0.1.x-alpha.<X>`)能共用 TCC 里的同一个
|
|
84
|
-
// key —— 前提是 lane 发布脚本用同一个 X 把两边一起发出去。这个包没发 `-alpha.<X>`
|
|
85
|
-
// 时 pickLaneVersion 返回 null(它对报错 / 无匹配都返回 null,绝不 throw),静默
|
|
86
|
-
// 回落到 dev / latest,不影响现有行为。
|
|
87
117
|
assertSafeStack(opts.stack);
|
|
118
|
+
const logPrefix = opts.logPrefix ?? 'skills';
|
|
88
119
|
const lane = (0, npm_pack_1.extractLaneFromTgzKey)(opts.tgzKey);
|
|
89
120
|
const laneVersion = lane === null ? null : (0, npm_pack_1.pickLaneVersion)(STEERING_PACKAGE, lane);
|
|
90
121
|
const isBoe = process.env.FORCE_FRAMEWORK_ENVIRONMENT === 'boe';
|
|
91
|
-
const
|
|
122
|
+
const version = opts.version ?? laneVersion ?? (isBoe ? 'dev' : 'latest');
|
|
92
123
|
const mode = opts.mode ?? inferMode();
|
|
93
124
|
const layout = opts.outputLayout ?? 'nested';
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
});
|
|
125
|
+
const context = `stack=${opts.stack}, mode=${mode}, layout=${layout}`;
|
|
126
|
+
(0, logger_1.log)(logPrefix, `Fetching ${STEERING_PACKAGE}@${version} (${context})...`);
|
|
127
|
+
const pub = (0, npm_pack_1.fetchNpmPackage)({ packageName: STEERING_PACKAGE, version });
|
|
128
|
+
let internal;
|
|
99
129
|
try {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
dstTechPath: node_path_1.default.join(opts.targetDir, '.agents', 'tech.md'),
|
|
109
|
-
}
|
|
110
|
-
: {
|
|
111
|
-
dstSkillsDir: node_path_1.default.join(opts.targetDir, '.agent', 'skills', 'steering', opts.stack, 'skills'),
|
|
112
|
-
dstTechPath: node_path_1.default.join(opts.targetDir, '.agent', 'skills', 'steering', opts.stack, 'tech.md'),
|
|
113
|
-
};
|
|
114
|
-
// **本函数不碰任何权限位**——解锁是调用方的事:
|
|
115
|
-
// - 老链路:`update-skills.sh:162` 在跑一切之前统一 `chmod -R u+w "$TARGET_DIR"`
|
|
116
|
-
// - 新链路(`skills sync --type X`):同一次调用里 syncSandboxSkills 已经递归解锁过
|
|
117
|
-
// 整个 skills 根,本函数紧随其后执行,目录必然可写
|
|
118
|
-
// - 本地 dev / `app init`:目录从来不会被锁
|
|
119
|
-
//
|
|
120
|
-
// 曾在这里加过「解锁 + 写完还原」,两个理由下掉:steering 子树的所有权明确归 CLI
|
|
121
|
-
// (老脚本 :179/:208 写明 `steering/ 子树由 miaoda CLI 独占,update.sh 不写不删`),
|
|
122
|
-
// 锁它没收益;而权限逻辑散在写入方会跟收尾的 lockDirReadonly 形成隐式耦合,
|
|
123
|
-
// 范围一旦不对称就会出「跑一次 skills sync 把整个 skills 目录解封」这种事。
|
|
124
|
-
// nested:把 `steering/<stack>/` 整棵清掉再重建。
|
|
125
|
-
//
|
|
126
|
-
// 这一刀同时覆盖了三件事,省掉了此前一堆对账逻辑:源包删掉的 skill、被门禁判否的
|
|
127
|
-
// skill、源包这版不再提供的 tech.md —— 全都因为「先清后拷」自然消失。
|
|
128
|
-
//
|
|
129
|
-
// flat(`.agents/skills`)**刻意不清**:那是本地 dev 目录,开发者会往里放自己手写的
|
|
130
|
-
// skill,「不在本轮同步清单里就删」等于替用户删东西。老脚本压根没有 flat 概念。
|
|
131
|
-
if (layout === 'nested') {
|
|
132
|
-
(0, file_ops_1.assertNoSymlinkedAncestor)(opts.targetDir, NESTED_ANCESTORS);
|
|
133
|
-
const steeringRootDst = node_path_1.default.join(opts.targetDir, '.agent', 'skills', 'steering');
|
|
134
|
-
const stackDst = node_path_1.default.join(steeringRootDst, opts.stack);
|
|
135
|
-
(0, file_ops_1.assertStrictlyInside)(steeringRootDst, stackDst);
|
|
136
|
-
(0, file_ops_1.forceRemove)(stackDst);
|
|
130
|
+
if (process.env.MIAODA_SANDBOX_PROVIDER === 'tae') {
|
|
131
|
+
const internalTag = isBoe ? 'dev' : 'latest';
|
|
132
|
+
(0, logger_1.log)(logPrefix, `Fetching ${INTERNAL_PACKAGE}@${internalTag}...`);
|
|
133
|
+
internal = (0, npm_pack_1.fetchNpmPackage)({
|
|
134
|
+
packageName: INTERNAL_PACKAGE,
|
|
135
|
+
version: internalTag,
|
|
136
|
+
registry: INTERNAL_REGISTRY,
|
|
137
|
+
});
|
|
137
138
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
139
|
+
const versions = [`${STEERING_PACKAGE}@${pub.version}`];
|
|
140
|
+
if (internal)
|
|
141
|
+
versions.push(`${INTERNAL_PACKAGE}@${internal.version}`);
|
|
142
|
+
(0, logger_1.log)(logPrefix, `Resolved ${versions.join(', ')} (${context})`);
|
|
143
|
+
const publicSkills = selectSkills(pub, opts, mode, logPrefix, false);
|
|
144
|
+
const extension = internal ? selectExtension(internal, opts, mode, logPrefix) : undefined;
|
|
145
|
+
const internalSkills = extension?.skills ?? [];
|
|
146
|
+
const removed = extension?.removed ?? new Set();
|
|
147
|
+
for (const id of removed) {
|
|
148
|
+
const differentCase = publicSkills.find((skill) => skill.id.toLowerCase() === id.toLowerCase() && skill.id !== id);
|
|
149
|
+
if (differentCase)
|
|
150
|
+
throw new error_1.AppError('SKILLS_ID_CONFLICT', `扩展 remove 的 ID 大小写与公共包不一致:${id}`);
|
|
145
151
|
}
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
152
|
+
const effective = mergeSkills(publicSkills.filter((skill) => !removed.has(skill.id)), internalSkills);
|
|
153
|
+
const techSrc = node_path_1.default.join(pub.extractDir, 'steering', opts.stack, 'tech.md');
|
|
154
|
+
const tech = node_fs_1.default.lstatSync(techSrc, { throwIfNoEntry: false });
|
|
155
|
+
if (tech !== undefined && !tech.isFile())
|
|
156
|
+
throw new error_1.AppError('SKILLS_INVALID_PACKAGE', `无效的 tech.md:${techSrc}`);
|
|
157
|
+
for (const { src } of effective.values()) {
|
|
158
|
+
if ((0, coding_steering_files_1.treeDigest)(src) === undefined)
|
|
159
|
+
throw new error_1.AppError('SKILLS_INVALID_PACKAGE', 'skill 含软链或特殊文件:' + src);
|
|
154
160
|
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
// 顺序拷贝,后者覆盖前者:skills_common 铺底,专有层(skills 或 skills_local)覆盖同名
|
|
158
|
-
const exclusiveLayer = mode === 'sandbox' ? 'skills' : 'skills_local';
|
|
159
|
-
const layers = [
|
|
160
|
-
{ dir: node_path_1.default.join(stackDir, 'skills_common'), label: `${opts.stack}/skills_common` },
|
|
161
|
-
{ dir: node_path_1.default.join(stackDir, exclusiveLayer), label: `${opts.stack}/${exclusiveLayer}` },
|
|
162
|
-
];
|
|
163
|
-
for (const layer of layers) {
|
|
164
|
-
if (!node_fs_1.default.existsSync(layer.dir))
|
|
165
|
-
continue;
|
|
166
|
-
for (const name of node_fs_1.default.readdirSync(layer.dir)) {
|
|
167
|
-
const src = node_path_1.default.join(layer.dir, name);
|
|
168
|
-
if (!node_fs_1.default.statSync(src).isDirectory())
|
|
169
|
-
continue;
|
|
170
|
-
if (!matchesTemplate(src, opts.stack, opts.templateVersion, logPrefix)) {
|
|
171
|
-
filteredOut.push(`${layer.label}/${name}`);
|
|
172
|
-
continue;
|
|
173
|
-
}
|
|
174
|
-
const dst = node_path_1.default.join(dstSkillsDir, name);
|
|
175
|
-
// flat 下目录没被整清,同名仍需先删再拷(skills_common 铺底、专有层覆盖同名)
|
|
176
|
-
if (node_fs_1.default.existsSync(dst))
|
|
177
|
-
node_fs_1.default.rmSync(dst, { recursive: true, force: true });
|
|
178
|
-
copyDir(src, dst);
|
|
179
|
-
synced.push(`${layer.label}/${name}`);
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
// 收尾(仅 nested):删掉同级其它 stack 的整棵 steering 目录。
|
|
183
|
-
// meta.json 的 stack 唯一,切栈后旧 stack 的 steering 不该再留 —— 修的正是
|
|
184
|
-
// 「vite-react 升级到 nestjs-react-fullstack 后 steering/vite-react/ 永久残留」。
|
|
185
|
-
// 老脚本靠 should_sync 里 `path_stack != STACK → return 1` + 逐文件删除达到同样效果。
|
|
186
|
-
// flat layout 没有 stack 命名空间,天然不涉及。
|
|
161
|
+
let claudeSkillsLink;
|
|
162
|
+
let preserved = new Set();
|
|
187
163
|
const prunedStacks = [];
|
|
188
|
-
if (layout === '
|
|
164
|
+
if (layout === 'flat') {
|
|
165
|
+
const internalIds = new Set(internalSkills.map((skill) => skill.id));
|
|
166
|
+
const communitySources = new Map(publicSkills.map((skill) => [skill.id, skill.src]));
|
|
167
|
+
({ claudeSkillsLink, preserved } = (0, coding_steering_flat_1.syncFlatSteering)(opts.targetDir, new Map([...effective.values()].map((skill) => [skill.id, skill.src])), node_path_1.default.dirname(techSrc), internalIds, communitySources, logPrefix, new Map([...removed].map((id) => [id, { packageName: INTERNAL_PACKAGE, stack: opts.stack }]))));
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
189
170
|
(0, file_ops_1.assertNoSymlinkedAncestor)(opts.targetDir, NESTED_ANCESTORS);
|
|
190
|
-
const
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
171
|
+
const steeringRoot = node_path_1.default.join(opts.targetDir, ...NESTED_ANCESTORS);
|
|
172
|
+
const stackDir = node_path_1.default.join(steeringRoot, opts.stack);
|
|
173
|
+
(0, file_ops_1.assertStrictlyInside)(steeringRoot, stackDir);
|
|
174
|
+
(0, file_ops_1.forceRemove)(stackDir);
|
|
175
|
+
const skillsDir = node_path_1.default.join(stackDir, 'skills');
|
|
176
|
+
node_fs_1.default.mkdirSync(skillsDir, { recursive: true });
|
|
177
|
+
if (tech !== undefined)
|
|
178
|
+
node_fs_1.default.copyFileSync(techSrc, node_path_1.default.join(stackDir, 'tech.md'));
|
|
179
|
+
for (const { id, src } of effective.values())
|
|
180
|
+
(0, coding_steering_files_1.copySkillTree)(src, node_path_1.default.join(skillsDir, id));
|
|
181
|
+
for (const entry of node_fs_1.default.readdirSync(steeringRoot)) {
|
|
182
|
+
if (entry === opts.stack)
|
|
183
|
+
continue;
|
|
184
|
+
try {
|
|
185
|
+
const entryDir = node_path_1.default.join(steeringRoot, entry);
|
|
186
|
+
(0, file_ops_1.assertStrictlyInside)(steeringRoot, entryDir);
|
|
187
|
+
(0, file_ops_1.forceRemove)(entryDir);
|
|
188
|
+
prunedStacks.push(entry);
|
|
189
|
+
}
|
|
190
|
+
catch (err) {
|
|
191
|
+
(0, logger_1.debug)('coding-steering: prune stale stack ' + entry + ' failed: ' + String(err));
|
|
204
192
|
}
|
|
205
193
|
}
|
|
206
194
|
}
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
version: fetched.version,
|
|
219
|
-
syncedSkills: synced,
|
|
220
|
-
techSynced,
|
|
195
|
+
// 公共标签沿用旧协议(包含被专有层覆盖的 common 来源)。
|
|
196
|
+
const syncedSkills = [...publicSkills, ...internalSkills]
|
|
197
|
+
.filter((skill) => !preserved.has(skill.id) &&
|
|
198
|
+
effective.get(skill.id.toLowerCase())?.packageName === skill.packageName)
|
|
199
|
+
.map((skill) => skill.packageName === INTERNAL_PACKAGE ? INTERNAL_PACKAGE + ':' + skill.label : skill.label);
|
|
200
|
+
const result = {
|
|
201
|
+
version: pub.version,
|
|
202
|
+
...(internal !== undefined ? { internalVersion: internal.version } : {}),
|
|
203
|
+
syncedSkills,
|
|
204
|
+
...(removed.size > 0 ? { removedSkills: [...removed] } : {}),
|
|
205
|
+
techSynced: tech !== undefined,
|
|
221
206
|
prunedStacks,
|
|
222
207
|
...(claudeSkillsLink !== undefined ? { claudeSkillsLink } : {}),
|
|
208
|
+
...(preserved.size > 0 ? { preservedLocalSkills: [...preserved] } : {}),
|
|
223
209
|
};
|
|
210
|
+
(0, logger_1.log)(logPrefix, `Synced ${String(result.syncedSkills.length)} skill(s), tech.md ${result.techSynced ? 'yes' : 'no'} (mode=${mode}, layout=${layout})`);
|
|
211
|
+
return result;
|
|
224
212
|
}
|
|
225
213
|
finally {
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
* 用相对路径软链(不是 absolute)—— user app 移动目录 / clone 到别处不会断链。
|
|
234
|
-
*
|
|
235
|
-
* 处理 4 种已有状态:
|
|
236
|
-
* - 已是软链且指向对的:noop
|
|
237
|
-
* - 已是软链但指错地方:删旧的,建新的(updated)
|
|
238
|
-
* - 已是普通目录 / 文件:不覆盖,警告并跳过(conflict)—— 用户可能手动放了别的 skills
|
|
239
|
-
* - 不存在:建新的(created)
|
|
240
|
-
*
|
|
241
|
-
* 软链建不出来时返回 unsupported 而不是抛错:Windows 上非管理员且未开「开发者模式」
|
|
242
|
-
* 时 symlinkSync 报 EPERM,这不该让整条 steering 同步(进而 app init / app sync)失败。
|
|
243
|
-
* 退化后果是 Claude Code 默认路径读不到 skills —— 功能降级但项目可用,且日志里给了
|
|
244
|
-
* 明确的开启方式。不做「复制代替软链」的兜底:那会让两份内容各自漂移,比读不到更糟。
|
|
245
|
-
*/
|
|
246
|
-
/**
|
|
247
|
-
* 建目录软链,失败只 warn 不抛。返回是否建成。
|
|
248
|
-
*
|
|
249
|
-
* 主要挡的是 Windows 的 EPERM(创建软链需要 SeCreateSymbolicLinkPrivilege,
|
|
250
|
-
* 默认只给管理员;开启「开发者模式」后普通用户也可以)。其它 errno 一样按降级处理 ——
|
|
251
|
-
* 这一步是锦上添花,不值得中断整次同步。
|
|
252
|
-
*/
|
|
253
|
-
function trySymlink(linkTarget, linkPath, logPrefix) {
|
|
254
|
-
try {
|
|
255
|
-
node_fs_1.default.symlinkSync(linkTarget, linkPath, 'dir');
|
|
256
|
-
return true;
|
|
257
|
-
}
|
|
258
|
-
catch (err) {
|
|
259
|
-
const code = err.code ?? 'UNKNOWN';
|
|
260
|
-
const hint = process.platform === 'win32'
|
|
261
|
-
? '(Windows 需以管理员运行,或在「设置 → 隐私和安全性 → 开发者选项」开启开发者模式)'
|
|
262
|
-
: '';
|
|
263
|
-
(0, logger_2.log)(logPrefix, ` ⚠ .claude/skills 软链创建失败 [${code}],跳过${hint};skills 仍在 .agents/skills 下可用`);
|
|
264
|
-
return false;
|
|
265
|
-
}
|
|
266
|
-
}
|
|
267
|
-
function ensureClaudeSkillsSymlink(targetDir, logPrefix) {
|
|
268
|
-
const linkPath = node_path_1.default.join(targetDir, '.claude', 'skills');
|
|
269
|
-
const linkTarget = node_path_1.default.join('..', '.agents', 'skills');
|
|
270
|
-
node_fs_1.default.mkdirSync(node_path_1.default.dirname(linkPath), { recursive: true });
|
|
271
|
-
let existing = null;
|
|
272
|
-
try {
|
|
273
|
-
existing = node_fs_1.default.lstatSync(linkPath);
|
|
274
|
-
}
|
|
275
|
-
catch (err) {
|
|
276
|
-
if (err.code !== 'ENOENT')
|
|
277
|
-
throw err;
|
|
278
|
-
}
|
|
279
|
-
if (existing === null) {
|
|
280
|
-
if (!trySymlink(linkTarget, linkPath, logPrefix))
|
|
281
|
-
return 'unsupported';
|
|
282
|
-
(0, logger_2.log)(logPrefix, ` ✓ .claude/skills → ${linkTarget} (symlink created)`);
|
|
283
|
-
return 'created';
|
|
284
|
-
}
|
|
285
|
-
if (existing.isSymbolicLink()) {
|
|
286
|
-
const current = node_fs_1.default.readlinkSync(linkPath);
|
|
287
|
-
if (current === linkTarget) {
|
|
288
|
-
return 'noop';
|
|
214
|
+
for (const pkg of [pub, internal]) {
|
|
215
|
+
try {
|
|
216
|
+
pkg?.cleanup();
|
|
217
|
+
}
|
|
218
|
+
catch (err) {
|
|
219
|
+
(0, logger_1.log)(logPrefix, `清理 steering 下载缓存失败:${String(err)}`);
|
|
220
|
+
}
|
|
289
221
|
}
|
|
290
|
-
node_fs_1.default.unlinkSync(linkPath);
|
|
291
|
-
if (!trySymlink(linkTarget, linkPath, logPrefix))
|
|
292
|
-
return 'unsupported';
|
|
293
|
-
(0, logger_2.log)(logPrefix, ` ✓ .claude/skills → ${linkTarget} (symlink updated, was → ${current})`);
|
|
294
|
-
return 'updated';
|
|
295
222
|
}
|
|
296
|
-
(0, logger_2.log)(logPrefix, ` ⚠ .claude/skills 已是普通目录/文件,跳过软链创建`);
|
|
297
|
-
return 'conflict';
|
|
298
223
|
}
|
|
299
|
-
/**
|
|
300
|
-
|
|
301
|
-
* (`update-skills.sh:80-90`):只看第一段 `---` 围起来的 frontmatter,去掉引号与全部空白。
|
|
302
|
-
* 没有该字段(或没有 SKILL.md)返回 undefined = 不设版本门禁。
|
|
303
|
-
*/
|
|
304
|
-
function readMatchTemplateVersion(skillDir) {
|
|
305
|
-
const skillMd = node_path_1.default.join(skillDir, 'SKILL.md');
|
|
306
|
-
if (!node_fs_1.default.existsSync(skillMd))
|
|
307
|
-
return undefined;
|
|
308
|
-
let content;
|
|
309
|
-
try {
|
|
310
|
-
content = node_fs_1.default.readFileSync(skillMd, 'utf-8');
|
|
311
|
-
}
|
|
312
|
-
catch {
|
|
313
|
-
return undefined;
|
|
314
|
-
}
|
|
315
|
-
const fm = /^---\r?\n([\s\S]*?)\r?\n---/.exec(content);
|
|
316
|
-
if (fm === null)
|
|
317
|
-
return undefined;
|
|
318
|
-
const line = /^match-template-version:(.*)$/m.exec(fm[1]);
|
|
319
|
-
if (line === null)
|
|
320
|
-
return undefined;
|
|
321
|
-
const value = line[1].replace(/["']/g, '').replace(/\s/g, '');
|
|
322
|
-
return value === '' ? undefined : value;
|
|
323
|
-
}
|
|
324
|
-
/** 读 frontmatter 里的 `match-template-name`(同上,取不到返回 undefined)。 */
|
|
325
|
-
function readMatchTemplateName(skillDir) {
|
|
224
|
+
/** 只读第一段 frontmatter,保留原有名字/版本门禁的比较口径。 */
|
|
225
|
+
function matchesTemplate(skillDir, stack, templateVersion, logPrefix) {
|
|
326
226
|
const skillMd = node_path_1.default.join(skillDir, 'SKILL.md');
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
let content;
|
|
330
|
-
try {
|
|
331
|
-
content = node_fs_1.default.readFileSync(skillMd, 'utf-8');
|
|
332
|
-
}
|
|
333
|
-
catch {
|
|
334
|
-
return undefined;
|
|
335
|
-
}
|
|
336
|
-
const fm = /^---\r?\n([\s\S]*?)\r?\n---/.exec(content);
|
|
337
|
-
if (fm === null)
|
|
338
|
-
return undefined;
|
|
339
|
-
const line = /^match-template-name:(.*)$/m.exec(fm[1]);
|
|
340
|
-
if (line === null)
|
|
341
|
-
return undefined;
|
|
342
|
-
const value = line[1].replace(/["']/g, '').trim();
|
|
343
|
-
return value === '' ? undefined : value;
|
|
344
|
-
}
|
|
345
|
-
/**
|
|
346
|
-
* `match-template-version` 门禁,语义逐字对齐老 `check_version_match`
|
|
347
|
-
* (`update-skills.sh:76-108`):
|
|
348
|
-
* - skill 没声明该字段 → 放行
|
|
349
|
-
* - 声明值是纯整数 → 与用户版本的 **major** 比(`3` 匹配 `3.2.1`)
|
|
350
|
-
* - 其它形态(如 `2.2.6`) → 与用户版本**全等**
|
|
351
|
-
* - 用户版本未知(meta 里没 version)→ 放行(见 opts.templateVersion 注释)
|
|
352
|
-
*/
|
|
353
|
-
function matchesTemplateVersion(skillDir, templateVersion) {
|
|
354
|
-
const required = readMatchTemplateVersion(skillDir);
|
|
355
|
-
if (required === undefined)
|
|
227
|
+
const stat = node_fs_1.default.lstatSync(skillMd, { throwIfNoEntry: false });
|
|
228
|
+
if (stat === undefined)
|
|
356
229
|
return true;
|
|
357
|
-
if (
|
|
358
|
-
|
|
359
|
-
|
|
230
|
+
if (!stat.isFile())
|
|
231
|
+
throw new error_1.AppError('SKILLS_INVALID_PACKAGE', `无效的 SKILL.md:${skillMd}`);
|
|
232
|
+
const content = node_fs_1.default.readFileSync(skillMd, 'utf8');
|
|
233
|
+
const fm = /^---\r?\n([\s\S]*?)\r?\n---/.exec(content)?.[1];
|
|
234
|
+
if (fm === undefined)
|
|
360
235
|
return true;
|
|
361
|
-
|
|
362
|
-
if (
|
|
363
|
-
|
|
364
|
-
}
|
|
365
|
-
return templateVersion === required;
|
|
366
|
-
}
|
|
367
|
-
/**
|
|
368
|
-
* 组合门禁:`match-template-name` + `match-template-version`。
|
|
369
|
-
*
|
|
370
|
-
* `match-template-name` 在这里是**防御性校验**而非过滤主力:包内 skill 本来就住在
|
|
371
|
-
* `steering/<stack>/` 下、目录结构已经按 stack 隔离,声明值理应等于所在 stack
|
|
372
|
-
* (实测包里 23 处全是 `nestjs-react-fullstack`)。真正跨 stack 的池化过滤在 feida-ai
|
|
373
|
-
* 加载时做(`skills.ts:1209` 的 `isTemplateMatched`)。所以这里对不上就是**包结构出问题**,
|
|
374
|
-
* 用 log(常显)而不是 debug 报出来,别静默下发到错误的 stack。
|
|
375
|
-
*/
|
|
376
|
-
function matchesTemplate(skillDir, stack, templateVersion, logPrefix) {
|
|
377
|
-
const declaredName = readMatchTemplateName(skillDir);
|
|
378
|
-
if (declaredName !== undefined && declaredName !== stack) {
|
|
379
|
-
(0, logger_2.log)(logPrefix, `⚠ ${node_path_1.default.basename(skillDir)} 声明 match-template-name=${declaredName},` +
|
|
380
|
-
`但它位于 steering/${stack}/ 下 —— 包结构异常,跳过该 skill`);
|
|
236
|
+
const declaredName = /^match-template-name:(.*)$/m.exec(fm)?.[1].replace(/["']/g, '').trim();
|
|
237
|
+
if (declaredName && declaredName !== stack) {
|
|
238
|
+
(0, logger_1.log)(logPrefix, `⚠ ${node_path_1.default.basename(skillDir)} 声明 match-template-name=${declaredName},但它位于 steering/${stack}/ 下,跳过该 skill`);
|
|
381
239
|
return false;
|
|
382
240
|
}
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
const destPath = node_path_1.default.join(dest, entry.name);
|
|
390
|
-
if (entry.isDirectory()) {
|
|
391
|
-
copyDir(srcPath, destPath);
|
|
392
|
-
}
|
|
393
|
-
else {
|
|
394
|
-
node_fs_1.default.copyFileSync(srcPath, destPath);
|
|
395
|
-
}
|
|
241
|
+
const required = /^match-template-version:(.*)$/m.exec(fm)?.[1].replace(/["'\s]/g, '');
|
|
242
|
+
if (!required)
|
|
243
|
+
return true;
|
|
244
|
+
if (!templateVersion) {
|
|
245
|
+
(0, logger_1.debug)(`coding-steering: ${node_path_1.default.basename(skillDir)} 声明 match-template-version=${required},但 .spark/meta.json 无 version,放行`);
|
|
246
|
+
return true;
|
|
396
247
|
}
|
|
248
|
+
return /^\d+$/.test(required)
|
|
249
|
+
? templateVersion.split('.')[0] === required
|
|
250
|
+
: templateVersion === required;
|
|
397
251
|
}
|
package/dist/utils/npm-pack.js
CHANGED
|
@@ -86,7 +86,19 @@ function fetchNpmPackage(opts) {
|
|
|
86
86
|
const tmpDir = node_fs_1.default.mkdtempSync(node_path_1.default.join(node_os_1.default.tmpdir(), 'miaoda-pack-'));
|
|
87
87
|
try {
|
|
88
88
|
(0, logger_1.debug)(`npm pack ${pkgSpec} --registry ${registry} → ${tmpDir}`);
|
|
89
|
-
|
|
89
|
+
// npm 对 scoped 包优先采用 @scope:registry;显式选库时一并固定该 scope。
|
|
90
|
+
const scope = /^(@[^/]+)\//.exec(opts.packageName)?.[1];
|
|
91
|
+
const scopeRegistry = opts.registry !== undefined && scope !== undefined ? [`--${scope}:registry=${registry}`] : [];
|
|
92
|
+
const stdout = (0, run_npm_1.execNpmSyncCapture)([
|
|
93
|
+
'pack',
|
|
94
|
+
pkgSpec,
|
|
95
|
+
'--pack-destination',
|
|
96
|
+
tmpDir,
|
|
97
|
+
'--json',
|
|
98
|
+
'--registry',
|
|
99
|
+
registry,
|
|
100
|
+
...scopeRegistry,
|
|
101
|
+
], { stdio: ['pipe', 'pipe', 'pipe'] });
|
|
90
102
|
const packInfo = JSON.parse(stdout);
|
|
91
103
|
const tgzFilename = packInfo[0]?.filename;
|
|
92
104
|
const pkgVersion = packInfo[0]?.version ?? version;
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.readSkillsExtension = readSkillsExtension;
|
|
7
|
+
exports.resolveExtensionSource = resolveExtensionSource;
|
|
8
|
+
const node_fs_1 = __importDefault(require("node:fs"));
|
|
9
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
10
|
+
const error_1 = require("../utils/error");
|
|
11
|
+
const coding_steering_files_1 = require("../utils/coding-steering-files");
|
|
12
|
+
const file_ops_1 = require("../utils/file-ops");
|
|
13
|
+
function isRecord(value) {
|
|
14
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
15
|
+
}
|
|
16
|
+
function invalid(detail) {
|
|
17
|
+
throw new error_1.AppError('SKILLS_INVALID_EXTENSION', `无效的 skill 扩展协议:${detail}`);
|
|
18
|
+
}
|
|
19
|
+
/** 无协议的旧包继续使用目录约定;已声明的协议必须完整有效。 */
|
|
20
|
+
function readSkillsExtension(root) {
|
|
21
|
+
const manifest = node_path_1.default.join(root, 'package.json');
|
|
22
|
+
const stat = node_fs_1.default.lstatSync(manifest, { throwIfNoEntry: false });
|
|
23
|
+
if (stat === undefined)
|
|
24
|
+
return undefined;
|
|
25
|
+
if (!stat.isFile())
|
|
26
|
+
invalid('package.json 必须是真实文件');
|
|
27
|
+
let pkg;
|
|
28
|
+
try {
|
|
29
|
+
pkg = JSON.parse(node_fs_1.default.readFileSync(manifest, 'utf8'));
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
invalid('package.json 不是有效 JSON');
|
|
33
|
+
}
|
|
34
|
+
if (!isRecord(pkg))
|
|
35
|
+
invalid('package.json 必须是对象');
|
|
36
|
+
if (!Object.hasOwn(pkg, 'miaodaSkillsExtension'))
|
|
37
|
+
return undefined;
|
|
38
|
+
const protocol = pkg.miaodaSkillsExtension;
|
|
39
|
+
if (!isRecord(protocol) || protocol.schemaVersion !== 1 || protocol.target !== 'coding-steering')
|
|
40
|
+
invalid('仅支持 schemaVersion=1、target=coding-steering');
|
|
41
|
+
if (Object.keys(protocol).some((key) => !['schemaVersion', 'target', 'actions'].includes(key)))
|
|
42
|
+
invalid('存在未知协议字段');
|
|
43
|
+
if (!Array.isArray(protocol.actions))
|
|
44
|
+
invalid('actions 必须是数组');
|
|
45
|
+
const actions = [];
|
|
46
|
+
const seen = new Set();
|
|
47
|
+
for (const raw of protocol.actions) {
|
|
48
|
+
if (!isRecord(raw) || (raw.op !== 'add' && raw.op !== 'remove'))
|
|
49
|
+
invalid('未知动作');
|
|
50
|
+
if (!(0, coding_steering_files_1.isSafeSteeringId)(raw.stack) || !(0, coding_steering_files_1.isSafeSteeringId)(raw.id))
|
|
51
|
+
invalid('stack 或 id 非法');
|
|
52
|
+
const fields = raw.op === 'add' ? ['op', 'stack', 'id', 'modes', 'source'] : ['op', 'stack', 'id', 'modes'];
|
|
53
|
+
if (Object.keys(raw).some((key) => !fields.includes(key)))
|
|
54
|
+
invalid('存在未知动作字段');
|
|
55
|
+
const modes = [];
|
|
56
|
+
const declared = raw.modes === undefined ? ['local', 'sandbox'] : raw.modes;
|
|
57
|
+
if (!Array.isArray(declared) || declared.length === 0)
|
|
58
|
+
invalid('modes 必须是非空数组');
|
|
59
|
+
for (const mode of declared) {
|
|
60
|
+
if ((mode !== 'local' && mode !== 'sandbox') || modes.includes(mode))
|
|
61
|
+
invalid('modes 非法或重复');
|
|
62
|
+
modes.push(mode);
|
|
63
|
+
const key = JSON.stringify([raw.stack, mode, raw.id.toLowerCase()]);
|
|
64
|
+
if (seen.has(key))
|
|
65
|
+
invalid(`动作重复或冲突:${raw.stack}/${mode}/${raw.id}`);
|
|
66
|
+
seen.add(key);
|
|
67
|
+
}
|
|
68
|
+
const common = { stack: raw.stack, id: raw.id, modes };
|
|
69
|
+
if (raw.op === 'remove')
|
|
70
|
+
actions.push({ ...common, op: 'remove' });
|
|
71
|
+
else {
|
|
72
|
+
if (typeof raw.source !== 'string' || !raw.source.split('/').every(coding_steering_files_1.isSafeSteeringId))
|
|
73
|
+
invalid('source 必须是包内相对目录');
|
|
74
|
+
if (node_path_1.default.posix.basename(raw.source) !== raw.id)
|
|
75
|
+
invalid('source 目录名必须与 id 一致');
|
|
76
|
+
actions.push({ ...common, op: 'add', source: raw.source });
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return actions;
|
|
80
|
+
}
|
|
81
|
+
function resolveExtensionSource(root, action) {
|
|
82
|
+
(0, file_ops_1.assertNoSymlinkedAncestor)(root, action.source.split('/'));
|
|
83
|
+
const source = node_path_1.default.join(root, ...action.source.split('/'));
|
|
84
|
+
if (!node_fs_1.default.lstatSync(source, { throwIfNoEntry: false })?.isDirectory())
|
|
85
|
+
invalid(`source 不存在:${action.source}`);
|
|
86
|
+
const skill = node_path_1.default.join(source, 'SKILL.md');
|
|
87
|
+
if (!node_fs_1.default.lstatSync(skill, { throwIfNoEntry: false })?.isFile())
|
|
88
|
+
invalid(`缺少真实 SKILL.md:${action.source}`);
|
|
89
|
+
const content = node_fs_1.default.readFileSync(skill, 'utf8');
|
|
90
|
+
const fm = /^---\r?\n([\s\S]*?)\r?\n---/.exec(content)?.[1] ?? '';
|
|
91
|
+
const name = /^name:\s*(?:"([^"]+)"|'([^']+)'|([A-Za-z0-9][A-Za-z0-9._-]*))\s*(?:#.*)?$/m.exec(fm);
|
|
92
|
+
if ((name?.[1] ?? name?.[2] ?? name?.[3]) !== action.id)
|
|
93
|
+
invalid(`SKILL.md name 与 id 不一致:${action.id}`);
|
|
94
|
+
return source;
|
|
95
|
+
}
|
package/package.json
CHANGED
|
@@ -45,32 +45,49 @@ STEP_START=$(node -e "console.log(Date.now())")
|
|
|
45
45
|
|
|
46
46
|
# 在 client/server 构建之前生成到 dist/,供 DefinePlugin 注入前端 bundle
|
|
47
47
|
# 注意:nest-cli.json 中 deleteOutDir 必须为 false(模板默认值),否则 nest build 会清掉 dist/
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
wait $API_ROUTES_PID || API_ROUTES_EXIT=$?
|
|
60
|
-
wait $PAGE_ROUTES_PID || PAGE_ROUTES_EXIT=$?
|
|
61
|
-
|
|
62
|
-
if [ $API_ROUTES_EXIT -ne 0 ]; then
|
|
63
|
-
echo " ⚠️ API 路由生成失败(不影响构建)"
|
|
64
|
-
cat /tmp/gen-api-routes.log
|
|
48
|
+
# 生成器来自 @lark-apaas/devtool-kits(由 preset 间接安装)。只用本地命令:
|
|
49
|
+
# 未安装时直接跳过,不走 npx,避免联网查同名包 404 的等待;preset 读不到文件会注入空路由。
|
|
50
|
+
API_ROUTES_BIN="$ROOT_DIR/node_modules/.bin/generate-api-routes"
|
|
51
|
+
PAGE_ROUTES_BIN="$ROOT_DIR/node_modules/.bin/generate-page-routes"
|
|
52
|
+
API_ROUTES_PID=""
|
|
53
|
+
PAGE_ROUTES_PID=""
|
|
54
|
+
|
|
55
|
+
if [ -x "$API_ROUTES_BIN" ]; then
|
|
56
|
+
echo " ├─ 生成 API 路由定义..."
|
|
57
|
+
"$API_ROUTES_BIN" --server-dir ./server --out-dir ./dist > /tmp/gen-api-routes.log 2>&1 &
|
|
58
|
+
API_ROUTES_PID=$!
|
|
65
59
|
else
|
|
66
|
-
echo "
|
|
60
|
+
echo " ⏭️ 未安装 generate-api-routes,跳过 API 路由定义生成"
|
|
67
61
|
fi
|
|
68
62
|
|
|
69
|
-
if [
|
|
70
|
-
echo "
|
|
71
|
-
|
|
63
|
+
if [ -x "$PAGE_ROUTES_BIN" ]; then
|
|
64
|
+
echo " ├─ 生成页面路由定义..."
|
|
65
|
+
"$PAGE_ROUTES_BIN" --app-path ./client/src/app.tsx --out-dir ./dist > /tmp/gen-page-routes.log 2>&1 &
|
|
66
|
+
PAGE_ROUTES_PID=$!
|
|
72
67
|
else
|
|
73
|
-
echo "
|
|
68
|
+
echo " ⏭️ 未安装 generate-page-routes,跳过页面路由定义生成"
|
|
69
|
+
fi
|
|
70
|
+
|
|
71
|
+
if [ -n "$API_ROUTES_PID" ]; then
|
|
72
|
+
API_ROUTES_EXIT=0
|
|
73
|
+
wait $API_ROUTES_PID || API_ROUTES_EXIT=$?
|
|
74
|
+
if [ $API_ROUTES_EXIT -ne 0 ]; then
|
|
75
|
+
echo " ⚠️ API 路由生成失败(不影响构建)"
|
|
76
|
+
cat /tmp/gen-api-routes.log
|
|
77
|
+
else
|
|
78
|
+
echo " ✅ API 路由生成完成"
|
|
79
|
+
fi
|
|
80
|
+
fi
|
|
81
|
+
|
|
82
|
+
if [ -n "$PAGE_ROUTES_PID" ]; then
|
|
83
|
+
PAGE_ROUTES_EXIT=0
|
|
84
|
+
wait $PAGE_ROUTES_PID || PAGE_ROUTES_EXIT=$?
|
|
85
|
+
if [ $PAGE_ROUTES_EXIT -ne 0 ]; then
|
|
86
|
+
echo " ⚠️ 页面路由生成失败(不影响构建)"
|
|
87
|
+
cat /tmp/gen-page-routes.log
|
|
88
|
+
else
|
|
89
|
+
echo " ✅ 页面路由生成完成"
|
|
90
|
+
fi
|
|
74
91
|
fi
|
|
75
92
|
print_time $STEP_START
|
|
76
93
|
echo ""
|
|
@@ -1,9 +1,28 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
// This file is auto-generated by @lark-apaas/fullstack-cli
|
|
3
3
|
|
|
4
|
-
const { nodeFileTrace } = require('@vercel/nft');
|
|
5
4
|
const fs = require('fs');
|
|
6
5
|
const path = require('path');
|
|
6
|
+
const { createRequire } = require('module');
|
|
7
|
+
|
|
8
|
+
// @vercel/nft 是 fullstack-cli 自身的依赖:应用装了 CLI 时从应用 node_modules 加载;
|
|
9
|
+
// 构建镜像全局预装 CLI、应用未安装时,从 PATH 上 fullstack-cli 的安装目录加载
|
|
10
|
+
function loadNft() {
|
|
11
|
+
try {
|
|
12
|
+
return require('@vercel/nft');
|
|
13
|
+
} catch (err) {
|
|
14
|
+
if (err.code !== 'MODULE_NOT_FOUND') throw err;
|
|
15
|
+
}
|
|
16
|
+
for (const dir of (process.env.PATH || '').split(path.delimiter)) {
|
|
17
|
+
const cliBin = dir && path.join(dir, 'fullstack-cli');
|
|
18
|
+
if (cliBin && fs.existsSync(cliBin)) {
|
|
19
|
+
return createRequire(fs.realpathSync(cliBin))('@vercel/nft');
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
throw new Error('未找到 @vercel/nft:应用未安装 fullstack-cli,PATH 上也没有全局 fullstack-cli');
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
const { nodeFileTrace } = loadNft();
|
|
7
26
|
|
|
8
27
|
const ROOT_DIR = path.resolve(__dirname, '..');
|
|
9
28
|
|