@astralyn/pi 1.4.6 → 1.4.8

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

@@ -5,11 +5,26 @@ 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";
 import { theme } from "../theme/theme.js";
 import { DynamicBorder } from "./dynamic-border.js";
 import { keyHint, rawKeyHint } from "./keybinding-hints.js";
+function hasResourcePattern(patterns, pattern) {
+    const normalized = pattern.replace(/\\/g, "/");
+    for (const candidate of patterns) {
+        if (candidate.replace(/\\/g, "/") === normalized)
+            return true;
+    }
+    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",
@@ -101,6 +116,7 @@ function buildGroups(resolved, agentDir) {
                 displayName,
                 groupKey,
                 subgroupKey,
+                frontmatterDisableModelInvocation: resourceType === "skills" ? readSkillDisableModelInvocation(path) : undefined,
             });
         }
     };
@@ -142,7 +158,7 @@ class ConfigSelectorHeader {
         const title = theme.bold(this.writeScope === "project" ? "Project Local Resources" : "Global Resources");
         const sep = theme.fg("muted", " · ");
         const switchHint = this.projectModeAvailable ? keyHint("tui.input.tab", "switch mode") + sep : "";
-        const actionHint = this.writeScope === "project" ? rawKeyHint("space", "cycle inherit/+/-") : rawKeyHint("space", "toggle");
+        const actionHint = rawKeyHint("space", "change");
         const hint = switchHint + actionHint + sep + rawKeyHint("esc", "close");
         const spacing = Math.max(1, width - visibleWidth(title) - visibleWidth(hint));
         const scopeHint = this.writeScope === "project"
@@ -173,6 +189,8 @@ class ResourceList {
         this.agentDir = agentDir;
         this.writeScope = writeScope;
         this.inheritedEnabledByKey = this.buildInheritedEnabledMap(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;
@@ -276,6 +294,8 @@ class ResourceList {
     }
     updateItem(item, enabled) {
         item.enabled = enabled;
+        if (this.writeScope === "global")
+            this.inheritedEnabledByKey.set(this.getResourceItemKey(item), enabled);
         // Update in groups too
         for (const group of this.groups) {
             for (const subgroup of group.subgroups) {
@@ -323,7 +343,11 @@ class ResourceList {
                 const dimmed = this.isDimmedItem(item);
                 const nameText = isSelected && !dimmed ? theme.bold(item.displayName) : item.displayName;
                 const name = dimmed ? theme.fg("dim", nameText) : nameText;
-                lines.push(truncateToWidth(`${cursor}    ${this.renderCheckbox(item)} ${name}${this.getItemSuffix(item)}`, width, "..."));
+                const prefix = `${cursor}    ${this.renderCheckbox(item)} `;
+                const suffix = this.getItemSuffix(item);
+                const nameWidth = Math.max(1, width - visibleWidth(prefix) - visibleWidth(suffix));
+                const renderedName = truncateToWidth(name, nameWidth, "...");
+                lines.push(truncateToWidth(`${prefix}${renderedName}${suffix}`, width, "..."));
             }
         }
         // Scroll indicator
@@ -394,6 +418,18 @@ class ResourceList {
         this.filterItems(this.searchInput.getValue());
     }
     toggleResource(item) {
+        if (item.resourceType === "skills") {
+            if (this.writeScope === "project") {
+                const state = this.getNextProjectSkillOverrideState(item);
+                if (!this.setProjectSkillOverride(item, state))
+                    return 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);
+            return nextState !== "off";
+        }
         if (this.writeScope === "project") {
             const state = this.getNextOverrideState(item);
             if (!this.setProjectResourceOverride(item, state))
@@ -505,7 +541,81 @@ class ResourceList {
             this.settingsManager.setPackages(packages);
         }
     }
+    setGlobalSkillEffectiveState(item, state) {
+        const enabled = state !== "off";
+        if (item.metadata.origin === "top-level")
+            this.toggleTopLevelResource(item, enabled);
+        else
+            this.togglePackageResource(item, enabled);
+        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", 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") {
+            if (scope === "project")
+                this.settingsManager.setProjectSkillInvocationOverrides(overrides);
+            else
+                this.settingsManager.setSkillInvocationOverrides(overrides);
+            return;
+        }
+        const settings = scope === "project" ? this.settingsManager.getProjectSettings() : this.settingsManager.getGlobalSettings();
+        const packages = [...(settings.packages ?? [])];
+        const pkgIndex = this.skillInvocation.findPackage(scope, item.metadata);
+        const current = packages[pkgIndex];
+        if (current === undefined || (typeof current === "string" && !overrides))
+            return;
+        const pkg = typeof current === "string" ? { source: current } : { ...current };
+        pkg.skillInvocationOverrides = overrides;
+        if (overrides || RESOURCE_TYPES.some((key) => pkg[key] !== undefined))
+            packages[pkgIndex] = pkg;
+        else if (scope === "project" && pkg.autoload === false)
+            packages.splice(pkgIndex, 1);
+        else
+            packages[pkgIndex] = pkg.source;
+        if (scope === "project")
+            this.settingsManager.setProjectPackages(packages);
+        else
+            this.settingsManager.setPackages(packages);
+    }
     renderCheckbox(item) {
+        if (item.resourceType === "skills") {
+            if (this.writeScope === "project") {
+                const state = this.getProjectSkillOverrideState(item);
+                if (state === "on")
+                    return theme.fg("success", "[+]");
+                if (state === "user-only")
+                    return theme.fg("accent", "[u]");
+                if (state === "off")
+                    return theme.fg("warning", "[-]");
+                if (state === "load") {
+                    const effectiveState = this.getSkillEffectiveState(item);
+                    if (effectiveState === "user-only")
+                        return theme.fg("accent", "[u]");
+                    if (effectiveState === "off")
+                        return theme.fg("warning", "[-]");
+                    return theme.fg("success", "[+]");
+                }
+                const inheritedState = this.getInheritedSkillEffectiveState(item);
+                return theme.fg("dim", inheritedState === "on" ? "[x]" : inheritedState === "user-only" ? "[u]" : "[ ]");
+            }
+            const state = this.getSkillEffectiveState(item);
+            if (state === "on")
+                return theme.fg("success", "[x]");
+            if (state === "user-only")
+                return theme.fg("accent", "[u]");
+            return theme.fg("dim", "[ ]");
+        }
         if (this.writeScope === "project") {
             const state = this.getProjectOverrideState(item);
             if (state === "load")
@@ -517,6 +627,21 @@ class ResourceList {
         return item.enabled ? theme.fg("success", "[x]") : theme.fg("dim", "[ ]");
     }
     getItemSuffix(item) {
+        if (item.resourceType === "skills") {
+            if (this.writeScope === "project") {
+                const state = this.getProjectSkillOverrideState(item);
+                if (state === "on")
+                    return theme.fg("muted", "  project on");
+                if (state === "user-only")
+                    return theme.fg("muted", "  project user only");
+                if (state === "off")
+                    return theme.fg("muted", "  project off");
+                if (state === "load")
+                    return theme.fg("muted", "  project load");
+                return this.isInheritedGlobalItem(item) ? theme.fg("dim", "  inherited global") : "";
+            }
+            return this.getSkillEffectiveState(item) === "user-only" ? theme.fg("accent", "  user only") : "";
+        }
         if (this.writeScope !== "project")
             return "";
         const state = this.getProjectOverrideState(item);
@@ -527,9 +652,51 @@ class ResourceList {
         return this.isInheritedGlobalItem(item) ? theme.fg("dim", "  inherited global") : "";
     }
     isDimmedItem(item) {
-        return (this.writeScope === "project" &&
-            this.isInheritedGlobalItem(item) &&
-            this.getProjectOverrideState(item) === "inherit");
+        if (this.writeScope !== "project" || !this.isInheritedGlobalItem(item))
+            return false;
+        return item.resourceType === "skills"
+            ? 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: this.skillInvocation.resolve(item.path, item.metadata, scopes),
+            frontmatterDisableModelInvocation: item.frontmatterDisableModelInvocation,
+        });
+    }
+    getInheritedSkillEffectiveState(item) {
+        return resolveSkillEffectiveState({
+            enabled: this.getInheritedEnabled(item),
+            invocationOverride: this.skillInvocation.resolve(item.path, item.metadata, ["user"]),
+            frontmatterDisableModelInvocation: item.frontmatterDisableModelInvocation,
+        });
+    }
+    getNextProjectSkillOverrideState(item) {
+        const states = ["on", "user-only", "off"];
+        const inheritedIndex = states.indexOf(this.getInheritedSkillEffectiveState(item));
+        const sequence = [...states.slice(inheritedIndex + 1), ...states.slice(0, inheritedIndex + 1)];
+        const current = this.getProjectSkillOverrideState(item);
+        if (current === "inherit")
+            return sequence[0];
+        if (current === "load")
+            return "inherit";
+        const currentIndex = sequence.indexOf(current);
+        return sequence[currentIndex + 1] ?? "inherit";
+    }
+    getProjectSkillOverrideState(item) {
+        if (this.writeScope !== "project")
+            return "inherit";
+        const loadState = this.getProjectOverrideState(item);
+        if (loadState === "unload")
+            return "off";
+        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;
     }
     setProjectResourceOverride(item, state) {
         return item.metadata.origin === "top-level"
@@ -567,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;
@@ -586,7 +753,8 @@ class ResourceList {
         if (state !== "inherit")
             updated.push(`${state === "load" ? "+" : "-"}${pattern}`);
         pkg[item.resourceType] = updated.length > 0 ? updated : undefined;
-        if (!RESOURCE_TYPES.some((key) => pkg[key] !== undefined)) {
+        if (!RESOURCE_TYPES.some((key) => pkg[key] !== undefined) &&
+            pkg.skillInvocationOverrides === undefined) {
             if (pkg.autoload === false)
                 packages.splice(pkgIndex, 1);
             else
@@ -616,14 +784,14 @@ 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)
             return "unload";
         let state = "inherit";
         for (const entry of entries) {
-            if (!patterns.has(this.getPatternEntryTarget(entry)))
+            if (!hasResourcePattern(patterns, this.getPatternEntryTarget(entry)))
                 continue;
             if (entry.startsWith("!") || entry.startsWith("-"))
                 state = "unload";
@@ -648,6 +816,13 @@ class ResourceList {
         ]);
         if (item.metadata.baseDir)
             patterns.add(relative(item.metadata.baseDir, item.path));
+        if (item.resourceType === "skills" && basename(item.path) === "SKILL.md") {
+            const parentDir = dirname(item.path);
+            patterns.add(parentDir);
+            patterns.add(relative(baseDir, parentDir));
+            if (item.metadata.baseDir)
+                patterns.add(relative(item.metadata.baseDir, parentDir));
+        }
         return patterns;
     }
     getResourcePatternForScope(item, scope) {
@@ -664,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;
@@ -702,6 +873,16 @@ class ResourceList {
         const baseDir = item.metadata.baseDir ?? dirname(item.path);
         return relative(baseDir, 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;
+    }
 }
 export class ConfigSelectorComponent extends Container {
     get focused() {