iskills 0.2.9 → 0.2.11
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 +8 -0
- package/dist/src/cli.js +11 -1
- package/dist/src/cli.js.map +1 -1
- package/dist/src/commands/browser.js +52 -16
- package/dist/src/commands/browser.js.map +1 -1
- package/dist/src/commands/index.d.ts +2 -1
- package/dist/src/commands/index.js +16 -1
- package/dist/src/commands/index.js.map +1 -1
- package/dist/src/commands/library.d.ts +10 -1
- package/dist/src/commands/library.js +238 -11
- package/dist/src/commands/library.js.map +1 -1
- package/dist/src/commands/search.d.ts +1 -0
- package/dist/src/commands/search.js +131 -0
- package/dist/src/commands/search.js.map +1 -0
- package/dist/src/core.d.ts +2 -1
- package/dist/src/core.js +7 -3
- package/dist/src/core.js.map +1 -1
- package/dist/src/git.d.ts +4 -0
- package/dist/src/git.js +43 -1
- package/dist/src/git.js.map +1 -1
- package/dist/src/prompts.js +1 -1
- package/dist/src/prompts.js.map +1 -1
- package/dist/src/types.d.ts +6 -0
- package/dist/src/ui/browser.d.ts +3 -0
- package/dist/src/ui/browser.js +62 -20
- package/dist/src/ui/browser.js.map +1 -1
- package/dist/src/ui/search.d.ts +5 -0
- package/dist/src/ui/search.js +101 -0
- package/dist/src/ui/search.js.map +1 -0
- package/dist/src/ui/session.d.ts +8 -1
- package/dist/src/ui/session.js +67 -12
- package/dist/src/ui/session.js.map +1 -1
- package/dist/src/ui/termcn.js +66 -33
- package/dist/src/ui/termcn.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -17,6 +17,7 @@ iskills --help
|
|
|
17
17
|
|
|
18
18
|
```bash
|
|
19
19
|
iskills # 交互式主界面
|
|
20
|
+
iskills search [关键词] # 实时搜索 skills.sh,选择后保存到收藏夹
|
|
20
21
|
iskills list # 当前项目 / 全局 / 收藏夹列表,全局按 Agent 分 Tab
|
|
21
22
|
iskills import [路径或 Git URL] # 导入到收藏夹,原本地位置保留软链
|
|
22
23
|
iskills import -g # 扫描常见 Agent 全局目录
|
|
@@ -35,6 +36,13 @@ iskills sync # 阻塞式同步收藏夹 Git
|
|
|
35
36
|
|
|
36
37
|
冲突不会写入正在使用的 Skill。来源冲突保留在 `.local/conflicts`,由用户使用编辑器和 Git 手动解决;后续运行 CLI 时自动应用已提交的合并结果。
|
|
37
38
|
|
|
39
|
+
## 开发文档
|
|
40
|
+
|
|
41
|
+
- [CLI/TUI 交互规范](docs/cli-tui-guidelines.md)
|
|
42
|
+
- [终端 UI 架构 ADR](docs/adr/0001-terminal-ui-runtime.md)
|
|
43
|
+
- [收藏数据完整性契约](docs/data-integrity.md)
|
|
44
|
+
- [Agent Skills 目录支持调研](docs/agent-skills-support.md)
|
|
45
|
+
|
|
38
46
|
## 验证
|
|
39
47
|
|
|
40
48
|
```bash
|
package/dist/src/cli.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { commandAdd, commandImport, commandInit, commandList, commandRemove, commandSync, commandUpdate, interactiveList, printHelp, } from './commands/index.js';
|
|
1
|
+
import { commandAdd, commandImport, commandInit, commandList, commandRemove, commandSearch, commandSync, commandUpdate, interactiveList, printHelp, } from './commands/index.js';
|
|
2
2
|
import { commitCollection, ensureCollection, readState } from './core.js';
|
|
3
3
|
import { finalizeResolvedConflicts } from './git.js';
|
|
4
4
|
import { closePrompts } from './prompts.js';
|
|
5
|
+
import { InterruptError } from './ui/session.js';
|
|
5
6
|
async function run(argv) {
|
|
6
7
|
const [command, ...rest] = argv;
|
|
7
8
|
if (command === 'help' || command === '--help' || command === '-h') {
|
|
@@ -13,6 +14,8 @@ async function run(argv) {
|
|
|
13
14
|
console.log('0.0.0');
|
|
14
15
|
return;
|
|
15
16
|
}
|
|
17
|
+
if (command === 'search')
|
|
18
|
+
return commandSearch(rest);
|
|
16
19
|
await ensureCollection();
|
|
17
20
|
if (command === 'init')
|
|
18
21
|
return commandInit(rest);
|
|
@@ -44,6 +47,13 @@ export async function main(argv = process.argv.slice(2)) {
|
|
|
44
47
|
try {
|
|
45
48
|
await run(argv);
|
|
46
49
|
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
if (error instanceof InterruptError) {
|
|
52
|
+
process.exitCode = error.exitCode;
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
throw error;
|
|
56
|
+
}
|
|
47
57
|
finally {
|
|
48
58
|
closePrompts();
|
|
49
59
|
}
|
package/dist/src/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EACb,WAAW,EACX,WAAW,EACX,aAAa,EACb,WAAW,EACX,aAAa,EACb,eAAe,EACf,SAAS,GACV,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { cp, rm } from 'node:fs/promises';
|
|
2
2
|
import { homedir } from 'node:os';
|
|
3
|
-
import { join } from 'node:path';
|
|
3
|
+
import { join, relative, sep } from 'node:path';
|
|
4
4
|
import { parseArgs } from 'node:util';
|
|
5
|
-
import { AGENTS, assertRelativePath, baselinePath, collectionPaths, commitCollection, errorMessage, exists, isGitSource, listCollection, listProject, matches, parseGitSource, readMetadata, readState, writeMetadata, } from '../core.js';
|
|
6
|
-
import { syncCollection } from '../git.js';
|
|
5
|
+
import { AGENTS, assertRelativePath, baselinePath, collectionPaths, commitCollection, discoverSkills, errorMessage, exists, isGitSource, listCollection, listProject, matches, parseGitSource, readMetadata, readState, writeMetadata, } from '../core.js';
|
|
6
|
+
import { cloneGitSource, syncCollection, updateGitSkill } from '../git.js';
|
|
7
7
|
import { chooseOne, chooseOptionsMany, editInput, editTags } from '../prompts.js';
|
|
8
8
|
import { browseSkillDetail, browseSkills, } from '../ui/browser.js';
|
|
9
9
|
import { InkSession } from '../ui/session.js';
|
|
@@ -11,7 +11,7 @@ import { addSkillsToProject, globalSkillGroups, importSkillsToCollection, } from
|
|
|
11
11
|
const CLEAR_SCREEN = '\u001B[2J\u001B[H';
|
|
12
12
|
const ENTER_ALTERNATE_SCREEN = '\u001B[?1049h';
|
|
13
13
|
const LEAVE_ALTERNATE_SCREEN = '\u001B[?1049l';
|
|
14
|
-
async function bindMetadataSource(skillName, metadata, input, ref, sourcePath) {
|
|
14
|
+
async function bindMetadataSource(skillName, metadata, input, ref, sourcePath, refType) {
|
|
15
15
|
if (!isGitSource(input))
|
|
16
16
|
throw new Error(`不是有效的 Git 来源:${input}`);
|
|
17
17
|
const parsed = parseGitSource(input);
|
|
@@ -19,7 +19,7 @@ async function bindMetadataSource(skillName, metadata, input, ref, sourcePath) {
|
|
|
19
19
|
const source = {
|
|
20
20
|
type: 'git',
|
|
21
21
|
url: parsed.url,
|
|
22
|
-
refType: /^[0-9a-f]{7,40}$/i.test(resolvedRef || '') ? 'commit' : 'branch',
|
|
22
|
+
refType: refType || (/^[0-9a-f]{7,40}$/i.test(resolvedRef || '') ? 'commit' : 'branch'),
|
|
23
23
|
path: assertRelativePath(sourcePath),
|
|
24
24
|
...(resolvedRef ? { ref: resolvedRef } : {}),
|
|
25
25
|
};
|
|
@@ -67,18 +67,38 @@ async function skillDetail(skill, collection, session) {
|
|
|
67
67
|
if (sourceValue === undefined)
|
|
68
68
|
continue;
|
|
69
69
|
const sourceInput = sourceValue.trim();
|
|
70
|
+
if (!isGitSource(sourceInput))
|
|
71
|
+
throw new Error(`不是有效的 Git 来源:${sourceInput}`);
|
|
70
72
|
const parsed = parseGitSource(sourceInput);
|
|
71
|
-
const refValue = await editInput('分支、Tag 或 Commit(Enter 继续,Esc 取消)',
|
|
73
|
+
const refValue = await editInput('分支、Tag 或 Commit(Enter 继续,Esc 取消)', parsed.ref || metadata.source.ref || '', session);
|
|
72
74
|
if (refValue === undefined)
|
|
73
75
|
continue;
|
|
74
|
-
const pathValue = await editInput('仓库内 Skill 路径(Enter 保存,Esc 取消)', metadata.source.path || '', session);
|
|
75
|
-
if (pathValue === undefined)
|
|
76
|
-
continue;
|
|
77
76
|
const ref = refValue.trim();
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
77
|
+
const gitContext = await cloneGitSource(ref ? `${parsed.url}#${ref}` : parsed.url);
|
|
78
|
+
try {
|
|
79
|
+
const options = (await discoverSkills(gitContext.repository))
|
|
80
|
+
.map((candidate) => {
|
|
81
|
+
const path = assertRelativePath(relative(gitContext.repository, candidate.path).split(sep).join('/'));
|
|
82
|
+
return {
|
|
83
|
+
label: `${candidate.name} — ${path}`,
|
|
84
|
+
value: path,
|
|
85
|
+
rank: candidate.name !== skill.name ? 2 : path === metadata.source.path ? 0 : 1,
|
|
86
|
+
};
|
|
87
|
+
})
|
|
88
|
+
.sort((left, right) => left.rank - right.rank || left.value.localeCompare(right.value))
|
|
89
|
+
.map(({ label, value }) => ({ label, value }));
|
|
90
|
+
if (!options.length)
|
|
91
|
+
throw new Error('目标仓库中没有找到 SKILL.md');
|
|
92
|
+
const sourcePath = await chooseOne(options, '选择仓库内 Skill:', false, session);
|
|
93
|
+
if (sourcePath === undefined)
|
|
94
|
+
continue;
|
|
95
|
+
await bindMetadataSource(skill.name, metadata, gitContext.source.url, gitContext.source.ref, sourcePath, gitContext.source.refType);
|
|
96
|
+
await writeMetadata(metadata);
|
|
97
|
+
await commitCollection(`source ${skill.name}`);
|
|
98
|
+
}
|
|
99
|
+
finally {
|
|
100
|
+
await rm(gitContext.temporary, { recursive: true, force: true });
|
|
101
|
+
}
|
|
82
102
|
}
|
|
83
103
|
}
|
|
84
104
|
}
|
|
@@ -90,7 +110,7 @@ export async function interactiveList(initialQuery = '', initialTab = 'project')
|
|
|
90
110
|
let agent = '';
|
|
91
111
|
let focus = 'tabs';
|
|
92
112
|
let status = '';
|
|
93
|
-
const session = new InkSession();
|
|
113
|
+
const session = new InkSession(true);
|
|
94
114
|
process.stdout.write(`${ENTER_ALTERNATE_SCREEN}${CLEAR_SCREEN}`);
|
|
95
115
|
try {
|
|
96
116
|
while (true) {
|
|
@@ -110,8 +130,24 @@ export async function interactiveList(initialQuery = '', initialTab = 'project')
|
|
|
110
130
|
agent = result.agent;
|
|
111
131
|
focus = result.focus;
|
|
112
132
|
if (result.type === 'sync') {
|
|
113
|
-
|
|
114
|
-
|
|
133
|
+
session.close();
|
|
134
|
+
process.stdout.write(LEAVE_ALTERNATE_SCREEN);
|
|
135
|
+
try {
|
|
136
|
+
await syncCollection(false);
|
|
137
|
+
status = 'Git 同步完成';
|
|
138
|
+
}
|
|
139
|
+
finally {
|
|
140
|
+
process.stdout.write(`${ENTER_ALTERNATE_SCREEN}${CLEAR_SCREEN}`);
|
|
141
|
+
}
|
|
142
|
+
continue;
|
|
143
|
+
}
|
|
144
|
+
if (result.type === 'update') {
|
|
145
|
+
try {
|
|
146
|
+
status = `${result.skill.name}: ${await updateGitSkill(result.skill, false)}`;
|
|
147
|
+
}
|
|
148
|
+
catch (error) {
|
|
149
|
+
status = `${result.skill.name}: 更新失败 — ${errorMessage(error)}`;
|
|
150
|
+
}
|
|
115
151
|
process.stdout.write(CLEAR_SCREEN);
|
|
116
152
|
continue;
|
|
117
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/commands/browser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/commands/browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { commandList, interactiveList } from './browser.js';
|
|
2
2
|
import { commandAdd, commandImport, commandRemove } from './library.js';
|
|
3
|
-
|
|
3
|
+
import { commandSearch } from './search.js';
|
|
4
|
+
export { commandAdd, commandImport, commandList, commandRemove, commandSearch, interactiveList };
|
|
4
5
|
export declare function commandUpdate(argv: string[]): Promise<void>;
|
|
5
6
|
export declare function commandSync(argv?: string[]): Promise<void>;
|
|
6
7
|
export declare function commandInit(argv?: string[]): Promise<void>;
|
|
@@ -4,7 +4,8 @@ import { configureCollectionRemote, initCollectionGit, syncCollection, updateGit
|
|
|
4
4
|
import { chooseMany, confirm, input } from '../prompts.js';
|
|
5
5
|
import { commandList, interactiveList } from './browser.js';
|
|
6
6
|
import { commandAdd, commandImport, commandRemove } from './library.js';
|
|
7
|
-
|
|
7
|
+
import { commandSearch } from './search.js';
|
|
8
|
+
export { commandAdd, commandImport, commandList, commandRemove, commandSearch, interactiveList };
|
|
8
9
|
export async function commandUpdate(argv) {
|
|
9
10
|
const { values, positionals } = parseArgs({
|
|
10
11
|
args: argv,
|
|
@@ -80,6 +81,19 @@ export async function commandInit(argv = []) {
|
|
|
80
81
|
}
|
|
81
82
|
}
|
|
82
83
|
const COMMAND_HELP = {
|
|
84
|
+
search: `用法:
|
|
85
|
+
iskills search [关键词]
|
|
86
|
+
iskills search <关键词> --json
|
|
87
|
+
iskills search --collect <resultId> [--replace]
|
|
88
|
+
|
|
89
|
+
实时搜索 skills.sh,选择后保存到收藏夹。
|
|
90
|
+
|
|
91
|
+
选项:
|
|
92
|
+
--json 以 JSON 输出搜索结果
|
|
93
|
+
--collect <ID> 按搜索结果 ID 收藏,不依赖交互排名
|
|
94
|
+
--replace 替换异源同名收藏
|
|
95
|
+
-h, --help 显示帮助
|
|
96
|
+
`,
|
|
83
97
|
add: `用法:
|
|
84
98
|
iskills add [技能...] [选项]
|
|
85
99
|
|
|
@@ -173,6 +187,7 @@ export function printHelp(command) {
|
|
|
173
187
|
iskills [命令] [选项]
|
|
174
188
|
|
|
175
189
|
命令:
|
|
190
|
+
search [关键词] 搜索技能并保存到收藏夹
|
|
176
191
|
add [技能...] 从收藏夹添加到当前项目
|
|
177
192
|
import [来源] 导入本地路径或 Git 来源
|
|
178
193
|
list [关键词] 浏览当前项目、收藏夹和全局技能
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EACjB,cAAc,EACd,cAAc,GACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
|
-
import type { CollectedSkill, Skill } from '../types.js';
|
|
1
|
+
import type { CollectedSkill, Skill, SkillMetadata } from '../types.js';
|
|
2
|
+
export interface RemoteImportOptions {
|
|
3
|
+
replace?: boolean;
|
|
4
|
+
confirmReplace?: (current: SkillMetadata, incoming: SkillMetadata) => Promise<boolean>;
|
|
5
|
+
}
|
|
6
|
+
export interface RemoteImportResult {
|
|
7
|
+
name: string;
|
|
8
|
+
status: 'imported' | 'unchanged' | 'cancelled';
|
|
9
|
+
}
|
|
10
|
+
export declare function importRemoteSkillToCollection(source: string, skillName: string, options?: RemoteImportOptions): Promise<RemoteImportResult>;
|
|
2
11
|
interface ImportToCollectionOptions {
|
|
3
12
|
replace?: boolean;
|
|
4
13
|
yes?: boolean;
|
|
@@ -1,17 +1,140 @@
|
|
|
1
|
-
import { cp, lstat, mkdir, realpath, rm, symlink } from 'node:fs/promises';
|
|
1
|
+
import { cp, lstat, mkdir, mkdtemp, realpath, rm, symlink } from 'node:fs/promises';
|
|
2
2
|
import { homedir } from 'node:os';
|
|
3
3
|
import { join, relative, resolve, sep } from 'node:path';
|
|
4
4
|
import { parseArgs } from 'node:util';
|
|
5
|
-
import { AGENTS, PROJECT_SKILL_DIRS, assertRelativePath, assertSkillName, baselinePath, collectionPaths, commitCollection, discoverSkills, exists, isExactSymlink, isGitSource, listCollection, matches, moveDirectory, pathPresent, provenanceFromKnownLocks, readState, removeFromCollection, validateSkillTree, writeMetadata, writeState, } from '../core.js';
|
|
5
|
+
import { AGENTS, PROJECT_SKILL_DIRS, assertRelativePath, assertSkillName, baselinePath, collectionPaths, commitCollection, discoverSkills, ensureCollection, errorMessage, exists, isExactSymlink, isGitSource, listCollection, matches, metadataPath, moveDirectory, pathPresent, provenanceFromKnownLocks, readMetadata, readState, removeFromCollection, validateSkillTree, writeMetadata, writeState, } from '../core.js';
|
|
6
6
|
import { cloneGitSource } from '../git.js';
|
|
7
7
|
import { chooseMany, chooseOne, chooseOptionsMany, chooseSkillMany, confirm, input, } from '../prompts.js';
|
|
8
|
-
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
8
|
+
function sameGitIdentity(current, incoming) {
|
|
9
|
+
const normalize = (value) => {
|
|
10
|
+
const scp = value.includes('://') ? null : value.match(/^(?:[^@]+@)?([^:]+):(.+)$/);
|
|
11
|
+
const candidate = scp ? `ssh://${scp[1]}/${scp[2]}` : value;
|
|
12
|
+
try {
|
|
13
|
+
const url = new URL(candidate);
|
|
14
|
+
const host = url.hostname.toLowerCase();
|
|
15
|
+
const defaultPort = url.protocol === 'ssh:' ? '22' : url.protocol === 'git:' ? '9418' : '';
|
|
16
|
+
const port = url.port && url.port !== defaultPort ? `:${url.port}` : '';
|
|
17
|
+
let path = url.pathname.replace(/^\/+|\/+$/g, '').replace(/\.git$/i, '');
|
|
18
|
+
if (host === 'github.com')
|
|
19
|
+
path = path.toLowerCase();
|
|
20
|
+
return `${host}${port}/${path}`;
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
return value.replace(/\.git\/?$/i, '').replace(/\/$/, '').toLowerCase();
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
return current.source.type === 'git' &&
|
|
27
|
+
incoming.source.type === 'git' &&
|
|
28
|
+
!!current.source.url &&
|
|
29
|
+
!!incoming.source.url &&
|
|
30
|
+
normalize(current.source.url) === normalize(incoming.source.url) &&
|
|
31
|
+
(current.source.path || '.') === (incoming.source.path || '.');
|
|
32
|
+
}
|
|
33
|
+
async function replaceCollectionSkill(input) {
|
|
34
|
+
const paths = collectionPaths();
|
|
35
|
+
const target = join(paths.skills, input.name);
|
|
36
|
+
const metadata = metadataPath(input.name);
|
|
37
|
+
const baseline = baselinePath(input.name);
|
|
38
|
+
const transaction = await mkdtemp(join(paths.local, `.replace-${input.name}-`));
|
|
39
|
+
const oldTree = join(transaction, 'old-tree');
|
|
40
|
+
const oldMetadata = join(transaction, 'old-metadata.json');
|
|
41
|
+
const oldBaseline = join(transaction, 'old-baseline');
|
|
42
|
+
const newSource = join(transaction, 'new-source');
|
|
43
|
+
const state = await readState();
|
|
44
|
+
const links = state.links.filter((link) => link.skill === input.name);
|
|
45
|
+
const origin = links.find((link) => link.kind === 'origin');
|
|
46
|
+
const hadMetadata = await pathPresent(metadata);
|
|
47
|
+
const hadBaseline = await pathPresent(baseline);
|
|
48
|
+
let sourceMoved = false;
|
|
49
|
+
if (origin && !(await isExactSymlink(origin.path, target))) {
|
|
50
|
+
await rm(transaction, { recursive: true, force: true });
|
|
51
|
+
throw new Error(`原始位置已不是指向收藏夹的软链,已中止:${origin.path}`);
|
|
52
|
+
}
|
|
53
|
+
try {
|
|
54
|
+
await cp(target, oldTree, { recursive: true, errorOnExist: true });
|
|
55
|
+
if (hadMetadata)
|
|
56
|
+
await cp(metadata, oldMetadata, { errorOnExist: true });
|
|
57
|
+
if (hadBaseline)
|
|
58
|
+
await cp(baseline, oldBaseline, { recursive: true, errorOnExist: true });
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
await rm(transaction, { recursive: true, force: true });
|
|
62
|
+
throw error;
|
|
63
|
+
}
|
|
64
|
+
try {
|
|
65
|
+
if (input.local) {
|
|
66
|
+
await moveDirectory(input.local.source, newSource);
|
|
67
|
+
sourceMoved = true;
|
|
68
|
+
}
|
|
69
|
+
if (origin) {
|
|
70
|
+
await rm(origin.path);
|
|
71
|
+
await cp(oldTree, origin.path, { recursive: true, errorOnExist: true });
|
|
72
|
+
}
|
|
73
|
+
await rm(target, { recursive: true, force: true });
|
|
74
|
+
await moveDirectory(input.staged, target);
|
|
75
|
+
if (input.local)
|
|
76
|
+
await symlink(target, input.local.source, 'dir');
|
|
77
|
+
await writeMetadata(input.metadata);
|
|
78
|
+
await rm(baseline, { recursive: true, force: true });
|
|
79
|
+
if (input.metadata.source.type === 'git' && !input.metadata.source.commit) {
|
|
80
|
+
await cp(target, baseline, { recursive: true });
|
|
81
|
+
}
|
|
82
|
+
const nextState = {
|
|
83
|
+
links: state.links.filter((link) => link.skill !== input.name || link.kind === 'usage'),
|
|
84
|
+
conflicts: state.conflicts.filter((conflict) => conflict.type !== 'source' || conflict.skill !== input.name),
|
|
85
|
+
};
|
|
86
|
+
if (input.local) {
|
|
87
|
+
nextState.links.push({ skill: input.name, path: input.local.source, kind: 'origin' });
|
|
88
|
+
if (input.local.selectedWasSymlink) {
|
|
89
|
+
nextState.links.push({
|
|
90
|
+
skill: input.name,
|
|
91
|
+
path: input.local.selectedPath,
|
|
92
|
+
kind: 'dependent',
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
await writeState(nextState);
|
|
97
|
+
await commitCollection(`import ${input.name}`, true);
|
|
98
|
+
}
|
|
99
|
+
catch (error) {
|
|
100
|
+
try {
|
|
101
|
+
if (input.local && sourceMoved) {
|
|
102
|
+
await rm(input.local.source, { recursive: true, force: true });
|
|
103
|
+
await moveDirectory(newSource, input.local.source);
|
|
104
|
+
}
|
|
105
|
+
await rm(target, { recursive: true, force: true });
|
|
106
|
+
await cp(oldTree, target, { recursive: true, errorOnExist: true });
|
|
107
|
+
if (hadMetadata)
|
|
108
|
+
await cp(oldMetadata, metadata, { force: true });
|
|
109
|
+
else
|
|
110
|
+
await rm(metadata, { force: true });
|
|
111
|
+
await rm(baseline, { recursive: true, force: true });
|
|
112
|
+
if (hadBaseline)
|
|
113
|
+
await cp(oldBaseline, baseline, { recursive: true });
|
|
114
|
+
await writeState(state);
|
|
115
|
+
if (origin) {
|
|
116
|
+
await rm(origin.path, { recursive: true, force: true });
|
|
117
|
+
await mkdir(resolve(origin.path, '..'), { recursive: true });
|
|
118
|
+
await symlink(target, origin.path, 'dir');
|
|
119
|
+
}
|
|
120
|
+
await commitCollection(`rollback import ${input.name}`);
|
|
121
|
+
}
|
|
122
|
+
catch (rollbackError) {
|
|
123
|
+
throw new Error(`导入失败:${errorMessage(error)};回滚失败:${errorMessage(rollbackError)}`);
|
|
124
|
+
}
|
|
125
|
+
await rm(transaction, { recursive: true, force: true }).catch(() => { });
|
|
126
|
+
throw error;
|
|
127
|
+
}
|
|
128
|
+
for (const conflict of state.conflicts) {
|
|
129
|
+
if (conflict.type === 'source' && conflict.skill === input.name) {
|
|
130
|
+
await rm(conflict.path, { recursive: true, force: true }).catch((error) => {
|
|
131
|
+
console.error(`警告:旧冲突目录清理失败:${errorMessage(error)}`);
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
await rm(transaction, { recursive: true, force: true }).catch((error) => {
|
|
136
|
+
console.error(`警告:替换备份清理失败:${errorMessage(error)}`);
|
|
137
|
+
});
|
|
15
138
|
}
|
|
16
139
|
async function importLocalSkill(skill, allowReplace) {
|
|
17
140
|
const paths = collectionPaths();
|
|
@@ -23,7 +146,38 @@ async function importLocalSkill(skill, allowReplace) {
|
|
|
23
146
|
return false;
|
|
24
147
|
const provenance = await provenanceFromKnownLocks(skill);
|
|
25
148
|
await validateSkillTree(source);
|
|
26
|
-
await
|
|
149
|
+
if (await pathPresent(target)) {
|
|
150
|
+
if (!allowReplace) {
|
|
151
|
+
throw new Error(`收藏夹已存在同名技能:${skill.name},请确认后使用 --replace`);
|
|
152
|
+
}
|
|
153
|
+
await ensureCollection();
|
|
154
|
+
const transaction = await mkdtemp(join(paths.local, `.prepare-${skill.name}-`));
|
|
155
|
+
const staged = join(transaction, 'tree');
|
|
156
|
+
try {
|
|
157
|
+
await cp(source, staged, { recursive: true, errorOnExist: true });
|
|
158
|
+
await replaceCollectionSkill({
|
|
159
|
+
name: skill.name,
|
|
160
|
+
staged,
|
|
161
|
+
metadata: {
|
|
162
|
+
name: skill.name,
|
|
163
|
+
description: skill.description,
|
|
164
|
+
tags: [],
|
|
165
|
+
note: '',
|
|
166
|
+
source: provenance,
|
|
167
|
+
},
|
|
168
|
+
local: {
|
|
169
|
+
source,
|
|
170
|
+
selectedPath,
|
|
171
|
+
selectedWasSymlink: selectedStats.isSymbolicLink(),
|
|
172
|
+
},
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
finally {
|
|
176
|
+
await rm(transaction, { recursive: true, force: true });
|
|
177
|
+
}
|
|
178
|
+
return true;
|
|
179
|
+
}
|
|
180
|
+
await ensureCollection();
|
|
27
181
|
await moveDirectory(source, target);
|
|
28
182
|
try {
|
|
29
183
|
await symlink(target, source, 'dir');
|
|
@@ -56,7 +210,36 @@ async function importRemoteSkill(skill, gitContext, allowReplace) {
|
|
|
56
210
|
const paths = collectionPaths();
|
|
57
211
|
const target = join(paths.skills, assertSkillName(skill.name));
|
|
58
212
|
await validateSkillTree(skill.path);
|
|
59
|
-
await
|
|
213
|
+
if (await pathPresent(target)) {
|
|
214
|
+
if (!allowReplace) {
|
|
215
|
+
throw new Error(`收藏夹已存在同名技能:${skill.name},请确认后使用 --replace`);
|
|
216
|
+
}
|
|
217
|
+
await ensureCollection();
|
|
218
|
+
const transaction = await mkdtemp(join(paths.local, `.prepare-${skill.name}-`));
|
|
219
|
+
const staged = join(transaction, 'tree');
|
|
220
|
+
try {
|
|
221
|
+
await cp(skill.path, staged, { recursive: true, errorOnExist: true });
|
|
222
|
+
await replaceCollectionSkill({
|
|
223
|
+
name: skill.name,
|
|
224
|
+
staged,
|
|
225
|
+
metadata: {
|
|
226
|
+
name: skill.name,
|
|
227
|
+
description: skill.description,
|
|
228
|
+
tags: [],
|
|
229
|
+
note: '',
|
|
230
|
+
source: {
|
|
231
|
+
...gitContext.source,
|
|
232
|
+
path: assertRelativePath(relative(gitContext.repository, skill.path).split(sep).join('/')),
|
|
233
|
+
},
|
|
234
|
+
},
|
|
235
|
+
});
|
|
236
|
+
}
|
|
237
|
+
finally {
|
|
238
|
+
await rm(transaction, { recursive: true, force: true });
|
|
239
|
+
}
|
|
240
|
+
return true;
|
|
241
|
+
}
|
|
242
|
+
await ensureCollection();
|
|
60
243
|
await cp(skill.path, target, { recursive: true, errorOnExist: true });
|
|
61
244
|
await writeMetadata({
|
|
62
245
|
name: skill.name,
|
|
@@ -70,6 +253,50 @@ async function importRemoteSkill(skill, gitContext, allowReplace) {
|
|
|
70
253
|
});
|
|
71
254
|
return true;
|
|
72
255
|
}
|
|
256
|
+
export async function importRemoteSkillToCollection(source, skillName, options = {}) {
|
|
257
|
+
const gitContext = await cloneGitSource(source);
|
|
258
|
+
try {
|
|
259
|
+
const found = (await discoverSkills(gitContext.repository)).filter((skill) => skill.name.toLowerCase() === skillName.toLowerCase());
|
|
260
|
+
if (!found.length)
|
|
261
|
+
throw new Error(`来源仓库中不存在技能:${skillName}`);
|
|
262
|
+
if (found.length > 1)
|
|
263
|
+
throw new Error(`来源仓库中存在多个同名技能:${skillName}`);
|
|
264
|
+
const skill = found[0];
|
|
265
|
+
const incoming = {
|
|
266
|
+
name: skill.name,
|
|
267
|
+
description: skill.description,
|
|
268
|
+
tags: [],
|
|
269
|
+
note: '',
|
|
270
|
+
source: {
|
|
271
|
+
...gitContext.source,
|
|
272
|
+
path: assertRelativePath(relative(gitContext.repository, skill.path).split(sep).join('/')),
|
|
273
|
+
},
|
|
274
|
+
};
|
|
275
|
+
const target = join(collectionPaths().skills, skill.name);
|
|
276
|
+
const replacing = await pathPresent(target);
|
|
277
|
+
if (replacing) {
|
|
278
|
+
const current = await readMetadata(skill.name);
|
|
279
|
+
if (sameGitIdentity(current, incoming)) {
|
|
280
|
+
return { name: skill.name, status: 'unchanged' };
|
|
281
|
+
}
|
|
282
|
+
if (!options.replace) {
|
|
283
|
+
if (!options.confirmReplace) {
|
|
284
|
+
throw new Error(`收藏夹已存在异源同名技能:${skill.name};请使用 --replace`);
|
|
285
|
+
}
|
|
286
|
+
if (!(await options.confirmReplace(current, incoming))) {
|
|
287
|
+
return { name: skill.name, status: 'cancelled' };
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
await importRemoteSkill(skill, gitContext, replacing);
|
|
292
|
+
if (!replacing)
|
|
293
|
+
await commitCollection(`import ${skill.name}`);
|
|
294
|
+
return { name: skill.name, status: 'imported' };
|
|
295
|
+
}
|
|
296
|
+
finally {
|
|
297
|
+
await rm(gitContext.temporary, { recursive: true, force: true });
|
|
298
|
+
}
|
|
299
|
+
}
|
|
73
300
|
export async function importSkillsToCollection(skills, options = {}) {
|
|
74
301
|
if (!skills.length)
|
|
75
302
|
return { count: 0 };
|