@bolloon/bolloon-agent 0.4.28 → 0.4.30

package/dist/electron-build/agents/skill-share.js

@@ -0,0 +1,394 @@
+"use strict";
+/**
+ * skill-share.ts — 技能沉淀 / 分享 / 安装 (IPFS + P2P)
+ *
+ * 目标: 智能体的 skills 不止在本地沉淀, 还能**打包 → 走已有 IPFS 互传 → 对端安装**,
+ * 也能把链接通过已有 P2P 通道发给好友。
+ *
+ * 技能包格式 (单个 JSON, 便于用现有 ipfs_add/ipfs_cat 原语搬运):
+ *   { schema:'bolloon-skill-bundle/1', name, description, version, triggers, exportedAt,
+ *     author, files: { 'SKILL.md': '...', 'references/x.md': '...' } }
+ *
+ * 分享引用 (link) 支持三种写法, 都归一化成 CID:
+ *   bolloon://skill/<cid>   |   ipfs://<cid>   |   <cid>
+ *
+ * 版本与更新流程 (避免"装回旧版"):
+ *   - 导出时 version 取 SKILL.md frontmatter 的 version, 缺省 '1.0.0'
+ *   - 安装时: 本地无 → 写入; 本地有且新版更新 → 覆盖 (旧目录备份为 <name>.bak-<ts>);
+ *     本地版本 >= 来的版本且未 force → 拒绝, 告知原因 (不静默降级)
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SKILL_BUNDLE_SCHEMA = void 0;
+exports.collectSkillBundle = collectSkillBundle;
+exports.parseSkillBundle = parseSkillBundle;
+exports.compareVersions = compareVersions;
+exports.parseSkillRef = parseSkillRef;
+exports.skillShareLink = skillShareLink;
+exports.uploadSkillBundle = uploadSkillBundle;
+exports.fetchSkillBundle = fetchSkillBundle;
+exports.installSkillBundle = installSkillBundle;
+exports.findLocalSkillDir = findLocalSkillDir;
+exports.registerSkillShareTools = registerSkillShareTools;
+const fs = __importStar(require("fs/promises"));
+const path = __importStar(require("path"));
+const os = __importStar(require("os"));
+const pi_sdk_tools_js_1 = require("./pi-sdk-tools.js");
+const skill_writer_js_1 = require("./skill-writer.js");
+const skill_loader_js_1 = require("./skill-loader.js");
+exports.SKILL_BUNDLE_SCHEMA = 'bolloon-skill-bundle/1';
+/** 技能包体积上限 (防把整个仓库塞进 IPFS) */
+const MAX_BUNDLE_BYTES = 512 * 1024;
+/** 收集一个技能目录 → 技能包 */
+async function collectSkillBundle(skillDir, opts = {}) {
+    try {
+        const st = await fs.stat(skillDir).catch(() => null);
+        if (!st || !st.isDirectory())
+            return { ok: false, error: `技能目录不存在: ${skillDir}` };
+        const files = {};
+        let total = 0;
+        const walk = async (dir, prefix) => {
+            const entries = await fs.readdir(dir, { withFileTypes: true });
+            for (const e of entries) {
+                if (e.name.startsWith('.'))
+                    continue; // 跳过隐藏文件
+                if (e.name.includes('.bak-'))
+                    continue; // 跳过备份
+                const abs = path.join(dir, e.name);
+                const rel = prefix ? `${prefix}/${e.name}` : e.name;
+                if (e.isDirectory()) {
+                    await walk(abs, rel);
+                    continue;
+                }
+                if (!e.isFile())
+                    continue;
+                const content = await fs.readFile(abs, 'utf-8');
+                total += content.length;
+                if (total > MAX_BUNDLE_BYTES)
+                    return;
+                files[rel] = content;
+            }
+        };
+        await walk(skillDir, '');
+        if (!files['SKILL.md'])
+            return { ok: false, error: `技能目录缺少 SKILL.md: ${skillDir}` };
+        const meta = await (0, skill_loader_js_1.parseSkillFile)(path.join(skillDir, 'SKILL.md'));
+        const fm = (meta?.frontmatter || {});
+        const version = String(fm.version ?? '1.0.0');
+        const name = (0, skill_writer_js_1.sanitizeSkillName)(String(opts.name || meta?.name || path.basename(skillDir)));
+        return {
+            ok: true,
+            bundle: {
+                schema: exports.SKILL_BUNDLE_SCHEMA,
+                name,
+                description: String(meta?.description ?? fm.description ?? ''),
+                version,
+                triggers: Array.isArray(meta?.triggers) ? meta.triggers : undefined,
+                exportedAt: new Date().toISOString(),
+                author: opts.author,
+                files,
+            },
+        };
+    }
+    catch (e) {
+        return { ok: false, error: `收集技能失败: ${String(e?.message || e).slice(0, 200)}` };
+    }
+}
+/** 校验 + 解析技能包 JSON */
+function parseSkillBundle(json) {
+    let obj;
+    try {
+        obj = JSON.parse(json);
+    }
+    catch (e) {
+        return { ok: false, error: `技能包不是合法 JSON: ${String(e?.message || e).slice(0, 120)}` };
+    }
+    if (!obj || typeof obj !== 'object')
+        return { ok: false, error: '技能包为空' };
+    if (obj.schema !== exports.SKILL_BUNDLE_SCHEMA) {
+        return { ok: false, error: `不是 bolloon 技能包 (schema=${obj.schema ?? '缺失'}, 期望 ${exports.SKILL_BUNDLE_SCHEMA})` };
+    }
+    if (!obj.files || typeof obj.files !== 'object' || !obj.files['SKILL.md']) {
+        return { ok: false, error: '技能包缺少 files["SKILL.md"]' };
+    }
+    return {
+        ok: true,
+        bundle: {
+            schema: obj.schema,
+            name: (0, skill_writer_js_1.sanitizeSkillName)(String(obj.name || 'shared-skill')),
+            description: String(obj.description ?? ''),
+            version: String(obj.version ?? '1.0.0'),
+            triggers: Array.isArray(obj.triggers) ? obj.triggers.map(String) : undefined,
+            exportedAt: String(obj.exportedAt ?? ''),
+            author: obj.author ? String(obj.author) : undefined,
+            files: Object.fromEntries(Object.entries(obj.files).map(([k, v]) => [String(k), String(v)])),
+        },
+    };
+}
+/** 版本比较 (1.2.3 形式; 非法版本当 0.0.0) */
+function compareVersions(a, b) {
+    const seg = (v) => String(v).split('.').map((x) => parseInt(x, 10)).map((n) => (Number.isFinite(n) ? n : 0));
+    const [x, y] = [seg(a), seg(b)];
+    for (let i = 0; i < Math.max(x.length, y.length); i++) {
+        const d = (x[i] ?? 0) - (y[i] ?? 0);
+        if (d !== 0)
+            return d > 0 ? 1 : -1;
+    }
+    return 0;
+}
+/** 分享引用 → CID (支持 bolloon://skill/<cid> / ipfs://<cid> / 裸 CID) */
+function parseSkillRef(ref) {
+    const s = String(ref || '').trim();
+    if (!s)
+        return null;
+    const m = s.match(/^(?:bolloon:\/\/skill\/|ipfs:\/\/|ipfs\/)([A-Za-z0-9]+)/);
+    if (m)
+        return m[1];
+    if (/^[A-Za-z0-9]{20,}$/.test(s))
+        return s;
+    return null;
+}
+/** CID → 分享链接 */
+function skillShareLink(cid) {
+    return `bolloon://skill/${cid}`;
+}
+/** 把技能包上传到本地 IPFS (Kubo), 返回 CID */
+async function uploadSkillBundle(bundle) {
+    try {
+        // 确保本地 Kubo 就绪 (缺则自动安装启动), 否则分享出去的链接没人能拉
+        await (0, pi_sdk_tools_js_1.ensureKuboReady)();
+        const json = JSON.stringify(bundle);
+        const boundary = `----bolloon${Date.now().toString(16)}`;
+        const body = Buffer.concat([
+            Buffer.from(`--${boundary}\r\nContent-Disposition: form-data; name="file"; filename="${bundle.name}.skill.json"\r\nContent-Type: application/json\r\n\r\n`),
+            Buffer.from(json, 'utf-8'),
+            Buffer.from(`\r\n--${boundary}--\r\n`),
+        ]);
+        const raw = await (0, pi_sdk_tools_js_1.kuboApi)('/api/v0/add?cid-version=1&pin=true', {
+            headers: { 'Content-Type': `multipart/form-data; boundary=${boundary}` },
+            body: body,
+        }, 60_000);
+        // Kubo 可能返回 NDJSON 文本, 也可能被 kuboApi 按 content-type 解析成对象 → 两种都兼容
+        let parsed;
+        if (raw && typeof raw === 'object') {
+            parsed = raw;
+        }
+        else {
+            const last = String(raw).trim().split('\n').filter(Boolean).pop() || '{}';
+            parsed = JSON.parse(last);
+        }
+        if (!parsed.Hash)
+            return { ok: false, error: `Kubo 未返回 CID: ${String(raw).slice(0, 200)}` };
+        return { ok: true, cid: String(parsed.Hash) };
+    }
+    catch (e) {
+        return { ok: false, error: `上传技能包失败 (Kubo 未就绪?): ${String(e?.message || e).slice(0, 200)}` };
+    }
+}
+/** 从本地 IPFS 读技能包 */
+async function fetchSkillBundle(cid) {
+    try {
+        const text = await (0, pi_sdk_tools_js_1.kuboApi)(`/api/v0/cat?arg=${encodeURIComponent(cid)}`, undefined, 60_000);
+        return parseSkillBundle(String(text));
+    }
+    catch (e) {
+        return { ok: false, error: `读取技能包失败: ${String(e?.message || e).slice(0, 200)}` };
+    }
+}
+/** 安装技能包到本地技能目录 (默认 user 层 ~/.bolloon/skills) */
+async function installSkillBundle(bundle, opts = {}) {
+    const home = opts.home ?? os.homedir();
+    const base = opts.scope === 'project' ? (0, skill_writer_js_1.getProjectSkillsDir)(opts.cwd ?? process.cwd()) : (0, skill_writer_js_1.getUserSkillsDir)(home);
+    const name = (0, skill_writer_js_1.sanitizeSkillName)(bundle.name);
+    if (!name)
+        return { ok: false, error: '技能名非法 (清洗后为空)' };
+    const targetDir = path.join(base, name);
+    // 版本门: 本地更新则拒绝 (除非 force)
+    const existing = await fs.stat(targetDir).catch(() => null);
+    let backup;
+    if (existing?.isDirectory()) {
+        const localMeta = await (0, skill_loader_js_1.parseSkillFile)(path.join(targetDir, 'SKILL.md')).catch(() => null);
+        const localVersion = String(localMeta?.frontmatter?.version ?? '0.0.0');
+        if (compareVersions(localVersion, bundle.version) >= 0 && !opts.force) {
+            return {
+                ok: false,
+                error: `本地已有 ${name}@${localVersion}, 来的是 ${bundle.version} (不更新) — 要强制覆盖请传 force=true`,
+            };
+        }
+        // 备份旧目录 (可回滚)
+        backup = `${targetDir}.bak-${Date.now()}`;
+        await fs.cp(targetDir, backup, { recursive: true }).catch(() => { backup = undefined; });
+    }
+    try {
+        // 先整体校验路径 (防穿越), 再落盘 — 避免写一半才发现非法路径
+        for (const rel of Object.keys(bundle.files)) {
+            const norm = path.normalize(rel).replace(/^([/\\])+/, '');
+            if (norm.startsWith('..') || path.isAbsolute(norm)) {
+                return { ok: false, error: `技能包含非法路径: ${rel}` };
+            }
+        }
+        for (const [rel, content] of Object.entries(bundle.files)) {
+            const norm = path.normalize(rel).replace(/^([/\\])+/, '');
+            const abs = path.join(targetDir, norm);
+            await fs.mkdir(path.dirname(abs), { recursive: true });
+            await fs.writeFile(abs, content, 'utf-8');
+        }
+        return { ok: true, installed: targetDir, version: bundle.version, files: Object.keys(bundle.files).length, backup };
+    }
+    catch (e) {
+        return { ok: false, error: `写入技能失败: ${String(e?.message || e).slice(0, 200)}` };
+    }
+}
+/** 从本地技能目录里找一个技能 (user 层优先, 再 project 层) */
+async function findLocalSkillDir(name, opts = {}) {
+    const home = opts.home ?? os.homedir();
+    const safe = (0, skill_writer_js_1.sanitizeSkillName)(name);
+    const candidates = [
+        path.join((0, skill_writer_js_1.getUserSkillsDir)(home), safe),
+        path.join((0, skill_writer_js_1.getProjectSkillsDir)(opts.cwd ?? process.cwd()), safe),
+    ];
+    for (const c of candidates) {
+        const st = await fs.stat(c).catch(() => null);
+        if (st?.isDirectory())
+            return c;
+    }
+    return null;
+}
+/** 注册 skill_export / skill_import / skill_share 三个工具 */
+function registerSkillShareTools(ctx) {
+    ctx.tools.set('skill_export', {
+        name: 'skill_export',
+        description: '把一个本地技能打包上传到 IPFS, 返回可分享的 CID 与 bolloon://skill/<cid> 链接 (别的智能体用 skill_import 装)。导出前请确认技能已沉淀完整 (create_skill / update_skill)。',
+        parameters: { skill: '技能名 (必填, 见 list_skills)', publish: '可选: "true" 同时发布 IPNS 稳定名 (内容更新后链接不变)' },
+        execute: async (args) => {
+            const name = String(args.skill || '').trim();
+            if (!name)
+                return { success: false, error: 'skill 必填' };
+            const dir = await findLocalSkillDir(name, { home: os.homedir(), cwd: ctx.cwd });
+            if (!dir)
+                return { success: false, error: `本地未找到技能 '${name}' (用 list_skills 看有哪些)` };
+            const collected = await collectSkillBundle(dir, { name, author: ctx.identity?.did });
+            if (!collected.ok || !collected.bundle)
+                return { success: false, error: collected.error };
+            const up = await uploadSkillBundle(collected.bundle);
+            if (!up.ok)
+                return { success: false, error: up.error };
+            const link = skillShareLink(up.cid);
+            let ipns = '';
+            if (String(args.publish ?? '').toLowerCase() === 'true') {
+                try {
+                    const keyName = `skill-${collected.bundle.name}`;
+                    await (0, pi_sdk_tools_js_1.kuboApi)(`/api/v0/key/gen?arg=${encodeURIComponent(keyName)}`).catch(() => { });
+                    const r = await (0, pi_sdk_tools_js_1.kuboApi)(`/api/v0/name/publish?arg=${encodeURIComponent(up.cid)}&key=${encodeURIComponent(keyName)}&allow-offline=true`, undefined, 60_000);
+                    const n = String(r?.Name || '');
+                    if (n)
+                        ipns = `\n  IPNS (稳定名): ipns://${n}`;
+                }
+                catch { /* IPNS 失败不算致命 */ }
+            }
+            return {
+                success: true,
+                output: `✅ 技能已导出\n  技能: ${collected.bundle.name}@${collected.bundle.version}\n  文件: ${Object.keys(collected.bundle.files).length} 个\n  CID: ${up.cid}\n  分享链接: ${link}${ipns}\n\n对端安装: skill_import(ref="${link}")`,
+            };
+        },
+    });
+    ctx.tools.set('skill_import', {
+        name: 'skill_import',
+        description: '从 IPFS 安装别的智能体分享的技能: 传 bolloon://skill/<cid> 链接或 CID (也支持 ipfs://<cid>)。本地同版本或更新版本会拒绝覆盖, 除非 force=true; 覆盖前自动备份旧目录。',
+        parameters: { ref: '分享链接或 CID (必填)', scope: 'user | project (默认 user = ~/.bolloon/skills)', force: '可选: "true" 强制覆盖本地较新版本' },
+        execute: async (args) => {
+            const ref = String(args.ref || '').trim();
+            if (!ref)
+                return { success: false, error: 'ref 必填' };
+            const cid = parseSkillRef(ref);
+            if (!cid)
+                return { success: false, error: `无法识别的引用: ${ref} (支持 bolloon://skill/<cid> / ipfs://<cid> / CID)` };
+            const fetched = await fetchSkillBundle(cid);
+            if (!fetched.ok || !fetched.bundle)
+                return { success: false, error: fetched.error };
+            const scope = String(args.scope || 'user').toLowerCase() === 'project' ? 'project' : 'user';
+            const inst = await installSkillBundle(fetched.bundle, {
+                cwd: ctx.cwd,
+                scope: scope,
+                force: String(args.force ?? '').toLowerCase() === 'true',
+            });
+            if (!inst.ok)
+                return { success: false, error: inst.error };
+            return {
+                success: true,
+                output: `✅ 已安装技能 ${fetched.bundle.name}@${inst.version}\n  位置: ${inst.installed}\n  文件: ${inst.files} 个${inst.backup ? `\n  旧版本备份: ${inst.backup}` : ''}\n  (下轮对话即可用 use_skill 调用)`,
+            };
+        },
+    });
+    ctx.tools.set('skill_share', {
+        name: 'skill_share',
+        description: '把本地技能分享给别人: 打包上传 IPFS 得到链接, 可选直接通过已有 P2P 通道把链接发给指定好友 (peer)。对方用 skill_import 一键安装。',
+        parameters: { skill: '技能名 (必填)', peer: '可选: 好友 peer id / 名字 (给了就直接发过去)', message: '可选: 随链接附一句话' },
+        execute: async (args) => {
+            const name = String(args.skill || '').trim();
+            if (!name)
+                return { success: false, error: 'skill 必填' };
+            const dir = await findLocalSkillDir(name, { home: os.homedir(), cwd: ctx.cwd });
+            if (!dir)
+                return { success: false, error: `本地未找到技能 '${name}'` };
+            const collected = await collectSkillBundle(dir, { name, author: ctx.identity?.did });
+            if (!collected.ok || !collected.bundle)
+                return { success: false, error: collected.error };
+            const up = await uploadSkillBundle(collected.bundle);
+            if (!up.ok)
+                return { success: false, error: up.error };
+            const link = skillShareLink(up.cid);
+            const peer = String(args.peer || '').trim();
+            let sent = '';
+            if (peer) {
+                try {
+                    const { p2pNetwork } = await Promise.resolve().then(() => __importStar(require('../network/p2p.js')));
+                    const note = String(args.message || '').trim();
+                    const text = `[技能分享] ${collected.bundle.name}@${collected.bundle.version}${collected.bundle.description ? ` — ${collected.bundle.description}` : ''}\n安装: skill_import(ref="${link}")${note ? `\n${note}` : ''}`;
+                    await p2pNetwork.sendMessage(peer, 'message', text);
+                    sent = `\n  已通过 P2P 发给 ${peer}`;
+                }
+                catch (e) {
+                    sent = `\n  ⚠ P2P 发送失败 (链接仍可手动转发): ${String(e?.message || e).slice(0, 120)}`;
+                }
+            }
+            return {
+                success: true,
+                output: `✅ 技能已分享\n  技能: ${collected.bundle.name}@${collected.bundle.version}\n  链接: ${link}${sent}`,
+            };
+        },
+    });
+}
+//# sourceMappingURL=skill-share.js.map

