@astralyn/pi 1.4.7 → 1.4.8

package/dist/modes/interactive/components/config-selector.js

@@ -5,6 +5,8 @@ import { homedir } from "node:os";
 import { basename, dirname, join, relative } from "node:path";
 import { Container, getKeybindings, Input, matchesKey, Spacer, truncateToWidth, visibleWidth, } from "@earendil-works/pi-tui";
 import { CONFIG_DIR_NAME } from "../../../config.js";
+import { DefaultPackageManager, } from "../../../core/package-manager.js";
+import { matchInvocation, SkillInvocationPolicy, withInvocation } from "../../../core/skill-invocation.js";
 import { readSkillDisableModelInvocation, resolveSkillEffectiveState, } from "../../../core/skills.js";
 import { BUILTIN_PATH_PREFIX } from "../../../core/source-info.js";
 import { canonicalizePath, isLocalPath, resolvePath } from "../../../utils/paths.js";
@@ -19,6 +21,10 @@ function hasResourcePattern(patterns, pattern) {
     }
     return false;
 }
+/** The invocation override that pins a skill state; Off and inherit leave invocation to the defaults. */
+function stateInvocation(state) {
+    return state === "on" ? "model-and-user" : state === "user-only" ? "user-only" : undefined;
+}
 const RESOURCE_TYPES = ["extensions", "skills", "prompts", "themes"];
 const RESOURCE_TYPE_LABELS = {
     extensions: "Extensions",
@@ -110,7 +116,6 @@ function buildGroups(resolved, agentDir) {
                 displayName,
                 groupKey,
                 subgroupKey,
-                skillInvocationOverride: res.skillInvocationOverride,
                 frontmatterDisableModelInvocation: resourceType === "skills" ? readSkillDisableModelInvocation(path) : undefined,
             });
         }
@@ -184,7 +189,8 @@ class ResourceList {
         this.agentDir = agentDir;
         this.writeScope = writeScope;
         this.inheritedEnabledByKey = this.buildInheritedEnabledMap(groupsByScope.global);
-        this.inheritedSkillStateByKey = this.buildInheritedSkillStateMap(groupsByScope.global);
+        this.packageManager = new DefaultPackageManager({ cwd, agentDir, settingsManager });
+        this.skillInvocation = new SkillInvocationPolicy(settingsManager, this.packageManager);
         this.searchInput = new Input();
         // 8 lines of chrome: top spacer + top border + spacer + header (2 lines) + spacer + bottom spacer + bottom border
         const chrome = 8;
@@ -211,19 +217,6 @@ class ResourceList {
         }
         return result;
     }
