@compilr-dev/cli 0.8.9 → 0.9.0

package/dist/ui/overlay/impl/skills-overlay-v2.js

@@ -17,7 +17,7 @@
 import { promises as fs, readFileSync } from 'node:fs';
 import * as terminal from '../../terminal.js';
 import { TabbedListOverlayV2, BaseScreen, stay, popScreen, closeOverlay, isEscape, isCtrlC, isEnter, isUpArrow, isDownArrow, renderBorder, truncate, isPrintable, getPrintableChar, } from '../../base/index.js';
-import { isReservedSkillName, parseSkillMarkdown, loadSkillsFromDir, platformSkills, builtinSkills, validateSkillQuality, buildForkContent, buildNewSkillContent, } from '@compilr-dev/sdk';
+import { isReservedMacroName, parseSkillMarkdown, loadSkillsFromDir, buildMacroList, platformMacros, builtinSkills, validateSkillQuality, buildForkContent, buildNewSkillContent, skillReachability, patchSkillFrontmatter, } from '@compilr-dev/sdk';
 import { getSkillsDir, getSkillFolder, getSkillFile, ensureSkillsDir, readScopeConfig, writeScopeConfig, getScopeConfigPath, isValidSkillName, } from '../../../utils/skill-paths.js';
 // =============================================================================
 // Constants
@@ -27,7 +27,13 @@ const NAME_WIDTH = 24;
 const BODY_PREVIEW_LINES = 10;
 const SKILL_TABS = [
     { id: 'custom', label: 'Custom' },
-    { id: 'builtin', label: 'Built-in' },
+    /*
+      ⚠️ NO "Built-in" TAB. It listed MACROS — shipped prompts — inside a manager for SKILLS, which
+      are a different population with a different file format and a different way of being chosen.
+      Desktop removed the same section; a rule honoured in one host and not the other is a bug in
+      both. The macros have not gone: they are the fork source in "New skill → from a command",
+      which is where forking belongs, because forking is only ever the start of creating a skill.
+    */
     { id: 'bindings', label: 'Bindings' },
 ];
 // =============================================================================