package/dist/electron-build/agents/skill-share.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-share.js","sourceRoot":"","sources":["../../../src/agents/skill-share.ts"],"names":[],"mappings":"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"}

package/dist/electron-build/agents/skill-supervisor-link.js

@@ -0,0 +1,75 @@
+"use strict";
+/**
+ * skill-supervisor-link.ts — 技能状态与长期执行的联动 (批次 2-G.4, 2026-09-16)
+ *
+ * 规则 (与 leo 的规格一致):
+ *   · 技能导入成功 / 又能用了 → 被它拦住的 Goal 重新冻结快照并回到 active (等 Supervisor 继续调度);
+ *   · 技能被禁用 / 隔离 / 内容漂移 → **不打断正在跑的 Run**, 但下一次 Run 之前 readiness 必然失败 (2-G.2 门禁) → needs_human;
+ *   · 漂移**不允许隐式切换版本**: 继续固定旧快照, 或等人工 approve 升级 (approveSkillUpgrade)。
+ *
+ * 这里只改"该不该继续"的事实, 不直接启动执行 —— 执行权始终在 Supervisor。
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reconsiderSkillBlockedGoals = reconsiderSkillBlockedGoals;
+exports.markDependentsOfSkill = markDependentsOfSkill;
+const goal_store_js_1 = require("./goal-store.js");
+const skill_readiness_js_1 = require("./skill-readiness.js");
+const skills_manager_js_1 = require("./skills-manager.js");
+const run_store_js_1 = require("./run-store.js");
+/**
+ * 重评所有"因技能被拦"的 Goal。
+ * @param opts.action 触发原因 (import / enable / disable / quarantine / drift) —— 只用于事实记录
+ */
+async function reconsiderSkillBlockedGoals(opts = {}) {
+    const out = { rechecked: 0, resumed: [], stillBlocked: [] };
+    const home = opts.home;
+    const goals = await (0, goal_store_js_1.listGoals)({ limit: 200 });
+    const interesting = goals.filter((g) => {
+        const r = g.continuation?.skillReadiness;
+        const specs = (0, skill_readiness_js_1.parseSkillSpecs)(g.requiredSkills || []);
+        return (r && r.ok === false) || specs.required.length > 0;
+    });
+    for (const g of interesting) {
+        // 只处理"被技能拦住"的 Goal: 其它原因等人的不要乱动
+        const blockedBySkill = g.continuation?.skillReadiness?.ok === false;
+        if (!blockedBySkill)
+            continue;
+        // 若是被人工标记 needs_human 且与技能无关, 跳过
+        out.rechecked++;
+        const res = await (0, skill_readiness_js_1.ensureGoalSkillsReady)(g, { home });
+        if (res.ok) {
+            // 技能恢复了 → 重新冻结快照 + 回 active (Supervisor 下一轮继续)
+            const approved = await (0, skill_readiness_js_1.approveSkillUpgrade)(g.goalId, { home });
+            if (approved.ok) {
+                out.resumed.push(g.goalId);
+                console.log(`[skill-link] ${g.goalId} 技能已恢复 (${opts.action || 'unknown'}${opts.name ? `:${opts.name}` : ''}) → 重新冻结快照并回到 active`);
+            }
+            else {
+                out.stillBlocked.push(g.goalId);
+            }
+        }
+        else {
+            await (0, skill_readiness_js_1.blockGoalOnSkills)(g.goalId, res);
+            out.stillBlocked.push(g.goalId);
+        }
+    }
+    return out;
+}
+/** 技能被禁用/隔离/漂移时, 把依赖它的活跃 Goal 标清事实 (不打断当前 Run) */
+async function markDependentsOfSkill(name, opts = { reason: '技能不可用' }) {
+    const sm = new skills_manager_js_1.SkillsManager({ home: opts.home, cwd: process.cwd() });
+    const health = await sm.health({ home: opts.home }).catch(() => null);
+    const goals = await (0, goal_store_js_1.listGoals)({ limit: 200 });
+    const affected = [];
+    for (const g of goals) {
+        const { required } = (0, skill_readiness_js_1.parseSkillSpecs)(g.requiredSkills || []);
+        if (!required.includes(name))
+            continue;
+        if (['completed', 'failed', 'abandoned'].includes(g.status))
+            continue;
+        affected.push(g.goalId);
+        await (0, run_store_js_1.recordDegradation)({ kind: 'observational', op: 'skill-link', message: `Goal ${g.goalId} 依赖的技能 ${name} 状态: ${JSON.stringify(health?.byStatus || {})} (${opts.reason}) — 下一次 Run 前会重新门禁` }).catch(() => { });
+    }
+    return affected;
+}
+//# sourceMappingURL=skill-supervisor-link.js.map

package/dist/electron-build/agents/skill-supervisor-link.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-supervisor-link.js","sourceRoot":"","sources":["../../../src/agents/skill-supervisor-link.ts"],"names":[],"mappings":"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"}