@astralyn/pi 1.4.10 → 1.5.0

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

@@ -1,16 +1,15 @@
 /**
  * TUI component for managing package resources (enable/disable)
  */
-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 { readSkillDisableModelInvocation } from "../../../core/skills.js";
+import { BUILTIN_PATH_PREFIX, getResourcePathKey } from "../../../core/source-info.js";
+import { isLocalPath, resolvePath, shortenHomePath } from "../../../utils/paths.js";
 import { theme } from "../theme/theme.js";
+import { collapsePackageEntry, SkillRows } from "./config-selector-skills.js";
 import { DynamicBorder } from "./dynamic-border.js";
 import { keyHint, rawKeyHint } from "./keybinding-hints.js";
 function hasResourcePattern(patterns, pattern) {
@@ -21,11 +20,6 @@ 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",
     skills: "Skills",
@@ -33,19 +27,7 @@ const RESOURCE_TYPE_LABELS = {
     themes: "Themes",
 };
 function formatBaseDir(baseDir) {
-    const homeDir = homedir();
-    let displayPath;
-    if (baseDir === homeDir) {
-        displayPath = "~";
-    }
-    else if (baseDir.startsWith(homeDir)) {
-        // Replace home prefix with ~, normalize separators for display
-        const rest = baseDir.slice(homeDir.length);
-        displayPath = `~${rest.replace(/\\/g, "/")}`;
-    }
-    else {
-        displayPath = baseDir.replace(/\\/g, "/");
-    }
+    const displayPath = shortenHomePath(baseDir).replace(/\\/g, "/");
     return displayPath.endsWith("/") ? displayPath : `${displayPath}/`;
 }
 function getGroupLabel(metadata, agentDir) {
@@ -190,7 +172,16 @@ class ResourceList {
         this.writeScope = writeScope;
         this.inheritedEnabledByKey = this.buildInheritedEnabledMap(groupsByScope.global);
         this.packageManager = new DefaultPackageManager({ cwd, agentDir, settingsManager });
-        this.skillInvocation = new SkillInvocationPolicy(settingsManager, this.packageManager);
+        this.skills = new SkillRows({
+            writeScope: () => this.writeScope,
+            getProjectOverrideState: (item) => this.getProjectOverrideState(item),
+            setProjectResourceOverride: (item, state) => this.setProjectResourceOverride(item, state),
+            setGlobalEnabled: (item, enabled) => item.metadata.origin === "top-level"
+                ? this.toggleTopLevelResource(item, enabled)
+                : this.togglePackageResource(item, enabled),
+            getInheritedEnabled: (item) => this.getInheritedEnabled(item),
+            isInheritedGlobalItem: (item) => this.isInheritedGlobalItem(item),
+        }, 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;
@@ -418,18 +409,8 @@ 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 (item.resourceType === "skills")
+            return this.skills.toggle(item);
         if (this.writeScope === "project") {
             const state = this.getNextOverrideState(item);
             if (!this.setProjectResourceOverride(item, state))
@@ -541,81 +522,9 @@ 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 (item.resourceType === "skills")
+            return this.skills.checkbox(item);
         if (this.writeScope === "project") {
             const state = this.getProjectOverrideState(item);
             if (state === "load")
@@ -627,21 +536,8 @@ 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 (item.resourceType === "skills")
+            return this.skills.suffix(item);
         if (this.writeScope !== "project")
             return "";
         const state = this.getProjectOverrideState(item);
@@ -652,51 +548,11 @@ class ResourceList {
         return this.isInheritedGlobalItem(item) ? theme.fg("dim", "  inherited global") : "";
     }
     isDimmedItem(item) {
-        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;
+        if (item.resourceType === "skills")
+            return this.skills.dimmed(item);
+        return (this.writeScope === "project" &&
+            this.isInheritedGlobalItem(item) &&
+            this.getProjectOverrideState(item) === "inherit");
     }
     setProjectResourceOverride(item, state) {
         return item.metadata.origin === "top-level"
@@ -734,7 +590,7 @@ class ResourceList {
     }
     setProjectPackageOverride(item, state) {
         const packages = [...(this.settingsManager.getProjectSettings().packages ?? [])];
-        let pkgIndex = packages.findIndex((pkg) => this.isSamePackage(item.metadata.source, this.getItemScope(item), typeof pkg === "string" ? pkg : pkg.source, "project"));
+        let pkgIndex = packages.findIndex((pkg) => this.packageSourceStringMatches(item.metadata.source, this.getItemScope(item), typeof pkg === "string" ? pkg : pkg.source, "project"));
         if (pkgIndex === -1) {
             if (state === "inherit")
                 return false;
@@ -753,13 +609,7 @@ 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) &&
-            pkg.skillInvocationOverrides === undefined) {
-            if (pkg.autoload === false)
-                packages.splice(pkgIndex, 1);
-            else
-                packages[pkgIndex] = pkg.source;
-        }
+        collapsePackageEntry(packages, pkgIndex, "project");
         this.settingsManager.setProjectPackages(packages);
         return true;
     }
@@ -840,7 +690,7 @@ class ResourceList {
         return { source: relative(this.getTopLevelBaseDir("project"), sourcePath) || ".", autoload: false };
     }
     /** 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) {
+    packageSourceStringMatches(leftSource, leftScope, rightSource, rightScope) {
         return (this.packageManager.getPackageIdentity(leftSource, leftScope) ===
             this.packageManager.getPackageIdentity(rightSource, rightScope));
     }
@@ -848,13 +698,13 @@ class ResourceList {
         const settings = targetScope === "project"
             ? this.settingsManager.getProjectSettings()
             : this.settingsManager.getGlobalSettings();
-        return (settings.packages ?? []).find((pkg) => this.isSamePackage(item.metadata.source, this.getItemScope(item), typeof pkg === "string" ? pkg : pkg.source, targetScope));
+        return (settings.packages ?? []).find((pkg) => this.packageSourceStringMatches(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;
     }
     getResourceItemKey(item) {
-        return `${item.resourceType}:${canonicalizePath(item.path)}`;
+        return `${item.resourceType}:${getResourcePathKey(item.path)}`;
     }
     getItemScope(item) {
         return item.metadata.scope === "project" ? "project" : "user";