-    buildInheritedSkillStateMap(groups) {
-        const result = new Map();
-        for (const group of groups) {
-            for (const subgroup of group.subgroups) {
-                if (subgroup.type !== "skills")
-                    continue;
-                for (const item of subgroup.items) {
-                    result.set(this.getResourceItemKey(item), this.getSkillEffectiveState(item));
-                }
-            }
-        }
-        return result;
-    }
     buildFlatList() {
         this.flatItems = [];
         for (const group of this.groups) {
@@ -301,12 +294,8 @@ class ResourceList {
     }
     updateItem(item, enabled) {
         item.enabled = enabled;
-        if (this.writeScope === "global") {
+        if (this.writeScope === "global")
             this.inheritedEnabledByKey.set(this.getResourceItemKey(item), enabled);
-            if (item.resourceType === "skills") {
-                this.inheritedSkillStateByKey.set(this.getResourceItemKey(item), this.getSkillEffectiveState(item));
-            }
-        }
         // Update in groups too
         for (const group of this.groups) {
             for (const subgroup of group.subgroups) {
@@ -434,15 +423,11 @@ class ResourceList {
                 const state = this.getNextProjectSkillOverrideState(item);
                 if (!this.setProjectSkillOverride(item, state))
                     return undefined;
-                item.skillInvocationOverride =
-                    state === "on" ? "model-and-user" : state === "user-only" ? "user-only" : undefined;
                 return state === "inherit" ? this.getInheritedSkillEffectiveState(item) !== "off" : state !== "off";
             }
             const currentState = this.getSkillEffectiveState(item);
             const nextState = currentState === "on" ? "user-only" : currentState === "user-only" ? "off" : "on";
             this.setGlobalSkillEffectiveState(item, nextState);
-            item.skillInvocationOverride =
-                nextState === "on" ? "model-and-user" : nextState === "user-only" ? "user-only" : undefined;
             return nextState !== "off";
         }
         if (this.writeScope === "project") {
@@ -562,65 +547,42 @@ class ResourceList {
             this.toggleTopLevelResource(item, enabled);
         else
             this.togglePackageResource(item, enabled);
-        this.setSkillInvocationOverride(item, "user", state === "on" ? "model-and-user" : state === "user-only" ? "user-only" : undefined);
+        this.setSkillInvocationOverride(item, "user", stateInvocation(state));
     }
     setProjectSkillOverride(item, state) {
         const loadState = state === "inherit" ? "inherit" : state === "off" ? "unload" : "load";
         if (!this.setProjectResourceOverride(item, loadState))
             return false;
-        this.setSkillInvocationOverride(item, "project", state === "on" ? "model-and-user" : state === "user-only" ? "user-only" : undefined);
+        this.setSkillInvocationOverride(item, "project", stateInvocation(state));
         return true;
     }
+    /** Runs after the load write, which creates the package entry a project override needs. */
     setSkillInvocationOverride(item, scope, override) {
+        const layer = this.skillInvocation.layer(scope, item.metadata);
+        if (!layer)
+            return;
+        const overrides = withInvocation(layer, item.path, override);
         if (item.metadata.origin === "top-level") {
-            const settings = scope === "project" ? this.settingsManager.getProjectSettings() : this.settingsManager.getGlobalSettings();
-            const updated = { ...settings.skillInvocationOverrides };
-            const patterns = this.getTopLevelOverridePatterns(item, scope);
-            for (const pattern of Object.keys(updated)) {
-                if (hasResourcePattern(patterns, pattern))
-                    delete updated[pattern];
-            }
-            if (override) {
-                const pattern = scope === "project" && this.isInheritedGlobalItem(item)
-                    ? item.path
-                    : this.getResourcePatternForScope(item, scope);
-                updated[pattern] = override;
-            }
             if (scope === "project")
-                this.settingsManager.setProjectSkillInvocationOverrides(updated);
+                this.settingsManager.setProjectSkillInvocationOverrides(overrides);
             else
-                this.settingsManager.setSkillInvocationOverrides(updated);
+                this.settingsManager.setSkillInvocationOverrides(overrides);
             return;
         }
         const settings = scope === "project" ? this.settingsManager.getProjectSettings() : this.settingsManager.getGlobalSettings();
         const packages = [...(settings.packages ?? [])];
-        const pkgIndex = packages.findIndex((pkg) => this.packageSourceStringMatches(item.metadata.source, this.getItemScope(item), typeof pkg === "string" ? pkg : pkg.source, scope));
-        if (pkgIndex === -1)
+        const pkgIndex = this.skillInvocation.findPackage(scope, item.metadata);
+        const current = packages[pkgIndex];
+        if (current === undefined || (typeof current === "string" && !overrides))
             return;
-        let pkg = packages[pkgIndex];
-        if (typeof pkg === "string") {
-            if (!override)
-                return;
-            pkg = { source: pkg };
+        const pkg = typeof current === "string" ? { source: current } : { ...current };
+        pkg.skillInvocationOverrides = overrides;
+        if (overrides || RESOURCE_TYPES.some((key) => pkg[key] !== undefined))
             packages[pkgIndex] = pkg;
-        }
-        const updated = { ...pkg.skillInvocationOverrides };
-        const patterns = this.getPackageSkillInvocationOverridePatterns(item);
-        for (const pattern of Object.keys(updated)) {
-            if (hasResourcePattern(patterns, pattern))
-                delete updated[pattern];
-        }
-        const pattern = this.getPackageResourcePattern(item);
-        if (override)
-            updated[pattern] = override;
-        pkg.skillInvocationOverrides = Object.keys(updated).length > 0 ? updated : undefined;
-        const hasConfiguration = RESOURCE_TYPES.some((key) => pkg[key] !== undefined) || pkg.skillInvocationOverrides !== undefined;
-        if (!hasConfiguration) {
-            if (scope === "project" && pkg.autoload === false)
-                packages.splice(pkgIndex, 1);
-            else
-                packages[pkgIndex] = pkg.source;
-        }
+        else if (scope === "project" && pkg.autoload === false)
+            packages.splice(pkgIndex, 1);
+        else
+            packages[pkgIndex] = pkg.source;
         if (scope === "project")
             this.settingsManager.setProjectPackages(packages);
         else
@@ -696,21 +658,19 @@ class ResourceList {
             ? this.getProjectSkillOverrideState(item) === "inherit"
             : this.getProjectOverrideState(item) === "inherit";
     }
+    /** The state settings give a skill in the current mode; global mode ignores project settings. */
     getSkillEffectiveState(item) {
+        const scopes = this.writeScope === "project" ? ["project", "user"] : ["user"];
         return resolveSkillEffectiveState({
             enabled: item.enabled,
-            invocationOverride: item.skillInvocationOverride,
+            invocationOverride: this.skillInvocation.resolve(item.path, item.metadata, scopes),
             frontmatterDisableModelInvocation: item.frontmatterDisableModelInvocation,
         });
     }
     getInheritedSkillEffectiveState(item) {
-        const inherited = this.inheritedSkillStateByKey.get(this.getResourceItemKey(item));
-        if (inherited)
-            return inherited;
-        const userScoped = this.getItemScope(item) === "user";
         return resolveSkillEffectiveState({
-            enabled: userScoped ? item.enabled : true,
-            invocationOverride: userScoped ? item.skillInvocationOverride : undefined,
+            enabled: this.getInheritedEnabled(item),
+            invocationOverride: this.skillInvocation.resolve(item.path, item.metadata, ["user"]),
             frontmatterDisableModelInvocation: item.frontmatterDisableModelInvocation,
         });
     }
@@ -729,42 +689,15 @@ class ResourceList {
     getProjectSkillOverrideState(item) {
         if (this.writeScope !== "project")
             return "inherit";
-        let loadState;
-        let invocationOverrides;
-        let patterns;
-        if (item.metadata.origin === "top-level") {
-            const settings = this.settingsManager.getProjectSettings();
-            loadState = this.getOverrideStateFromEntries((settings.skills ?? []), this.getTopLevelOverridePatterns(item, "project"), false);
-            invocationOverrides = settings.skillInvocationOverrides;
-            patterns = this.getTopLevelOverridePatterns(item, "project");
-        }
-        else {
-            const pkg = this.findMatchingPackageSource(item, "project");
-            if (typeof pkg !== "object")
-                return "inherit";
-            loadState =
-                pkg.skills === undefined
-                    ? "inherit"
-                    : this.getOverrideStateFromEntries(pkg.skills, this.getPackageSkillInvocationOverridePatterns(item), pkg.autoload !== false);
-            invocationOverrides = pkg.skillInvocationOverrides;
-            patterns = this.getPackageSkillInvocationOverridePatterns(item);
-        }
+        const loadState = this.getProjectOverrideState(item);
         if (loadState === "unload")
             return "off";
-        const invocation = this.getSkillInvocationOverrideFromMap(invocationOverrides, patterns);
+        const layer = this.skillInvocation.layer("project", item.metadata);
+        const invocation = layer ? matchInvocation(layer, item.path).override : undefined;
         if (invocation)
             return invocation === "user-only" ? "user-only" : "on";
         return loadState;
     }
-    getSkillInvocationOverrideFromMap(overrides, patterns) {
-        for (const [pattern, override] of Object.entries(overrides ?? {})) {
-            if (!hasResourcePattern(patterns, pattern))
-                continue;
-            if (override === "model-and-user" || override === "user-only")
-                return override;
-        }
-        return undefined;
-    }
     setProjectResourceOverride(item, state) {
         return item.metadata.origin === "top-level"
             ? this.setProjectTopLevelOverride(item, state)
@@ -801,7 +734,7 @@ class ResourceList {
     }
     setProjectPackageOverride(item, state) {
         const packages = [...(this.settingsManager.getProjectSettings().packages ?? [])];
-        let pkgIndex = packages.findIndex((pkg) => this.packageSourceStringMatches(item.metadata.source, this.getItemScope(item), typeof pkg === "string" ? pkg : pkg.source, "project"));
+        let pkgIndex = packages.findIndex((pkg) => this.isSamePackage(item.metadata.source, this.getItemScope(item), typeof pkg === "string" ? pkg : pkg.source, "project"));
         if (pkgIndex === -1) {
             if (state === "inherit")
                 return false;
@@ -851,7 +784,7 @@ class ResourceList {
         const entries = pkg[item.resourceType];
         if (entries === undefined)
             return "inherit";
-        return this.getOverrideStateFromEntries(entries, new Set([this.getPackageResourcePattern(item)]), pkg.autoload !== false);
+        return this.getOverrideStateFromEntries(entries, this.getPackageOverridePatterns(item), pkg.autoload !== false);
     }
     getOverrideStateFromEntries(entries, patterns, emptyArrayIsUnload) {
         if (entries.length === 0 && emptyArrayIsUnload)
@@ -906,20 +839,16 @@ class ResourceList {
         const sourcePath = resolvePath(source, this.getTopLevelBaseDir(this.getItemScope(item)), { trim: true });
         return { source: relative(this.getTopLevelBaseDir("project"), sourcePath) || ".", autoload: false };
     }
-    packageSourceStringMatches(leftSource, leftScope, rightSource, rightScope) {
-        if (leftSource === rightSource)
-            return true;
-        if (!isLocalPath(leftSource) || !isLocalPath(rightSource))
-            return false;
-        const left = resolvePath(leftSource, this.getTopLevelBaseDir(leftScope), { trim: true });
-        const right = resolvePath(rightSource, this.getTopLevelBaseDir(rightScope), { trim: true });
-        return left === right;
+    /** Package entries match by the identity package loading dedupes on, so `npm:pkg@1` and `npm:pkg` are one package. */
+    isSamePackage(leftSource, leftScope, rightSource, rightScope) {
+        return (this.packageManager.getPackageIdentity(leftSource, leftScope) ===
+            this.packageManager.getPackageIdentity(rightSource, rightScope));
     }
     findMatchingPackageSource(item, targetScope) {
         const settings = targetScope === "project"
             ? this.settingsManager.getProjectSettings()
             : this.settingsManager.getGlobalSettings();
-        return (settings.packages ?? []).find((pkg) => this.packageSourceStringMatches(item.metadata.source, this.getItemScope(item), typeof pkg === "string" ? pkg : pkg.source, targetScope));
+        return (settings.packages ?? []).find((pkg) => this.isSamePackage(item.metadata.source, this.getItemScope(item), typeof pkg === "string" ? pkg : pkg.source, targetScope));
     }
     getPatternEntryTarget(entry) {
         return entry.startsWith("!") || entry.startsWith("+") || entry.startsWith("-") ? entry.slice(1) : entry;
@@ -944,13 +873,14 @@ class ResourceList {
         const baseDir = item.metadata.baseDir ?? dirname(item.path);
         return relative(baseDir, item.path);
     }
-    getPackageSkillInvocationOverridePatterns(item) {
-        const baseDir = item.metadata.baseDir ?? dirname(item.path);
-        const patterns = new Set([this.getPackageResourcePattern(item), item.path]);
-        if (basename(item.path) === "SKILL.md") {
-            patterns.add(relative(baseDir, dirname(item.path)));
-            patterns.add(dirname(item.path));
-        }
+    /** Package filter entries that name an item; a skill can also be named by its absolute path or directory. */
+    getPackageOverridePatterns(item) {
+        const pattern = this.getPackageResourcePattern(item);
+        if (item.resourceType !== "skills")
+            return new Set([pattern]);
+        const patterns = new Set([pattern, item.path]);
+        if (basename(item.path) === "SKILL.md")
+            patterns.add(dirname(pattern)).add(dirname(item.path));
         return patterns;
     }
 }