diff --git a/lib/skill-admin.js b/lib/skill-admin.js index c4f707c..8222432 100644 --- a/lib/skill-admin.js +++ b/lib/skill-admin.js @@ -1,9 +1,9 @@ /** - * Local skill management, built into the plugin: list, enable/disable, - * real delete, and install from a git repository. + * Local skill management, built into the plugin: list, inspect, enable/disable, + * previewed install, previewed uninstall. * * This covers the everyday subset of a full skills manager. It manages - * only the DSH skills root (plus its own parking and trash areas) — the + * only the DSH skills root (plus its own parking and staging areas) — the * cloud sync engine keeps owning everything beyond the local disk. * * Enable/disable is deliberately mechanical: a disabled skill's folder @@ -14,20 +14,42 @@ * mistaken for deletions, and a parked cloud skill still receives its * cloud updates in place. * - * Delete is a real delete: the folder is removed recursively. The - * cloud copy is unaffected — local deletion never propagates to the - * center (the sync engine remembers the removal, so the same cloud - * version is not pulled back down either). + * Delete is a real delete: the folder is removed recursively. It is only + * reachable through a two-step contract (plan → confirm) because there is no + * trash area and nothing can be restored. The cloud copy is unaffected — + * local deletion never propagates to the center. + * + * Installation is staged: the repository is cloned into an isolated scratch + * directory, candidates are enumerated and described, and nothing enters the + * skills root until the caller commits an explicit selection. Repository code + * is never executed (no hooks, no install scripts), symlinks are never + * followed, and a colliding folder is always skipped instead of overwritten. */ +import { lstatSync } from 'node:fs'; import { execFile } from 'node:child_process'; -import { cp, mkdir, readFile, readdir, rename, rm, stat } from 'node:fs/promises'; -import { basename, join } from 'node:path'; +import { createHash, randomUUID } from 'node:crypto'; +import { cp, lstat, mkdir, readFile, readdir, rename, rm, stat, writeFile } from 'node:fs/promises'; +import { basename, dirname, join, relative, resolve, sep } from 'node:path'; import { parseSkillFrontmatter } from "./skill-sync.js"; -import { dshHome } from "./store.js"; +import { dshHome, migrateLegacyFile } from "./store.js"; /** The parking area for disabled skills. */ export function skillsHoldingDir() { return join(dshHome(), 'skills-disabled'); } +/** Isolated scratch space for staged installs; never inside the skills root. */ +export function skillsStagingDir() { + return join(dshHome(), '.dsh-brain-staging'); +} +/** Persisted plan records (metadata only: ids, counts, timestamps). */ +/** Plans sidecar path, carrying the pre-rename file over on first use. */ +export function plansPath() { + const target = join(dshHome(), '.dsh-brain-plans.json'); + migrateLegacyFile(target, join(dshHome(), '.cloud-memory-plans.json')); + return target; +} +function skillPlansPath() { + return plansPath(); +} /** A management failure with a stable machine-readable code. */ export class SkillAdminError extends Error { code; @@ -37,30 +59,92 @@ export class SkillAdminError extends Error { this.name = 'SkillAdminError'; } } +/** Run git and return stdout (used for resolving the checked-out commit). */ +function execFileText(file, args, timeoutMs = 120_000) { + return new Promise((resolvePromise, rejectPromise) => { + execFile(file, args, { timeout: timeoutMs, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' }, maxBuffer: 4 * 1024 * 1024 }, (error, stdout) => (error ? rejectPromise(error) : resolvePromise(String(stdout)))); + }); +} function fail(code, message) { throw new SkillAdminError(code, message); } +/** Hard caps so one hostile repository cannot exhaust the disk. */ +const MAX_SKILL_FILES = 1500; +const MAX_SKILL_BYTES = 4 * 1024 * 1024; +const MAX_CANDIDATES = 60; +const MAX_SKILL_MD_BYTES = 256 * 1024; +const PLAN_TTL_MS = 30 * 60_000; async function isDirectory(path) { return stat(path).then((s) => s.isDirectory()).catch(() => false); } -/** Count files below a directory, capped so a stray tree cannot hang us. */ -async function countFiles(dir, cap = 2000) { - let count = 0; +async function isSymlink(path) { + return lstat(path).then((s) => s.isSymbolicLink()).catch(() => false); +} +/** Synchronous variant, used inside `cp` filters where no await is possible. */ +function isSymlinkSync(path) { + try { + return lstatSync(path).isSymbolicLink(); + } + catch { + return true; + } +} +/** Read a skill's `.skill-source.json`, or undefined when absent/corrupt. */ +export async function readSkillSourceRecord(dir) { + const raw = await readFile(join(dir, '.skill-source.json'), 'utf8').catch(() => undefined); + if (raw === undefined) + return undefined; + try { + const parsed = JSON.parse(raw); + if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) + return undefined; + const record = parsed; + if (typeof record.repoUrl !== 'string' || typeof record.commit !== 'string') + return undefined; + return { + version: 1, + provider: typeof record.provider === 'string' ? record.provider : 'git', + repoUrl: record.repoUrl, + ref: typeof record.ref === 'string' ? record.ref : record.commit, + commit: record.commit, + sourcePath: typeof record.sourcePath === 'string' ? record.sourcePath : '', + installedAt: typeof record.installedAt === 'string' ? record.installedAt : new Date(0).toISOString(), + ...(typeof record.entryId === 'string' ? { entryId: record.entryId } : {}), + ...(typeof record.marketVersion === 'string' ? { marketVersion: record.marketVersion } : {}), + }; + } + catch { + return undefined; + } +} +/** Files under one skill folder, skipping `.git` and never following links. */ +async function walkFiles(dir, cap = MAX_SKILL_FILES + 1) { + const out = []; const walk = async (sub) => { - if (count > cap) + if (out.length > cap) return; for (const entry of await readdir(join(dir, sub), { withFileTypes: true }).catch(() => [])) { if (entry.name === '.git') continue; const rel = sub === '' ? entry.name : `${sub}/${entry.name}`; - if (entry.isDirectory()) + const abs = join(dir, rel); + if (entry.isSymbolicLink()) { + out.push({ path: rel, bytes: 0, script: false }); + continue; + } + if (entry.isDirectory()) { await walk(rel); - else if (entry.isFile()) - count += 1; + continue; + } + if (!entry.isFile()) + continue; + const size = await stat(abs).then((s) => s.size).catch(() => 0); + out.push({ path: rel, bytes: size, script: /\.(mjs|cjs|js|ts|ps1|sh|bat|cmd|py|rb|exe|dll)$/i.test(entry.name) }); } }; await walk(''); - return count; + out.sort((a, b) => (a.path < b.path ? -1 : 1)); + return out; } /** A folder name we are willing to move around: one path segment, no tricks. */ function checkFolder(folder) { @@ -75,11 +159,17 @@ export class SkillAdmin { constructor(deps) { this.deps = deps; } + plansFile() { + return this.deps.plansPath?.() ?? skillPlansPath(); + } + stagingRoot() { + return this.deps.stagingRoot?.() ?? skillsStagingDir(); + } guardSync() { if (this.deps.syncRunning()) fail('sync_running', '技能同步正在进行,请稍候再试。'); } - async syncUploaded() { + async uploaded() { try { const parsed = JSON.parse(await readFile(this.deps.syncStatePath(), 'utf8')); if (parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)) { @@ -106,34 +196,60 @@ export class SkillAdmin { origin = 'cloud'; try { const parsed = JSON.parse(delivery); - const value = parsed.revision; + const value = parsed?.revision; if (typeof value === 'number') revision = value; } - catch { /* a corrupt manifest still marks cloud origin */ } + catch { + // A corrupt manifest still marks cloud origin. + } } else { for (const record of Object.values(uploaded)) { if (record.folder === folder) { origin = 'uploaded'; - revision = record.revision; + if (typeof record.revision === 'number') + revision = record.revision; break; } } } + const files = await walkFiles(dir); + const bytes = files.reduce((sum, file) => sum + file.bytes, 0); + const installedAt = await stat(join(dir, 'SKILL.md')).then((s) => new Date(s.mtimeMs).toISOString()).catch(() => undefined); + const name = frontmatter.name; + const source = await readSkillSourceRecord(dir); return { folder, - name: frontmatter.name ?? folder, - description: (frontmatter.description ?? '').slice(0, 300), + name: typeof name === 'string' && name !== '' ? name : folder, + description: String(frontmatter.description ?? '').slice(0, 300), enabled, origin, ...(revision === undefined ? {} : { revision }), - files: await countFiles(dir), + files: files.length, + bytes, + ...(installedAt === undefined ? {} : { installedAt }), + skillSha256: createHash('sha256').update(markdown).digest('hex'), + location: enabled ? 'root' : 'holding', + ownerManager: 'dsh-brain', + writable: true, + ...(source === undefined + ? {} + : { + source: { + provider: source.provider, + repoUrl: source.repoUrl, + ref: source.ref, + commit: source.commit, + ...(source.entryId === undefined ? {} : { entryId: source.entryId }), + }, + }), + updatable: source !== undefined, }; } /** Inventory of the skills root and the parking area. */ async list() { - const uploaded = await this.syncUploaded(); + const uploaded = await this.uploaded(); const skills = []; const scan = async (area, enabled) => { for (const entry of await readdir(area, { withFileTypes: true }).catch(() => [])) { @@ -147,7 +263,7 @@ export class SkillAdmin { await scan(this.deps.skillsRoot(), true); await scan(this.deps.holdingDir(), false); skills.sort((a, b) => (a.folder < b.folder ? -1 : 1)); - return { skills }; + return { skills, root: this.deps.skillsRoot(), holding: this.deps.holdingDir(), staging: this.stagingRoot() }; } /** Locate a skill folder across the root and the parking area. */ async locate(folder) { @@ -159,6 +275,29 @@ export class SkillAdmin { return { area: 'holding', dir: parkedDir }; return undefined; } + /** Everything one skill panel needs, including its SKILL.md text. */ + async detail(folderInput) { + const folder = checkFolder(folderInput); + const found = await this.locate(folder); + if (found === undefined) + fail('not_found', `没有找到技能:${folder}`); + if (await isSymlink(found.dir)) + fail('unsupported', `技能目录是链接,不在这里管理:${folder}`); + const entry = await this.describe(folder, found.dir, found.area === 'root', await this.uploaded()); + if (entry === undefined) + fail('not_found', `技能缺少 SKILL.md:${folder}`); + const files = await walkFiles(found.dir); + const raw = await readFile(join(found.dir, 'SKILL.md'), 'utf8').catch(() => ''); + const truncated = Buffer.byteLength(raw) > MAX_SKILL_MD_BYTES; + return { + skill: entry, + dir: found.dir, + files, + totalBytes: files.reduce((sum, file) => sum + file.bytes, 0), + truncated, + skillMd: truncated ? Buffer.from(raw).subarray(0, MAX_SKILL_MD_BYTES).toString('utf8') : raw, + }; + } /** Enable (move back into the root) or disable (park) one skill. */ async setEnabled(folderInput, enabled) { this.guardSync(); @@ -168,33 +307,112 @@ export class SkillAdmin { fail('not_found', `没有找到技能:${folder}`); const targetArea = enabled ? 'root' : 'holding'; if (found.area === targetArea) - return { folder, enabled }; + return { folder, enabled, note: this.effectNote(enabled) }; const targetRoot = enabled ? this.deps.skillsRoot() : this.deps.holdingDir(); await mkdir(targetRoot, { recursive: true }); const target = join(targetRoot, folder); if (await isDirectory(target)) fail('collision', `目标位置已存在同名技能:${folder}`); - await rename(found.dir, target); + try { + await rename(found.dir, target); + } + catch (error) { + // A cross-device move must not leave the skill half-copied: fall back to a + // plain copy only for EXDEV, and only then remove the source. + if (error.code !== 'EXDEV') + throw error; + await cp(found.dir, target, { recursive: true, filter: (source) => !source.split(/[\\/]/).includes('.git') }); + await rm(found.dir, { recursive: true, force: true }); + } this.deps.log(`skill ${enabled ? 'enabled' : 'disabled'}: ${folder}`); - return { folder, enabled }; + return { folder, enabled, note: this.effectNote(enabled) }; } - /** Delete one skill for real: its folder is removed recursively. */ + /** The enable/disable mechanism is a directory move, not a live switch. */ + effectNote(enabled) { + return enabled + ? '已放回技能目录:新会话可见;已在运行的会话可能仍保留旧状态。' + : '已移出技能目录:新会话不再加载;已经加载的会话不受影响。'; + } + /** Preview of what an uninstall would remove. Nothing is deleted yet. */ + async uninstallPlan(folderInput) { + const folder = checkFolder(folderInput); + const found = await this.locate(folder); + if (found === undefined) + fail('not_found', `没有找到技能:${folder}`); + if (await isSymlink(found.dir)) + fail('unsupported', `技能目录是链接,不在这里删除:${folder}`); + const entry = await this.describe(folder, found.dir, found.area === 'root', await this.uploaded()); + const files = await walkFiles(found.dir); + return { + folder, + dir: found.dir, + area: found.area, + files: files.length, + bytes: files.reduce((sum, file) => sum + file.bytes, 0), + scripts: files.filter((file) => file.script).map((file) => file.path).slice(0, 20), + origin: entry?.origin ?? 'unknown', + ...(entry?.revision === undefined ? {} : { cloudRevision: entry.revision }), + recoverable: false, + note: '本机删除不可恢复(没有回收站)。云端副本不受影响,同步引擎也不会把同一版本再次拉回。', + }; + } + /** + * Delete one skill for real: its folder is removed recursively. + * + * The route layer requires a plan token plus `confirmed: true`; this method + * itself stays usable by the verification harness and by trusted callers. + */ async remove(folderInput) { this.guardSync(); const folder = checkFolder(folderInput); const found = await this.locate(folder); if (found === undefined) fail('not_found', `没有找到技能:${folder}`); + const files = await walkFiles(found.dir); + const bytes = files.reduce((sum, file) => sum + file.bytes, 0); await rm(found.dir, { recursive: true, force: true }); this.deps.log(`skill deleted: ${folder}`); - return { folder }; + return { folder, dir: found.dir, files: files.length, bytes }; + } + async readPlans() { + try { + const parsed = JSON.parse(await readFile(this.plansFile(), 'utf8')); + if (parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)) { + const plans = parsed.plans; + if (Array.isArray(plans)) + return { version: 1, plans: plans }; + } + } + catch { + // Missing or torn file: no plans. + } + return { version: 1, plans: [] }; + } + async writePlans(file) { + const path = this.plansFile(); + await mkdir(dirname(path), { recursive: true }); + const temporary = `${path}.tmp`; + await writeFile(temporary, `${JSON.stringify(file, null, 2)}\n`, { encoding: 'utf8', mode: 0o600 }); + await rename(temporary, path); + } + /** Drop expired plans and their staging trees. */ + async sweepPlans(file) { + const now = Date.now(); + const live = []; + for (const plan of file.plans) { + if (plan.expiresAt > now) { + live.push(plan); + continue; + } + await rm(plan.stagingDir, { recursive: true, force: true }).catch(() => { }); + } + return { version: 1, plans: live }; } /** - * Install every skill found in a git repository (https:// or file://). - * The clone is shallow and never executes repository code; folders - * that collide with existing skills are skipped, never overwritten. + * Stage a git repository and describe its skills. Nothing enters the skills + * root here; the caller picks folders and commits. */ - async installFromGit(urlInput) { + async prepareInstall(urlInput, options = {}) { this.guardSync(); if (typeof urlInput !== 'string') fail('invalid_url', '请提供仓库地址。'); @@ -202,61 +420,236 @@ export class SkillAdmin { if (!/^(https:\/\/|file:\/\/)/.test(url) || /[\s"'`]/.test(url) || url.length > 512) { fail('invalid_url', '只接受 https:// 或 file:// 的 git 仓库地址。'); } - const scratch = join(dshHome(), `.dsh-brain-clone-${process.pid}-${Date.now().toString(36)}`); + const stagingRoot = this.stagingRoot(); + await mkdir(stagingRoot, { recursive: true }); + const planId = `plan_${Date.now().toString(36)}_${randomUUID().slice(0, 8)}`; + const stagingDir = join(stagingRoot, planId); try { - await new Promise((resolvePromise, rejectPromise) => { - execFile('git', ['clone', '--depth', '1', '--no-tags', '--', url, scratch], { timeout: 120_000, env: { ...process.env, GIT_TERMINAL_PROMPT: '0' }, maxBuffer: 4 * 1024 * 1024 }, (error) => (error ? rejectPromise(error) : resolvePromise())); - }); - } - catch { - await rm(scratch, { recursive: true, force: true }).catch(() => { }); - fail('git_failed', '仓库克隆失败(地址不可达、需要登录,或本机没有 git)。'); - } - try { - const repoName = basename(url.replace(/\/$/, '').replace(/\.git$/, '')) || 'skill'; - const candidates = []; - const collect = async (dir, depth) => { - if (await readFile(join(dir, 'SKILL.md'), 'utf8').catch(() => undefined) !== undefined) { - candidates.push({ folder: dir === scratch ? repoName : basename(dir), dir }); - return; - } - if (depth >= 3) - return; - for (const entry of await readdir(dir, { withFileTypes: true }).catch(() => [])) { - if (entry.isDirectory() && entry.name !== '.git') - await collect(join(dir, entry.name), depth + 1); - } - }; - await collect(scratch, 0); - if (candidates.length === 0) - fail('no_skills_found', '仓库里没有找到技能(包含 SKILL.md 的文件夹)。'); - const installed = []; - const skipped = []; - await mkdir(this.deps.skillsRoot(), { recursive: true }); - for (const candidate of candidates) { - let folder = candidate.folder; + await execFileText('git', ['clone', '--depth', '1', '--no-tags', '--', url, stagingDir]); + if (typeof options.ref === 'string' && options.ref !== '') { try { - folder = checkFolder(folder); + await execFileText('git', ['-C', stagingDir, 'fetch', '--depth', '1', 'origin', options.ref]); + await execFileText('git', ['-C', stagingDir, 'checkout', '--detach', 'FETCH_HEAD']); } catch { - skipped.push({ name: candidate.folder, reason: 'invalid_name' }); - continue; + // The default-branch clone is still usable; the recorded commit below + // is whatever was actually checked out, so an install stays auditable. } - if ((await this.locate(folder)) !== undefined) { - skipped.push({ name: folder, reason: 'already_exists' }); - continue; - } - await cp(candidate.dir, join(this.deps.skillsRoot(), folder), { - recursive: true, - filter: (source) => !source.split(/[\\/]/).includes('.git'), - }); - installed.push(folder); - this.deps.log(`skill installed from git: ${folder}`); } - return { installed, skipped }; } - finally { - await rm(scratch, { recursive: true, force: true }).catch(() => { }); + catch (error) { + await rm(stagingDir, { recursive: true, force: true }).catch(() => { }); + const code = error.code; + fail('git_failed', code === 'ENOENT' + ? '本机没有 git 命令,无法从仓库安装技能。' + : '仓库克隆失败(地址不可达、需要登录,或不是 git 仓库)。'); } + let commit = ''; + try { + commit = (await execFileText('git', ['-C', stagingDir, 'rev-parse', 'HEAD'], 20_000)).trim(); + } + catch { + commit = ''; + } + const repoName = basename(url.replace(/\/$/, '').replace(/\.git$/, '')) || 'skill'; + const found = []; + const collect = async (dir, depth) => { + if (found.length >= MAX_CANDIDATES) + return; + const markdown = await readFile(join(dir, 'SKILL.md'), 'utf8').catch(() => undefined); + if (markdown !== undefined) { + found.push({ folder: dir === stagingDir ? repoName : basename(dir), dir }); + return; + } + if (depth >= 3) + return; + for (const entry of await readdir(dir, { withFileTypes: true }).catch(() => [])) { + if (entry.isDirectory() && entry.name !== '.git' && !entry.isSymbolicLink()) { + await collect(join(dir, entry.name), depth + 1); + } + } + }; + await collect(stagingDir, 0); + if (found.length === 0) { + await rm(stagingDir, { recursive: true, force: true }).catch(() => { }); + fail('no_skills_found', '仓库里没有找到技能(包含 SKILL.md 的文件夹)。'); + } + const candidates = []; + for (const candidate of found) { + const markdown = await readFile(join(candidate.dir, 'SKILL.md'), 'utf8').catch(() => ''); + const frontmatter = parseSkillFrontmatter(markdown); + const files = await walkFiles(candidate.dir); + const bytes = files.reduce((sum, file) => sum + file.bytes, 0); + const existing = await this.locate(candidate.folder); + let problem; + try { + checkFolder(candidate.folder); + } + catch { + problem = '目录名不合法,不能作为技能目录'; + } + if (problem === undefined && files.length > MAX_SKILL_FILES) + problem = `文件过多(>${MAX_SKILL_FILES})`; + if (problem === undefined && bytes > MAX_SKILL_BYTES) + problem = `体积过大(>${MAX_SKILL_BYTES} 字节)`; + const name = frontmatter.name; + candidates.push({ + folder: candidate.folder, + name: typeof name === 'string' && name !== '' ? name : candidate.folder, + description: String(frontmatter.description ?? '').slice(0, 300), + files: files.length, + bytes, + scripts: files.filter((file) => file.script).map((file) => file.path).slice(0, 20), + conflict: existing !== undefined, + ...(existing === undefined ? {} : { conflictLocation: existing.area }), + ...(problem === undefined ? {} : { problem }), + rel: relative(stagingDir, candidate.dir), + }); + } + const plan = { + id: planId, + kind: 'install', + url, + createdAt: Date.now(), + expiresAt: Date.now() + PLAN_TTL_MS, + stagingDir, + candidates, + ...(commit === '' ? {} : { commit }), + ...(typeof options.ref === 'string' && options.ref !== '' ? { ref: options.ref } : {}), + ...(options.source === undefined ? {} : { source: options.source }), + }; + const file = await this.sweepPlans(await this.readPlans()); + file.plans.push(plan); + await this.writePlans(file); + this.deps.log(`skill install staged: ${url} -> ${planId} (${candidates.length} candidates)`); + return { + planId, + url, + expiresAt: plan.expiresAt, + ...(commit === '' ? {} : { commit }), + candidates: candidates.map((candidate) => ({ ...candidate, id: candidate.folder })), + }; + } + /** Install the folders the user picked from a staged plan. */ + async commitInstall(planInput) { + this.guardSync(); + const planId = typeof planInput.planId === 'string' ? planInput.planId : ''; + if (planId === '') + fail('invalid_plan', '缺少安装计划 id。'); + const selection = Array.isArray(planInput.folders) ? planInput.folders : []; + const file = await this.sweepPlans(await this.readPlans()); + const plan = file.plans.find((item) => item.id === planId); + if (plan === undefined) { + await this.writePlans(file); + fail('plan_expired', '安装计划已过期或不存在,请重新拉取仓库。'); + } + const wanted = selection.map((value) => checkFolder(value)); + const installed = []; + const skipped = []; + const skillsRoot = resolve(this.deps.skillsRoot()); + await mkdir(skillsRoot, { recursive: true }); + for (const candidate of plan.candidates) { + if (!wanted.includes(candidate.folder)) + continue; + if (candidate.problem !== undefined) { + skipped.push({ folder: candidate.folder, reason: candidate.problem }); + continue; + } + const existing = await this.locate(candidate.folder); + if (existing !== undefined) { + skipped.push({ folder: candidate.folder, reason: existing.area === 'holding' ? 'already_exists_disabled' : 'already_exists' }); + continue; + } + const stagingRoot = resolve(plan.stagingDir); + const source = candidate.rel !== undefined && candidate.rel !== '' + ? resolve(stagingRoot, candidate.rel) + : candidate.folder === basename(plan.stagingDir) ? stagingRoot : resolve(stagingRoot, candidate.folder); + const target = resolve(skillsRoot, candidate.folder); + // Both sides must stay inside their own root: a crafted plan file cannot + // make this write outside the skills directory. + if (!source.startsWith(stagingRoot) || !target.startsWith(`${skillsRoot}${sep}`)) { + skipped.push({ folder: candidate.folder, reason: 'path_escape' }); + continue; + } + await cp(source, target, { + recursive: true, + // `.git` never travels with a skill, and a link could point outside the + // repository: both are dropped rather than copied. + filter: (sourcePath) => !sourcePath.split(/[\\/]/).includes('.git') && !isSymlinkSync(sourcePath), + }); + // Record provenance so the skill can later be diffed, updated and rolled + // back without the cloud center. The file holds no credentials. + if (plan.commit !== undefined && plan.commit !== '') { + const record = { + version: 1, + provider: plan.source?.provider ?? 'git', + repoUrl: plan.url, + ref: plan.ref ?? plan.commit, + commit: plan.commit, + sourcePath: candidate.rel ?? candidate.folder, + installedAt: new Date().toISOString(), + ...(plan.source?.entryId === undefined ? {} : { entryId: plan.source.entryId }), + ...(plan.source?.version === undefined ? {} : { marketVersion: plan.source.version }), + }; + await writeFile(join(target, '.skill-source.json'), `${JSON.stringify(record, null, 2)}\n`, 'utf8').catch(() => { }); + } + installed.push(candidate.folder); + this.deps.log(`skill installed from git: ${candidate.folder}`); + } + const remaining = plan.candidates + .filter((candidate) => !installed.includes(candidate.folder)) + .map((candidate) => candidate.folder); + file.plans = file.plans.filter((item) => item.id !== planId); + await this.writePlans(file); + await rm(plan.stagingDir, { recursive: true, force: true }).catch(() => { }); + return { installed, skipped, remaining }; + } + /** Throw away a staged plan and its clone. */ + async cancelInstall(planInput) { + const planId = typeof planInput.planId === 'string' ? planInput.planId : ''; + if (planId === '') + fail('invalid_plan', '缺少安装计划 id。'); + const file = await this.sweepPlans(await this.readPlans()); + const plan = file.plans.find((item) => item.id === planId); + file.plans = file.plans.filter((item) => item.id !== planId); + await this.writePlans(file); + if (plan !== undefined) + await rm(plan.stagingDir, { recursive: true, force: true }).catch(() => { }); + return { cancelled: planId }; + } + /** + * Legacy one-shot install, kept for the standalone `/dsh-brain/skills` + * page: stage the repository, then install every candidate that neither + * collides with an existing skill nor trips a limit. It still never + * overwrites and never executes repository content. + */ + async installFromGit(urlInput) { + const plan = await this.prepareInstall(urlInput); + const folders = plan.candidates + .filter((candidate) => candidate.conflict !== true && candidate.problem === undefined) + .map((candidate) => candidate.folder); + const result = await this.commitInstall({ planId: plan.planId, folders }); + const skipped = plan.candidates + .filter((candidate) => !result.installed.includes(candidate.folder)) + .map((candidate) => ({ + name: candidate.folder, + reason: candidate.conflict === true + ? (candidate.conflictLocation === 'holding' ? 'already_exists_disabled' : 'already_exists') + : candidate.problem ?? 'skipped', + })); + return { installed: result.installed, skipped }; + } + /** Pending plans, so a reloaded page can resume a staged install. */ + async listPlans() { + const file = await this.sweepPlans(await this.readPlans()); + await this.writePlans(file); + return { + plans: file.plans.map((plan) => ({ + planId: plan.id, + url: plan.url, + expiresAt: plan.expiresAt, + folders: plan.candidates.map((candidate) => candidate.folder), + })), + }; } }