@agentxm/client-core 0.10.1 → 0.11.1

package/dist/src/unstable/skills/manager.js

@@ -21,7 +21,7 @@ import { SourceHostProviders } from "../source-resolution/index.js";
 import { WorkspaceMutations } from "../workspace/service-interface.js";
 import { existsInAnyCanonicalLocation } from "./disk-check.js";
 import { sanitizeName } from "../extensions/utils.js";
-import { removeFromAllCanonicalLocations } from "../utils/index.js";
+import { makeWorkspaceRelativeSourcePath, removeFromAllCanonicalLocations, } from "../utils/index.js";
 import { CodingAgentRepository } from "../agents/index.js";
 import { validateExactResolvedVersion } from "../lockfile/index.js";
 import { ensureSkillAgentArtifact, materializeSkillCanonical, removeSkillAgentArtifact, } from "./materialization.js";
@@ -34,12 +34,13 @@ export class SkillManager extends ServiceMap.Service()("@agentxm/client-core/uns
 // Helpers
 // -----------------------------------------------------------------------------
 // Build skill lock entry from ref
-const buildSkillLockEntry = (ref, agents) => sourceToLockEntry({
+const buildSkillLockEntry = (ref, agents, workspaceRelativeLocalSourcePath) => sourceToLockEntry({
     ref,
     agents,
     now: new Date(),
     sourceName: Option.none(),
     existingInstalledAt: Option.none(),
+    workspaceRelativeLocalSourcePath,
 });
 // -----------------------------------------------------------------------------
 // Live Layer
@@ -50,7 +51,10 @@ export const SkillManagerLive = Layer.effect(SkillManager, Effect.gen(function*
     const path = yield* Path.Path;
     const sources = yield* SourceHostProviders;
     const agentRepo = yield* CodingAgentRepository;
-    const agents = yield* ws.getConfiguredAgents();
+    const materializationAgents = yield* agentRepo
+        .getMaterializationAgents()
+        .pipe(Effect.provideService(WorkspaceMutations, ws));
+    const agents = materializationAgents.map((agent) => agent.id);
     const baseDir = ws.baseDir;
     // Build a layer to provide FileSystem + Path to inner effects
     const fsPathLayer = Layer.mergeAll(Layer.succeed(FileSystem.FileSystem, fs), Layer.succeed(Path.Path, path));
@@ -68,7 +72,7 @@ export const SkillManagerLive = Layer.effect(SkillManager, Effect.gen(function*
             provide,
         });
         const configuredAgents = yield* agentRepo
-            .getConfiguredAgents()
+            .getMaterializationAgents()
             .pipe(Effect.provideService(WorkspaceMutations, ws));
         const resolved = yield* Effect.forEach(configuredAgents, (agent) => agent.resolveEffectiveSkillsDir({ workspaceRoot: baseDir }).pipe(Effect.provide(fsPathLayer), Effect.map((outcome) => ({ agent, outcome }))), { concurrency: "unbounded" });
         const misconfigured = Array.filter(resolved, ({ outcome }) => outcome._tag === "misconfigured");
@@ -97,7 +101,7 @@ export const SkillManagerLive = Layer.effect(SkillManager, Effect.gen(function*
     const materializeUninstall = Effect.fn("SkillManager.materializeUninstall")(function* ({ target }) {
         const sanitized = sanitizeName(target.name);
         const configuredAgents = yield* agentRepo
-            .getConfiguredAgents()
+            .getMaterializationAgents()
             .pipe(Effect.provideService(WorkspaceMutations, ws));
         const resolved = yield* Effect.forEach(configuredAgents, (agent) => agent.resolveEffectiveSkillsDir({ workspaceRoot: baseDir }).pipe(Effect.provide(fsPathLayer), Effect.map((outcome) => ({ agent, outcome }))), { concurrency: "unbounded" });
         const uninstallTargets = [];
@@ -130,35 +134,45 @@ export const SkillManagerLive = Layer.effect(SkillManager, Effect.gen(function*
             return yield* configuredSkillsToDiskRefs({ fs, path, baseDir }, configured);
         }),
         materializeUninstall,
-        upsertSettingsEntry: ({ ref, versionRange, }) => {
-            const lockEntry = buildSkillLockEntry(ref, agents);
+        upsertSettingsEntry: Effect.fn("SkillManager.upsertSettingsEntry")(function* ({ ref, versionRange, }) {
+            const workspaceRelativeLocalSourcePath = ref.refType === "local"
+                ? makeWorkspaceRelativeSourcePath(path, baseDir, ref.source.path)
+                : Option.none();
+            if (ref.refType === "local" && Option.isNone(workspaceRelativeLocalSourcePath)) {
+                return yield* makeAppError({
+                    code: "validation",
+                    detail: `Local skill source path must stay within the workspace root: ${ref.source.path}`,
+                });
+            }
+            const lockEntry = buildSkillLockEntry(ref, agents, workspaceRelativeLocalSourcePath);
             if (lockEntry.type === "registry") {
-                return validateExactResolvedVersion(`skills.${ref.skill.name}.resolvedVersion`, lockEntry.resolvedVersion).pipe(Effect.flatMap(() => ws.setSkill({ name: ref.skill.name, lockEntry, versionRange })), Effect.withSpan("SkillManager.upsertSettingsEntry"));
+                yield* validateExactResolvedVersion(`skills.${ref.skill.name}.resolvedVersion`, lockEntry.resolvedVersion);
             }
-            return ws
-                .setSkill({ name: ref.skill.name, lockEntry, versionRange })
-                .pipe(Effect.withSpan("SkillManager.upsertSettingsEntry"));
-        },
+            return yield* ws.setSkill({ name: ref.skill.name, lockEntry, versionRange });
+        }),
         removeSettingsEntry: ({ target }) => ws
             .removeSkillFromSettings(target.name)
             .pipe(Effect.withSpan("SkillManager.removeSettingsEntry")),
-        upsertLockfileEntry: ({ ref }) => {
-            const lockEntry = buildSkillLockEntry(ref, agents);
+        upsertLockfileEntry: Effect.fn("SkillManager.upsertLockfileEntry")(function* ({ ref, }) {
+            const workspaceRelativeLocalSourcePath = ref.refType === "local"
+                ? makeWorkspaceRelativeSourcePath(path, baseDir, ref.source.path)
+                : Option.none();
+            if (ref.refType === "local" && Option.isNone(workspaceRelativeLocalSourcePath)) {
+                return yield* makeAppError({
+                    code: "validation",
+                    detail: `Local skill source path must stay within the workspace root: ${ref.source.path}`,
+                });
+            }
+            const lockEntry = buildSkillLockEntry(ref, agents, workspaceRelativeLocalSourcePath);
             if (lockEntry.type === "registry") {
-                return validateExactResolvedVersion(`skills.${ref.skill.name}.resolvedVersion`, lockEntry.resolvedVersion).pipe(Effect.flatMap(() => ws.setSkillLock({
-                    name: ref.skill.name,
-                    lockEntry,
-                    versionRange: Option.none(),
-                })), Effect.withSpan("SkillManager.upsertLockfileEntry"));
+                yield* validateExactResolvedVersion(`skills.${ref.skill.name}.resolvedVersion`, lockEntry.resolvedVersion);
             }
-            return ws
-                .setSkillLock({
+            return yield* ws.setSkillLock({
                 name: ref.skill.name,
                 lockEntry,
                 versionRange: Option.none(),
-            })
-                .pipe(Effect.withSpan("SkillManager.upsertLockfileEntry"));
-        },
+            });
+        }),
         removeLockfileEntry: ({ target }) => ws.removeSkillLock(target.name).pipe(Effect.withSpan("SkillManager.removeLockfileEntry")),
     };
 }));

package/dist/src/unstable/skills/manager.js.map

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

package/dist/src/unstable/skills/operations/disable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"disable.d.ts","sourceRoot":"","sources":["../../../../../src/unstable/skills/operations/disable.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAMpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAoC1E;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,SAAS,CAAC,eAAe,EAAE;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAM/F;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,YAAY,EAAE,gBAAgB,CACzC,qBAAqB,EACrB,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,GAAG,kBAAkB,CA0GpD,CAAC"}
+{"version":3,"file":"disable.d.ts","sourceRoot":"","sources":["../../../../../src/unstable/skills/operations/disable.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAQpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAiC1E;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,SAAS,CAAC,eAAe,EAAE;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAM/F;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,YAAY,EAAE,gBAAgB,CACzC,qBAAqB,EACrB,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAqIpD,CAAC"}

package/dist/src/unstable/skills/operations/disable.js

@@ -12,16 +12,15 @@ import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
+import * as Layer from "effect/Layer";
+import { DefaultCodingAgentRepository } from "../../agents/index.js";
 import { AGENTS } from "../../agents/registry.js";
 import { makeAppError } from "../../app-error/index.js";
 import { WorkspaceMutations } from "../../workspace/service-interface.js";
 import { sanitizeName } from "../../extensions/utils.js";
-import { isUniversalSkillsRelativeDir } from "../../extensions/universal-skills-dir.js";
-import { removeUniversalSkillArtifact } from "./universal-artifact.js";
-// -----------------------------------------------------------------------------
-const isKnownAgentId = (id) => Object.hasOwn(AGENTS, id);
 // Helpers
 // -----------------------------------------------------------------------------
+const isKnownAgentId = (id) => Object.hasOwn(AGENTS, id);
 /** Derive a source string from lock entry metadata for implicit skill promotion. */
 const deriveSourceString = (lockEntry) => {
     switch (lockEntry.type) {
@@ -65,6 +64,7 @@ export const disableSkill = (op) => Effect.gen(function* () {
     const path = yield* Path.Path;
     const ws = yield* WorkspaceMutations;
     const base = ws.baseDir;
+    const fsPathLayer = Layer.mergeAll(Layer.succeed(FileSystem.FileSystem, fs), Layer.succeed(Path.Path, path));
     // Read lifecycle to determine promotion needs
     const installedSkills = yield* ws.records.getInstalledSkills();
     const installed = installedSkills[op.args.skillName];
@@ -80,9 +80,11 @@ export const disableSkill = (op) => Effect.gen(function* () {
     if (hasLockEntry) {
         const lockEntry = lockEntryOption.value;
         const sanitizedName = sanitizeName(op.args.skillName);
-        const configuredAgents = yield* ws.getConfiguredAgents();
-        const lockAgents = lockEntry.agents;
-        const allAgents = [...new Set([...lockAgents, ...configuredAgents])];
+        const materializationAgents = yield* DefaultCodingAgentRepository.getMaterializationAgents().pipe(Effect.provideService(WorkspaceMutations, ws));
+        const agentsById = new Map(materializationAgents.map((agent) => [agent.id, agent]));
+        const allAgents = [
+            ...new Set([...lockEntry.agents, ...materializationAgents.map((a) => a.id)]),
+        ];
         // Remove agent symlinks/copies (concurrent) — files before state.
         // When renderedFiles are tracked (copy-mode), prefer tracked paths;
         // otherwise fall back to agent descriptor-based path resolution.
@@ -91,27 +93,37 @@ export const disableSkill = (op) => Effect.gen(function* () {
             // Check renderedFiles for tracked copy-mode paths
             const tracked = renderedFiles?.[agentId];
             if (tracked !== undefined && tracked.length > 0) {
-                return Effect.forEach(tracked, (entry) => fs.remove(entry.path, { recursive: true }).pipe(Effect.catch(() => Effect.void)), { concurrency: "unbounded" });
+                return Effect.forEach(tracked, (entry) => fs
+                    .remove(path.resolve(base, entry.path), { recursive: true })
+                    .pipe(Effect.catch(() => Effect.void)), { concurrency: "unbounded" });
             }
-            // Fall back to agent descriptor-based path resolution
-            if (!isKnownAgentId(agentId))
-                return Effect.void;
-            const agent = AGENTS[agentId];
-            if (isUniversalSkillsRelativeDir(agent.skills.dir))
-                return Effect.void;
-            const agentSkillPath = path.join(base, agent.skills.dir, sanitizedName);
-            return fs
-                .remove(agentSkillPath, { recursive: true })
-                .pipe(Effect.catch(() => Effect.void));
+            const configuredAgent = agentsById.get(agentId);
+            const agentEffect = configuredAgent !== undefined
+                ? Effect.succeed(Option.some(configuredAgent))
+                : isKnownAgentId(agentId)
+                    ? DefaultCodingAgentRepository.get(agentId).pipe(Effect.map(Option.some))
+                    : Effect.succeed(Option.none());
+            return agentEffect.pipe(Effect.flatMap((agentOption) => {
+                if (Option.isNone(agentOption)) {
+                    return Effect.succeed({
+                        _tag: "unsupported",
+                        reason: `Unknown coding agent: ${agentId}`,
+                    });
+                }
+                return agentOption.value.resolveEffectiveSkillsDir({ workspaceRoot: base });
+            }), Effect.provide(fsPathLayer), Effect.flatMap((outcome) => outcome._tag === "supported"
+                ? fs
+                    .remove(path.join(path.normalize(outcome.dir), sanitizedName), {
+                    recursive: true,
+                })
+                    .pipe(Effect.catch(() => Effect.void))
+                : Effect.void));
         }, { concurrency: "unbounded" });
-        yield* removeUniversalSkillArtifact(op.args.skillName);
-        const { universalArtifact: _universalArtifact, ...lockEntryWithoutUniversal } = lockEntry;
-        void _universalArtifact;
         // Clear lock agents — state updates after files
         yield* ws
             .setSkillLock({
             name: op.args.skillName,
-            lockEntry: { ...lockEntryWithoutUniversal, agents: [] },
+            lockEntry: { ...lockEntry, agents: [] },
             versionRange: Option.none(),
         })
             .pipe(Effect.catch(() => Effect.void));

package/dist/src/unstable/skills/operations/disable.js.map

@@ -1 +1 @@
-{"version":3,"file":"disable.js","sourceRoot":"","sources":["../../../../../src/unstable/skills/operations/disable.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAIxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,0CAA0C,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAEvE,gFAAgF;AAChF,MAAM,cAAc,GAAG,CAAC,EAAU,EAAiB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAEhF,UAAU;AACV,gFAAgF;AAEhF,oFAAoF;AACpF,MAAM,kBAAkB,GAAG,CAAC,SAAyB,EAAU,EAAE;IAC/D,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,OAAO;YACV,OAAO,SAAS,CAAC,IAAI,CAAC;QACxB,KAAK,UAAU;YACb,OAAO,GAAG,SAAS,CAAC,KAAK,WAAW,SAAS,CAAC,IAAI,EAAE,CAAC;QACvD,KAAK,QAAQ;YACX,OAAO,GAAG,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;QAChD,KAAK,QAAQ;YACX,OAAO,GAAG,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;QAChD,KAAK,WAAW;YACd,OAAO,GAAG,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;QAChD,KAAK,YAAY;YACf,OAAO,GAAG,SAAS,CAAC,YAAY,IAAI,SAAS,CAAC,OAAO,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;QAC5E,KAAK,KAAK;YACR,OAAO,SAAS,CAAC,GAAG,CAAC;IACzB,CAAC;AACH,CAAC,CAAC;AAaF,gFAAgF;AAChF,aAAa;AACb,gFAAgF;AAEhF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,YAAY,GAGrB,CAAC,EAAE,EAAE,EAAE,CACT,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;IACxC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IAC9B,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC;IACrC,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC;IAExB,8CAA8C;IAC9C,MAAM,eAAe,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAC/D,MAAM,SAAS,GAAG,eAAe,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,SAAS,KAAK,UAAU,CAAC;IAEjF,uBAAuB;IACvB,MAAM,eAAe,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CACtE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CACpB,YAAY,CAAC;QACX,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,4BAA4B,CAAC,CAAC,OAAO,EAAE;QAC/C,KAAK,EAAE,CAAC;KACT,CAAC,CACH,CACF,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAEpD,uDAAuD;IACvD,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC;QACxC,MAAM,aAAa,GAAG,YAAY,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtD,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC;QAEzD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;QACpC,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAErE,kEAAkE;QAClE,oEAAoE;QACpE,iEAAiE;QACjE,MAAM,aAAa,GAAG,SAAS,CAAC,aAAa,CAAC;QAC9C,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACnB,SAAS,EACT,CAAC,OAAO,EAAE,EAAE;YACV,kDAAkD;YAClD,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC;YACzC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAChD,OAAO,MAAM,CAAC,OAAO,CACnB,OAAO,EACP,CAAC,KAAK,EAAE,EAAE,CACR,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAClF,EAAE,WAAW,EAAE,WAAW,EAAE,CAC7B,CAAC;YACJ,CAAC;YAED,sDAAsD;YACtD,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAAE,OAAO,MAAM,CAAC,IAAI,CAAC;YACjD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9B,IAAI,4BAA4B,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC;gBAAE,OAAO,MAAM,CAAC,IAAI,CAAC;YAEvE,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;YACxE,OAAO,EAAE;iBACN,MAAM,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;iBAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,CAAC,EACD,EAAE,WAAW,EAAE,WAAW,EAAE,CAC7B,CAAC;QAEF,KAAK,CAAC,CAAC,4BAA4B,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEvD,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,GAAG,yBAAyB,EAAE,GAAG,SAAS,CAAC;QAC1F,KAAK,kBAAkB,CAAC;QAExB,gDAAgD;QAChD,KAAK,CAAC,CAAC,EAAE;aACN,YAAY,CAAC;YACZ,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS;YACvB,SAAS,EAAE,EAAE,GAAG,yBAAyB,EAAE,MAAM,EAAE,EAAE,EAAE;YACvD,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE;SAC5B,CAAC;aACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,0DAA0D;IAC1D,IAAI,UAAU,EAAE,CAAC;QACf,qEAAqE;QACrE,6DAA6D;QAC7D,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CACrD,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CACrE,CAAC;QACF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,CAAC,YAAY,CAAC;gBACzB,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,+CAA+C,EAAE,CAAC,IAAI,CAAC,SAAS,GAAG;gBAC3E,WAAW,EAAE,CAAC,EAAE,WAAW,EAAE,4CAA4C,EAAE,CAAC;aAC7E,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1F,CAAC;SAAM,CAAC;QACN,yCAAyC;QACzC,KAAK,CAAC,CAAC,EAAE;aACN,gBAAgB,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;aACtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,YAAY,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE;KACjB,CAAC;AAC5B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"disable.js","sourceRoot":"","sources":["../../../../../src/unstable/skills/operations/disable.ts"],"names":[],"mappings":"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"}

package/dist/src/unstable/skills/operations/enable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enable.d.ts","sourceRoot":"","sources":["../../../../../src/unstable/skills/operations/enable.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAOpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAW1E;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,cAAc,EAAE;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAM7F;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,WAAW,EAAE,gBAAgB,CACxC,oBAAoB,EACpB,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAuFpD,CAAC"}
+{"version":3,"file":"enable.d.ts","sourceRoot":"","sources":["../../../../../src/unstable/skills/operations/enable.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAMpC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAO1E;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,SAAS,CAAC,cAAc,EAAE;IAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAM7F;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,WAAW,EAAE,gBAAgB,CACxC,oBAAoB,EACpB,UAAU,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,GAAG,kBAAkB,CA4FpD,CAAC"}

package/dist/src/unstable/skills/operations/enable.js

@@ -11,15 +11,12 @@ import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
-import { AGENTS } from "../../agents/registry.js";
+import * as Layer from "effect/Layer";
+import { DefaultCodingAgentRepository } from "../../agents/index.js";
 import { makeAppError } from "../../app-error/index.js";
-import { createSymlink } from "../../utils/index.js";
 import { WorkspaceMutations } from "../../workspace/service-interface.js";
-import { copyExtensionDirectory, sanitizeName } from "../../extensions/utils.js";
-import { isUniversalSkillsRelativeDir } from "../../extensions/universal-skills-dir.js";
-import { materializeUniversalSkillArtifact } from "./universal-artifact.js";
-// -----------------------------------------------------------------------------
-const isKnownAgentId = (id) => Object.hasOwn(AGENTS, id);
+import { sanitizeName } from "../../extensions/utils.js";
+import { ensureSkillAgentArtifact } from "../materialization.js";
 // -----------------------------------------------------------------------------
 // Public API
 // -----------------------------------------------------------------------------
@@ -42,6 +39,8 @@ export const enableSkill = (op) => Effect.gen(function* () {
     const path = yield* Path.Path;
     const ws = yield* WorkspaceMutations;
     const base = ws.baseDir;
+    const fsPathLayer = Layer.mergeAll(Layer.succeed(FileSystem.FileSystem, fs), Layer.succeed(Path.Path, path));
+    const provide = (effect) => Effect.provide(effect, fsPathLayer);
     // Check for lock entry to determine path
     const lockEntry = yield* ws.getLockedSkill(op.args.skillName);
     // Settings-only path: no lock entry, just toggle enabled flag
@@ -56,7 +55,7 @@ export const enableSkill = (op) => Effect.gen(function* () {
     }
     // Lock-backed path: full enable with symlinks
     const sanitizedName = sanitizeName(op.args.skillName);
-    const configuredAgents = yield* ws.getConfiguredAgents();
+    const materializationAgents = yield* DefaultCodingAgentRepository.getMaterializationAgents().pipe(Effect.provideService(WorkspaceMutations, ws));
     const { skillSrcPath } = yield* ws.getSkillDir(op.args.skillName);
     const exists = yield* fs.exists(skillSrcPath).pipe(Effect.catch(() => Effect.succeed(false)));
     if (!exists) {
@@ -71,26 +70,22 @@ export const enableSkill = (op) => Effect.gen(function* () {
             ],
         });
     }
-    yield* Effect.forEach(configuredAgents, (agentId) => {
-        if (!isKnownAgentId(agentId))
-            return Effect.void;
-        const agent = AGENTS[agentId];
-        if (isUniversalSkillsRelativeDir(agent.skills.dir))
-            return Effect.void;
-        const agentSkillPath = path.join(base, agent.skills.dir, sanitizedName);
-        return createSymlink({ target: skillSrcPath, link: agentSkillPath }).pipe(Effect.catch(() => copyExtensionDirectory(skillSrcPath, agentSkillPath).pipe(Effect.catch(() => Effect.void))));
-    }, { concurrency: "unbounded" });
-    const universal = yield* materializeUniversalSkillArtifact({
-        canonicalSkillSrcPath: skillSrcPath,
-        skillName: op.args.skillName,
-    });
+    yield* Effect.forEach(materializationAgents, (agent) => agent.resolveEffectiveSkillsDir({ workspaceRoot: base }).pipe(Effect.provide(fsPathLayer), Effect.flatMap((outcome) => outcome._tag === "supported"
+        ? ensureSkillAgentArtifact({
+            canonicalSkillSrcPath: skillSrcPath,
+            targetDir: path.normalize(outcome.dir),
+            sanitizedName,
+            pathService: path,
+            baseDir: base,
+            provide,
+        })
+        : Effect.void)), { concurrency: "unbounded" });
     yield* ws
         .setSkillLock({
         name: op.args.skillName,
         lockEntry: {
             ...lockEntry.value,
-            agents: configuredAgents,
-            universalArtifact: universal.artifact,
+            agents: materializationAgents.map((agent) => agent.id),
         },
         versionRange: Option.none(),
     })

package/dist/src/unstable/skills/operations/enable.js.map

@@ -1 +1 @@
-{"version":3,"file":"enable.js","sourceRoot":"","sources":["../../../../../src/unstable/skills/operations/enable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"enable.js","sourceRoot":"","sources":["../../../../../src/unstable/skills/operations/enable.ts"],"names":[],"mappings":"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"}

package/dist/src/unstable/skills/operations/install.d.ts

@@ -42,7 +42,7 @@ export type InstallSkillOperationArgs = {
  * @experimental This API is unstable and may change without notice.
  */
 export type InstallSkillOperation = Operation<"install-skill", InstallSkillOperationArgs>;
-export { computeSkillSourceHash } from "./universal-artifact.js";
+export { computeSkillSourceHash } from "./source-hash.js";
 /**
  * Build a RenderedFilesMap from per-agent copy-mode install results.
  * Only includes agents where mode === "copy" and success === true.
@@ -52,7 +52,7 @@ export { computeSkillSourceHash } from "./universal-artifact.js";
 export declare const buildRenderedFilesFromResults: (installableTargets: ReadonlyArray<{
     agentId: AgentId;
     targetDir: string;
-}>, agentResults: ReadonlyArray<InstallResult>) => RenderedFilesMap;
+}>, agentResults: ReadonlyArray<InstallResult>, toWorkspaceRelativePath: (path: string) => string) => RenderedFilesMap;
 /**
  * Install-skill operation handler.
  *

package/dist/src/unstable/skills/operations/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../../../src/unstable/skills/operations/install.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAGpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,KAAK,EAIV,iBAAiB,EAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAY1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAWzD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,iEAAiE;IACjE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,qFAAqF;IACrF,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9C,4EAA4E;IAC5E,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACrD,mFAAmF;IACnF,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,6FAA6F;IAC7F,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;CAC5C,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,SAAS,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;AAkC1F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,GACxC,oBAAoB,aAAa,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,EAC1E,cAAc,aAAa,CAAC,aAAa,CAAC,KACzC,gBAQF,CAAC;AA4MF;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,EAAE,gBAAgB,CACzC,qBAAqB,EACnB,UAAU,CAAC,UAAU,GACrB,IAAI,CAAC,IAAI,GACT,kBAAkB,GAClB,WAAW,GACX,mBAAmB,GACnB,qBAAqB,CAkOrB,CAAC"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../../../src/unstable/skills/operations/install.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAGpC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,KAAK,EAIV,iBAAiB,EAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAa1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAE1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAOzD;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,iEAAiE;IACjE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,qFAAqF;IACrF,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9C,4EAA4E;IAC5E,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACrD,mFAAmF;IACnF,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClD,6FAA6F;IAC7F,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;CAC5C,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,SAAS,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;AAkC1F,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,GACxC,oBAAoB,aAAa,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,EAC1E,cAAc,aAAa,CAAC,aAAa,CAAC,EAC1C,yBAAyB,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,KAChD,gBAUF,CAAC;AA4MF;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,EAAE,gBAAgB,CACzC,qBAAqB,EACnB,UAAU,CAAC,UAAU,GACrB,IAAI,CAAC,IAAI,GACT,kBAAkB,GAClB,WAAW,GACX,mBAAmB,GACnB,qBAAqB,CAiMrB,CAAC"}

package/dist/src/unstable/skills/operations/install.js

@@ -17,14 +17,14 @@ import * as Schema from "effect/Schema";
 import { SourceHostProviders } from "../../source-resolution/index.js";
 import { CodingAgentRepository } from "../../agents/index.js";
 import { CliRenderer } from "../../cli-renderer/index.js";
-import { computeIntegrity, createSymlink, isPathSafe, removeFromAllCanonicalLocations, stripFileProtocol, } from "../../utils/index.js";
+import { computeIntegrity, createSymlink, isPathSafe, makeWorkspaceRelativeSourcePath, removeFromAllCanonicalLocations, stripFileProtocol, } from "../../utils/index.js";
 import { validatePathSafety } from "../../extensions/index.js";
 import { errInstallFailed, makeAppError } from "../../app-error/index.js";
 import { createRegistryClient, extractZip } from "../../registry/index.js";
 import { validateExactResolvedVersion } from "../../lockfile/index.js";
 import { WorkspaceMutations } from "../../workspace/service-interface.js";
 import { copyExtensionDirectory, sanitizeName } from "../../extensions/utils.js";
-import { buildUniversalSkillArtifact, computeSkillSourceHash, universalSkillsTargetDir, } from "./universal-artifact.js";
+import { computeSkillSourceHash } from "./source-hash.js";
 // -----------------------------------------------------------------------------
 // Shared helpers
 // -----------------------------------------------------------------------------
@@ -39,18 +39,20 @@ const preCleanAndCopy = (sanitizedName, sourcePath, copyTarget) => Effect.gen(fu
     })));
 });
 const decodeRenderedFilePath = Schema.decodeUnknownSync(RenderedFilePathSchema);
-export { computeSkillSourceHash } from "./universal-artifact.js";
+export { computeSkillSourceHash } from "./source-hash.js";
 /**
  * Build a RenderedFilesMap from per-agent copy-mode install results.
  * Only includes agents where mode === "copy" and success === true.
  *
  * @internal Exported for testing only.
  */
-export const buildRenderedFilesFromResults = (installableTargets, agentResults) => {
+export const buildRenderedFilesFromResults = (installableTargets, agentResults, toWorkspaceRelativePath) => {
     const result = {};
     for (const [target, installResult] of Array.zip(installableTargets, agentResults)) {
         if (installResult.mode === "copy" && installResult.success) {
-            result[target.agentId] = [{ path: decodeRenderedFilePath(installResult.path) }];
+            result[target.agentId] = [
+                { path: decodeRenderedFilePath(toWorkspaceRelativePath(installResult.path)) },
+            ];
         }
     }
     return result;
@@ -204,15 +206,15 @@ export const installSkill = (op) => Effect.gen(function* () {
     const renderer = yield* CliRenderer;
     const agentRepo = yield* CodingAgentRepository;
     const { ref } = op.args;
-    const agents = yield* ws.getConfiguredAgents();
     const sanitizedName = sanitizeName(ref.skill.name);
     const strictUnknownAgents = Option.getOrElse(op.args.strictUnknownAgents, () => false);
     // ── Per-refType: resolve source, copy to canonical ──────────────
     const materialized = yield* materializeSkill(ref, sanitizedName, op.args.versionRange);
     // ── Shared: resolve agent targets + install once per distinct dir ────────
     const configuredAgents = yield* agentRepo
-        .getConfiguredAgents()
+        .getMaterializationAgents()
         .pipe(Effect.provideService(WorkspaceMutations, ws));
+    const agents = configuredAgents.map((agent) => agent.id);
     const unknownConfiguredAgentIds = yield* agentRepo
         .getUnknownConfiguredAgentIds()
         .pipe(Effect.provideService(WorkspaceMutations, ws));
@@ -263,14 +265,7 @@ export const installSkill = (op) => Effect.gen(function* () {
             });
         }
     }
-    const universalTargetDir = universalSkillsTargetDir(ws.baseDir, path);
-    // Dedup target directories — agents sharing UNIVERSAL_SKILLS_DIR (".agents/skills")
-    // resolve to the same path and receive a single symlink rather than duplicates.
-    // The universal directory is also an always-on workspace-level target.
-    const distinctDirs = Array.dedupe([
-        ...installableTargets.map((target) => target.targetDir),
-        universalTargetDir,
-    ]);
+    const distinctDirs = Array.dedupe(installableTargets.map((target) => target.targetDir));
     const perDirectoryResults = yield* Effect.forEach(distinctDirs, (targetDir) => installForDirectory({
         targetDir,
         canonicalSkillSrcPath: materialized.skillSrcPath,
@@ -290,59 +285,36 @@ export const installSkill = (op) => Effect.gen(function* () {
         }
         return matched.result;
     });
-    const universalResult = perDirectoryResults.find((item) => item.targetDir === universalTargetDir)?.result;
-    if (universalResult === undefined) {
-        return {
-            result: "error",
-            message: `Failed to install ${ref.skill.name} in the universal skills directory`,
-            error: makeAppError({
-                code: "internal",
-                detail: `No installation result for universal skills directory ${universalTargetDir}`,
-            }),
-        };
-    }
-    const universalArtifact = universalResult.success
-        ? yield* buildUniversalSkillArtifact({
-            artifactPath: universalResult.path,
-            canonicalSkillSrcPath: materialized.skillSrcPath,
-        })
-        : undefined;
-    const trackedTargets = installableTargets.filter((target) => target.targetDir !== universalTargetDir);
-    const trackedResults = trackedTargets.map((target) => {
-        const matched = perDirectoryResults.find((item) => item.targetDir === target.targetDir);
-        if (matched === undefined) {
-            return {
-                success: false,
-                mode: "copy",
-                symlinkFailed: true,
-                error: Option.some(`No installation result for target directory ${target.targetDir}`),
-                path: target.targetDir,
-                canonicalPath: materialized.skillSrcPath,
-            };
-        }
-        return matched.result;
-    });
     // ── Shared: compute rendered files tracking for copy-mode ──────
-    const hasCopyResults = trackedResults.some((r) => r.mode === "copy" && r.success);
+    const hasCopyResults = agentResults.some((r) => r.mode === "copy" && r.success);
     const renderedFiles = hasCopyResults
-        ? buildRenderedFilesFromResults(trackedTargets, trackedResults)
+        ? buildRenderedFilesFromResults(installableTargets, agentResults, (targetPath) => path.relative(ws.baseDir, targetPath))
         : undefined;
     const sourceHash = hasCopyResults
         ? yield* computeSkillSourceHash(materialized.skillSrcPath)
         : undefined;
     // ── Shared: update lockfile + settings ──────────────────────────
+    const workspaceRelativeLocalSourcePath = ref.refType === "local"
+        ? makeWorkspaceRelativeSourcePath(path, ws.baseDir, ref.source.path)
+        : Option.none();
+    if (ref.refType === "local" && Option.isNone(workspaceRelativeLocalSourcePath)) {
+        return yield* makeAppError({
+            code: "validation",
+            detail: `Local skill source path must stay within the workspace root: ${ref.source.path}`,
+        });
+    }
     const baseLockEntry = sourceToLockEntry({
         ref,
         agents,
         now: new Date(),
         sourceName: op.args.sourceName,
         existingInstalledAt: op.args.existingInstalledAt,
+        workspaceRelativeLocalSourcePath,
     });
     const lockEntry = {
         ...baseLockEntry,
         ...(sourceHash !== undefined ? { sourceHash } : {}),
         ...(renderedFiles !== undefined ? { renderedFiles } : {}),
-        ...(universalArtifact !== undefined ? { universalArtifact } : {}),
     };
     if (lockEntry.type === "registry") {
         yield* validateExactResolvedVersion(`skills.${ref.skill.name}.resolvedVersion`, lockEntry.resolvedVersion);
@@ -357,10 +329,9 @@ export const installSkill = (op) => Effect.gen(function* () {
         : ws.setSkill(skillArgs);
     yield* writeEffect.pipe(Effect.catch((e) => renderer.warn(`Skill update failed: ${String(e)}`)));
     // ── Shared: compute result ──────────────────────────────────────
-    const allResults = [...agentResults, universalResult];
-    const anyFailed = allResults.some((r) => !r.success);
+    const anyFailed = agentResults.some((r) => !r.success);
     if (anyFailed) {
-        const failedAgents = allResults
+        const failedAgents = agentResults
             .filter((r) => !r.success)
             .map((r) => Option.getOrElse(r.error, () => "unknown error"));
         const message = `Failed to install ${ref.skill.name} for some agents: ${failedAgents.join(", ")}`;