@@ -62,7 +68,7 @@ async function loadCustomSkills(projectPath) {
                     name: skill.name,
                     description: skill.description,
                     scope: 'project',
-                    enabled: skill.enabled !== false,
+                    reach: skillReachability(skill),
                     issues,
                     skill,
                     filePath,
@@ -88,7 +94,7 @@ async function loadCustomSkills(projectPath) {
                 name: skill.name,
                 description: skill.description,
                 scope: 'user',
-                enabled: skill.enabled !== false,
+                reach: skillReachability(skill),
                 issues,
                 skill,
                 filePath,
@@ -104,32 +110,37 @@ async function loadCustomSkills(projectPath) {
     }
     return items;
 }
-function loadBuiltinSkills() {
-    const seen = new Set();
-    const items = [];
-    const addSkill = (skill) => {
-        if (seen.has(skill.name))
-            return;
-        seen.add(skill.name);
-        items.push({
-            name: skill.name,
-            description: skill.description,
-            scope: 'sdk',
-            enabled: true,
-            issues: [],
-            skill: null,
-            filePath: null,
-            bodyPreview: null,
-            boundCommands: [],
-        });
-    };
-    // SDK platform skills first (have updated descriptions)
-    for (const skill of platformSkills)
-        addSkill(skill);
-    // agents library built-in skills (deduplicated)
-    for (const skill of builtinSkills)
-        addSkill(skill);
-    return items;
+/**
+ * The shipped macros this tab offers.
+ *
+ * ⚠️ IT USED TO OFFER EIGHT IT CANNOT RUN. This walked `platformMacros` directly and added every
+ * one, including the canvas family — which `getSkillPrompt` REFUSES, because a terminal cannot
+ * draw a canvas. So the Built-in tab listed `canvas`, `infographic`, `carousel`, `board`,
+ * `canvas-styles` and the three reference ones, and selecting any of them got nothing. That is
+ * the same "offered, then answers Unknown command" defect the CLI had already fixed for
+ * disabled skills, in a second place nobody checked.
+ *
+ * It now asks the SDK, declaring what this host can render. The resolver's refusal and this
+ * list are therefore two consequences of one rule rather than two rules that can disagree.
+ */
+export function loadBuiltinMacros(projectPath, sources) {
+    return buildMacroList({
+        projectPath,
+        sources,
+        capabilities: { canvas: false },
+    })
+        .filter((entry) => !entry.label.startsWith('/'))
+        .map((entry) => ({
+        name: entry.id,
+        description: entry.description,
+        scope: 'sdk',
+        reach: { byModel: true, byUser: true },
+        issues: [],
+        skill: null,
+        filePath: null,
+        bodyPreview: null,
+        boundCommands: [],
+    }));
 }
 async function loadBindingItems() {
     const items = [];
@@ -142,7 +153,7 @@ async function loadBindingItems() {
                 name: skillName,
                 description: `/${cmd} → ${skillName}`,
                 scope: 'binding',
-                enabled: true,
+                reach: { byModel: true, byUser: true },
                 issues: [],
                 skill: null,
                 filePath: null,
@@ -180,20 +191,6 @@ function matchFrontmatter(content) {
     }
     return null;
 }
-function setEnabledFlag(content, enabled) {
-    const fm = matchFrontmatter(content);
-    if (!fm)
-        return content;
-    const fmLines = fm.frontmatter.split('\n');
-    const idx = fmLines.findIndex((l) => /^enabled\s*:/.test(l));
-    if (idx >= 0) {
-        fmLines[idx] = `enabled: ${String(enabled)}`;
-    }
-    else {
-        fmLines.push(`enabled: ${String(enabled)}`);
-    }
-    return ['---', ...fmLines, '---', fm.body].join('\n');
-}
 function replaceFrontmatterName(content, newName) {
     const fm = matchFrontmatter(content);
     if (!fm)
@@ -213,19 +210,32 @@ async function pathExists(p) {
 class NewSkillScreen extends BaseScreen {
     styles;
     onCreated;
-    phase = 'name';
+    macros;
+    phase = 'start';
+    route = 'blank';
     nameInput = '';
     selectedScope = 'project';
     error = '';
     hasProject;
-    constructor(styles, onCreated, hasProject) {
+    /** The macro being forked, or null for a blank skill. */
+    picked = null;
+    query = '';
+    pickIndex = 0;
+    constructor(styles, onCreated, hasProject, macros = []) {
         super();
         this.styles = styles;
         this.onCreated = onCreated;
+        this.macros = macros;
         this.hasProject = hasProject;
         if (!hasProject)
             this.selectedScope = 'user';
     }
+    get filtered() {
+        const q = this.query.trim().toLowerCase();
+        if (!q)
+            return this.macros;
+        return this.macros.filter((m) => m.name.toLowerCase().includes(q) || m.description.toLowerCase().includes(q));
+    }
     render() {
         const s = this.styles;
         const cols = terminal.getTerminalWidth();
@@ -234,7 +244,45 @@ class NewSkillScreen extends BaseScreen {
         lines.push(border);
         lines.push(`  ${s.primaryBold('New Skill')}`);
         lines.push('');
+        if (this.phase === 'start') {
+            lines.push(`  ${s.muted('Start from:')}`);
+            const rows = [
+                ['blank', 'Blank', 'an empty skill you write yourself'],
+                ['command', 'From a command', 'a copy of a built-in, yours to change'],
+            ];
+            for (const [id, label, hint] of rows) {
+                const on = this.route === id;
+                lines.push(`  ${on ? s.primary('> ') : '  '}${on ? s.primary(label) : s.muted(label)}  ${s.muted(`(${hint})`)}`);
+            }
+            lines.push('');
+            lines.push(`  ${s.muted('↑↓ Select · Enter to continue · Esc to cancel')}`);
+            lines.push(border);
+            return lines;
+        }
+        if (this.phase === 'pick') {
+            lines.push(`  ${s.muted('Which command? Type to filter.')}`);
+            lines.push(`  ${s.primary('> ')}${this.query}${s.primary('█')}`);
+            lines.push('');
+            const rows = this.filtered.slice(0, 8);
+            if (rows.length === 0) {
+                lines.push(`  ${s.muted('No command matches that.')}`);
+            }
+            for (const [i, m] of rows.entries()) {
+                const on = i === this.pickIndex;
+                const name = m.name.padEnd(18);
+                const desc = truncate(m.description.replace(/\s+/g, ' ').trim(), Math.max(10, cols - 26));
+                lines.push(`  ${on ? s.primary('> ') : '  '}${on ? s.primary(name) : s.muted(name)}${s.muted(desc)}`);
+            }
+            lines.push('');
+            lines.push(`  ${s.muted('↑↓ Select · Enter to choose · Esc to go back')}`);
+            lines.push(border);
+            return lines;
+        }
         if (this.phase === 'name') {
+            if (this.picked) {
+                lines.push(`  ${s.muted('Forking:')} ${s.secondary(this.picked)}`);
+                lines.push('');
+            }
             lines.push(`  ${s.muted('Name (lowercase letters, digits, hyphens):')}`);
             lines.push(`  ${s.primary('> ')}${this.nameInput}${s.primary('█')}`);
             if (this.error) {
@@ -264,8 +312,81 @@ class NewSkillScreen extends BaseScreen {
     handleKey(data) {
         if (isCtrlC(data))
             return closeOverlay({ dismissed: true });
-        if (isEscape(data))
+        if (isEscape(data)) {
+            // Esc steps BACK through the wizard rather than discarding it from the middle.
+            if (this.phase === 'pick') {
+                this.phase = 'start';
+                return stay(true);
+            }
+            if (this.phase === 'name' && this.route === 'command') {
+                this.phase = 'pick';
+                return stay(true);
+            }
+            if (this.phase === 'name') {
+                this.phase = 'start';
+                return stay(true);
+            }
+            if (this.phase === 'scope') {
+                this.phase = 'name';
+                return stay(true);
+            }
             return popScreen();
+        }
+        if (this.phase === 'start') {
+            if (isEnter(data)) {
+                if (this.route === 'blank') {
+                    this.picked = null;
+                    this.phase = 'name';
+                }
+                else {
+                    this.phase = 'pick';
+                    this.pickIndex = 0;
+                }
+                return stay(true);
+            }
+            if (isUpArrow(data) || isDownArrow(data)) {
+                this.route = this.route === 'blank' ? 'command' : 'blank';
+                return stay(true);
+            }
+            return stay(false);
+        }
+        if (this.phase === 'pick') {
+            const rows = this.filtered;
+            if (isEnter(data)) {
+                // Guarded on LENGTH, not on the element: `rows[i]` is not typed as possibly-undefined,
+                // so `if (!chosen)` lints as always-falsy while the empty list is entirely real.
+                if (rows.length === 0)
+                    return stay(false);
+                const chosen = rows[Math.min(this.pickIndex, rows.length - 1)];
+                this.picked = chosen.name;
+                /*
+                  ⚠️ THE FORK NAME MUST DIFFER FROM ITS SOURCE, or the copy shadows the built-in it came
+                  from. Seeded, not enforced here — the name phase validates it like any other.
+                */
+                this.nameInput = `${chosen.name}-custom`;
+                this.phase = 'name';
+                return stay(true);
+            }
+            if (isUpArrow(data)) {
+                this.pickIndex = Math.max(0, this.pickIndex - 1);
+                return stay(true);
+            }
+            if (isDownArrow(data)) {
+                this.pickIndex = Math.min(Math.max(0, Math.min(rows.length, 8) - 1), this.pickIndex + 1);
+                return stay(true);
+            }
+            if (data[0] === 127 || data[0] === 8) {
+                this.query = this.query.slice(0, -1);
+                this.pickIndex = 0;
+                return stay(true);
+            }
+            if (isPrintable(data)) {
+                this.query += getPrintableChar(data) ?? '';
+                this.pickIndex = 0;
+                return stay(true);
+            }
+            return stay(false);
+        }
         if (this.phase === 'name') {
             if (isEnter(data)) {
                 const name = this.nameInput.trim();
@@ -273,11 +394,15 @@ class NewSkillScreen extends BaseScreen {
                     this.error = 'Name cannot be empty.';
                     return stay(true);
                 }
+                if (this.picked !== null && name === this.picked) {
+                    this.error = 'A fork must be named differently from the command it copies.';
+                    return stay(true);
+                }
                 if (!isValidSkillName(name)) {
                     this.error = 'Use lowercase letters, digits, and hyphens only.';
                     return stay(true);
                 }
-                if (isReservedSkillName(name)) {
+                if (isReservedMacroName(name)) {
                     this.error = `'${name}' is reserved by SDK. Use a different name.`;
                     return stay(true);
                 }
@@ -301,7 +426,7 @@ class NewSkillScreen extends BaseScreen {
         }
         // Scope selection phase
         if (isEnter(data)) {
-            void this.onCreated(this.nameInput.trim(), this.selectedScope);
+            void this.onCreated(this.nameInput.trim(), this.selectedScope, this.picked);
             return popScreen();
         }
         if (isUpArrow(data) || isDownArrow(data)) {
@@ -324,7 +449,7 @@ class NewSkillScreen extends BaseScreen {
         return stay(false);
     }
     getMinHeight() {
-        return 12;
+        return this.phase === 'pick' ? 18 : 12;
     }
 }
 // =============================================================================
@@ -377,7 +502,7 @@ class RenameScreen extends BaseScreen {
                 this.error = 'Use lowercase letters, digits, and hyphens only.';
                 return stay(true);
             }
-            if (isReservedSkillName(name)) {
+            if (isReservedMacroName(name)) {
                 this.error = `'${name}' is reserved by SDK.`;
                 return stay(true);
             }
@@ -448,111 +573,6 @@ class DeleteConfirmScreen extends BaseScreen {
         return 8;
     }
 }
-// =============================================================================
-// Unbind Confirmation Screen
-// =============================================================================
-// UnbindConfirmScreen removed — replaced by SkillBindingScreen
-// =============================================================================
-// Fork Screen (for SDK skills)
-// =============================================================================
-class ForkScreen extends BaseScreen {
-    sdkSkillName;
-    styles;
-    onForked;
-    nameInput;
-    selectedScope = 'project';
-    error = '';
-    hasProject;
-    constructor(sdkSkillName, styles, hasProject, onForked) {
-        super();
-        this.sdkSkillName = sdkSkillName;
-        this.styles = styles;
-        this.onForked = onForked;
-        this.hasProject = hasProject;
-        this.nameInput = sdkSkillName + '-custom';
-        if (!hasProject)
-            this.selectedScope = 'user';
-    }
-    render() {
-        const s = this.styles;
-        const cols = terminal.getTerminalWidth();
-        const border = renderBorder(cols, s);
-        const lines = [];
-        lines.push(border);
-        lines.push(`  ${s.primaryBold('Fork SDK Skill')}`);
-        lines.push(`  ${s.muted('Source:')} ${s.secondary(this.sdkSkillName)} ${s.muted('(SDK)')}`);
-        lines.push('');
-        lines.push(`  ${s.muted('New name (must be different from SDK name):')}`);
-        lines.push(`  ${s.primary('> ')}${this.nameInput}${s.primary('█')}`);
-        if (this.error) {
-            lines.push(`  ${s.warning(this.error)}`);
-        }
-        lines.push('');
-        lines.push(`  ${s.muted('Scope:')}`);
-        if (this.hasProject) {
-            const pCursor = this.selectedScope === 'project' ? s.primary('> ') : '  ';
-            const pLabel = this.selectedScope === 'project' ? s.primary('project') : s.muted('project');
-            lines.push(`  ${pCursor}${pLabel}`);
-        }
-        const uCursor = this.selectedScope === 'user' ? s.primary('> ') : '  ';
-        const uLabel = this.selectedScope === 'user' ? s.primary('user') : s.muted('user');
-        lines.push(`  ${uCursor}${uLabel}`);
-        lines.push('');
-        lines.push(`  ${s.muted('Tab Switch scope · Enter Fork · Esc Cancel')}`);
-        lines.push(border);
-        return lines;
-    }
-    handleKey(data) {
-        if (isCtrlC(data))
-            return closeOverlay({ dismissed: true });
-        if (isEscape(data))
-            return popScreen();
-        if (isEnter(data)) {
-            const name = this.nameInput.trim();
-            if (!name) {
-                this.error = 'Name cannot be empty.';
-                return stay(true);
-            }
-            if (!isValidSkillName(name)) {
-                this.error = 'Use lowercase letters, digits, and hyphens.';
-                return stay(true);
-            }
-            if (isReservedSkillName(name)) {
-                this.error = `'${name}' is reserved. Choose a different name.`;
-                return stay(true);
-            }
-            if (name === this.sdkSkillName) {
-                this.error = 'Fork name must differ from SDK name.';
-                return stay(true);
-            }
-            void this.onForked(name, this.selectedScope);
-            return popScreen();
-        }
-        // Tab to switch scope
-        if (data[0] === 0x09 && this.hasProject) {
-            this.selectedScope = this.selectedScope === 'project' ? 'user' : 'project';
-            return stay(true);
-        }
-        if (isUpArrow(data) || isDownArrow(data)) {
-            if (this.hasProject) {
-                this.selectedScope = this.selectedScope === 'project' ? 'user' : 'project';
-            }
-            return stay(true);
-        }
-        if (data[0] === 127 || data[0] === 8) {
-            this.nameInput = this.nameInput.slice(0, -1);
-            this.error = '';
-            return stay(true);
-        }
-        if (isPrintable(data)) {
-            this.nameInput += getPrintableChar(data) ?? '';
-            this.error = '';
-            return stay(true);
-        }
-        return stay(false);
-    }
-    getMinHeight() { return 14; }
-}
 class SkillBindingScreen extends BaseScreen {
     skillName;
     styles;
@@ -774,6 +794,7 @@ export class SkillsOverlayV2 extends TabbedListOverlayV2 {
     id = 'skills-overlay-v2';
     allItems = [];
     projectPath;
+    skillSources;
     onOpenDetail;
     constructor(options) {
         const projectPath = options.projectPath;
@@ -789,8 +810,6 @@ export class SkillsOverlayV2 extends TabbedListOverlayV2 {
             filterByTab: (item, tabId) => {
                 if (tabId === 'custom')
                     return item.scope !== 'sdk' && item.scope !== 'binding';
-                if (tabId === 'builtin')
-                    return item.scope === 'sdk';
                 if (tabId === 'bindings')
                     return item.scope === 'binding';
                 return true;
@@ -820,7 +839,19 @@ export class SkillsOverlayV2 extends TabbedListOverlayV2 {
                     ? styles.primary(nameText)
                     : styles.muted(nameText);
                 // Disabled indicator
-                const disabledTag = !item.enabled && isCustom ? styles.warning(' OFF') : '';
+                /*
+                  ⚠️ THE REAL STATE, NOT A BOOLEAN. "OFF" could not distinguish a shelved skill from one an
+                  agent may still choose on its own — two different files that behave differently.
+                */
+                const disabledTag = !isCustom
+                    ? ''
+                    : !item.reach.byModel && !item.reach.byUser
+                        ? styles.warning(' SHELVED')
+                        : !item.reach.byUser
+                            ? styles.muted(' agents only')
+                            : !item.reach.byModel
+                                ? styles.muted(' /name only')
+                                : '';
                 // Scope badge
                 let scopeBadge;
                 if (item.scope === 'project')
@@ -830,7 +861,9 @@ export class SkillsOverlayV2 extends TabbedListOverlayV2 {
                 else
                     scopeBadge = styles.muted('[sdk]');
                 // Description
-                const badgeLen = item.scope.length + 2 + (disabledTag ? 4 : 0);
+                // eslint-disable-next-line no-control-regex
+                const tagLen = disabledTag.replace(/\u001b\[[0-9;]*m/g, '').length;
+                const badgeLen = item.scope.length + 2 + tagLen;
                 const descWidth = Math.max(10, cols - NAME_WIDTH - badgeLen - 14);
                 const desc = truncate(item.description.replace(/\s+/g, ' ').trim(), descWidth);
                 const descColor = isSelected ? styles.secondary(desc) : styles.muted(desc);
@@ -845,18 +878,16 @@ export class SkillsOverlayV2 extends TabbedListOverlayV2 {
                 if (searchMode) {
                     return 'Type to filter · ↑↓/jk Navigate · Enter · Esc Exit search';
                 }
-                if (activeTabId === 'builtin') {
-                    return '←→ Tab · ↑↓/jk · / Search · f Fork · q/Esc Close';
-                }
                 if (activeTabId === 'bindings') {
                     return '←→ Tab · ↑↓/jk · / Search · Enter Manage · d Remove · q/Esc Close';
                 }
-                return '←→ Tab · ↑↓/jk · / Search · Enter Open · n New · b Bindings · Space On/Off · d Del · q/Esc';
+                return '←→ Tab · ↑↓/jk · / Search · Enter Open · n New · b Bindings · Space Shelve · d Del · q/Esc';
             },
             emptyMessage: 'No custom skills yet. Press n to create one.',
             noResultsMessage: 'No skills match the search.',
         });
         this.projectPath = projectPath;
+        this.skillSources = options.skillSources;
         this.onOpenDetail = options.onOpenDetail;
         overlayRef = this; // eslint-disable-line @typescript-eslint/no-this-alias
     }
@@ -865,7 +896,6 @@ export class SkillsOverlayV2 extends TabbedListOverlayV2 {
      */
     async loadItems() {
         const custom = await loadCustomSkills(this.projectPath);
-        const builtin = loadBuiltinSkills();
         const bindings = await loadBindingItems();
         // Sort: project first, then user (within custom), all alphabetical
         custom.sort((a, b) => {
@@ -873,17 +903,14 @@ export class SkillsOverlayV2 extends TabbedListOverlayV2 {
                 return a.scope === 'project' ? -1 : 1;
             return a.name.localeCompare(b.name);
         });
-        builtin.sort((a, b) => a.name.localeCompare(b.name));
         bindings.sort((a, b) => (a.bindingCommand ?? '').localeCompare(b.bindingCommand ?? ''));
-        this.allItems = [...custom, ...builtin, ...bindings];
+        this.allItems = [...custom, ...bindings];
         this.state.items = this.allItems;
         // Re-filter: apply tab filter based on current tab index
         const tabId = SKILL_TABS[this.state.currentTab]?.id ?? 'custom';
         this.state.filteredItems = this.allItems.filter((item) => {
             if (tabId === 'custom')
                 return item.scope !== 'sdk' && item.scope !== 'binding';
-            if (tabId === 'builtin')
-                return item.scope === 'sdk';
             if (tabId === 'bindings')
                 return item.scope === 'binding';
             return true;
@@ -922,20 +949,27 @@ export class SkillsOverlayV2 extends TabbedListOverlayV2 {
         const ch = isPrintable(data) ? (getPrintableChar(data) ?? '') : '';
         // n — new skill
         if (ch === 'n') {
-            const screen = new NewSkillScreen(this.getStyles(), async (name, scope) => {
-                await this.createSkill(name, scope);
-            }, !!this.projectPath);
+            const screen = new NewSkillScreen(this.getStyles(), 
+            /*
+              ⚠️ `forkOf` MUST BE NAMED HERE. A callback written `(name, scope)` satisfies this
+              signature — TypeScript accepts fewer parameters — so dropping it compiles cleanly and
+              silently turns every fork into a blank skill.
+            */
+            async (name, scope, forkOf) => {
+                if (forkOf !== null)
+                    await this.forkSkill(forkOf, name, scope);
+                else
+                    await this.createSkill(name, scope);
+            }, !!this.projectPath, 
+            // The same list the Built-in tab used to show, and the same rule about what this host runs.
+            loadBuiltinMacros(this.projectPath, this.skillSources).map((m) => ({
+                name: m.name,
+                description: m.description,
+            })));
             return { handled: true, pushScreen: screen };
         }
         if (!selectedItem)
             return { handled: false };
-        // f — fork (SDK skills only)
-        if (ch === 'f' && selectedItem.scope === 'sdk') {
-            const screen = new ForkScreen(selectedItem.name, this.getStyles(), !!this.projectPath, async (newName, scope) => {
-                await this.forkSkill(selectedItem.name, newName, scope);
-            });
-            return { handled: true, pushScreen: screen };
-        }
         // b — open binding screen (custom skills only)
         if (ch === 'b' && selectedItem.scope !== 'sdk' && selectedItem.scope !== 'binding') {
             const screen = new SkillBindingScreen(selectedItem.name, this.getStyles(), async () => {
@@ -1005,14 +1039,33 @@ export class SkillsOverlayV2 extends TabbedListOverlayV2 {
         await this.loadItems();
         this.requestRender();
     }
+    /**
+     * Shelve a skill, or bring it back.
+     *
+     * ⚠️ WRITES THE TWO ANTHROPIC SWITCHES AND REMOVES THE LEGACY KEY (D-1), THROUGH THE SDK'S
+     * PATCHER RATHER THAN A REGEX (D-2). The old version rewrote frontmatter line by line, which
+     * destroys comments — measured on our own template: 17 lines to 7, all 9 comment lines to 0.
+     *
+     * One key for two switches is lossy by construction: a skill set to "agents only" in Desktop is
+     * shelved and then restored to BOTH. That is why the list renders the real state beside the name
+     * — the flattening is visible, not silent — and why the two-switch editor lives in the host that
+     * has a document to put it in.
+     */
     async toggleSkill(item) {
         if (!item.filePath)
             return;
+        const shelved = !item.reach.byModel && !item.reach.byUser;
+        const next = shelved
+            ? { byModel: true, byUser: true }
+            : { byModel: false, byUser: false };
         const content = await fs.readFile(item.filePath, 'utf-8');
-        const newEnabled = !item.enabled;
-        const updated = setEnabledFlag(content, newEnabled);
-        await fs.writeFile(item.filePath, updated);
-        item.enabled = newEnabled;
+        await fs.writeFile(item.filePath, patchSkillFrontmatter(content, {
+            'disable-model-invocation': next.byModel ? null : true,
+            'user-invocable': next.byUser ? null : false,
+            // The legacy key is deleted on every write, so a file touched here stops carrying it.
+            enabled: null,
+        }));
+        item.reach = next;
     }
     async deleteSkill(item) {
         if (item.scope === 'sdk')
@@ -1056,7 +1109,7 @@ export class SkillsOverlayV2 extends TabbedListOverlayV2 {
         if (await pathExists(folder))
             return;
         // Find the SDK skill
-        const allSdk = [...platformSkills, ...builtinSkills];
+        const allSdk = [...platformMacros, ...builtinSkills];
         const sdkSkill = allSdk.find((s) => s.name === sdkName);
         if (!sdkSkill)
             return;

package/dist/ui/overlay/impl/team-overlay-v2.d.ts

@@ -23,7 +23,6 @@ interface TeamMemberItem {
     isCoordinator: boolean;
     hasToolRestrictions: boolean;
     toolProfile?: string;
-    enabledSkills?: string[];
     modelTier?: ModelTier;
     modelId?: string;
     isMember: true;
@@ -67,7 +66,7 @@ interface TeamOverlayOptions {
     onAgentSwitch?: (agentId: string) => Promise<void>;
 }
 export interface TeamOverlayV2Result {
-    action?: 'switch' | 'add' | 'remove' | 'compact' | 'create-custom' | 'change-tier';
+    action?: 'switch' | 'add' | 'remove' | 'compact' | 'create-custom' | 'change-tier' | 'edit';
     agentId?: string;
     role?: AgentRole;
     customId?: string;