@compilr-dev/cli 0.6.6 → 0.7.0

package/dist/commands-v2/handlers/core.js

@@ -65,7 +65,16 @@ export const helpCommand = {
         'Esc to go back or close',
     ],
     async execute(_args, ctx) {
-        const helpOverlay = new HelpOverlayV2({ getHelpCommands, getCommand });
+        const { getSkillAutocompleteEntries } = await import('../../repl-helpers.js');
+        const helpOverlay = new HelpOverlayV2({
+            getHelpCommands,
+            getCommand,
+            getSkillEntries: () => getSkillAutocompleteEntries().map((e) => ({
+                command: e.command,
+                description: e.description,
+                isBinding: e.description.includes('binding'),
+            })),
+        });
         await ctx.ui.showOverlay(helpOverlay);
         return true;
     },

package/dist/commands-v2/handlers/index.d.ts

@@ -23,4 +23,5 @@ export * from './notifications.js';
 export * from './mcp.js';
 export * from './delegations.js';
 export * from './perf.js';
+export * from './skill.js';
 export declare const allCommands: CommandHandlerV2[];

package/dist/commands-v2/handlers/index.js

@@ -22,6 +22,7 @@ import { notificationsCommands } from './notifications.js';
 import { mcpCommands } from './mcp.js';
 import { delegationsCommands } from './delegations.js';
 import { perfCommands } from './perf.js';
+import { skillCommands } from './skill.js';
 // Re-export individual modules
 export * from './core.js';
 export * from './settings.js';
@@ -42,6 +43,7 @@ export * from './notifications.js';
 export * from './mcp.js';
 export * from './delegations.js';
 export * from './perf.js';
+export * from './skill.js';
 // All commands combined
 export const allCommands = [
     ...coreCommands,
@@ -63,4 +65,5 @@ export const allCommands = [
     ...mcpCommands,
     ...delegationsCommands,
     ...perfCommands,
+    ...skillCommands,
 ];

package/dist/commands-v2/handlers/settings.js

@@ -119,8 +119,8 @@ export const verboseCommand = {
 // =============================================================================
 export const modelCommand = {
     name: 'model',
-    description: 'Change AI model',
-    details: 'Opens the model selector overlay. Choose from Claude, OpenAI, Gemini, or Ollama models. Changes within the same provider apply immediately; switching providers requires restart.',
+    description: 'Change AI model for the active agent',
+    details: 'Opens the model selector for the active agent. Changing the model takes effect immediately on the next message. Settings model (via /config) is the template for new agents only.',
     examples: [{ code: '/model' }],
     interactions: [
         'Tab/Shift+Tab to switch providers',
@@ -131,15 +131,31 @@ export const modelCommand = {
         'Esc to go back/close',
     ],
     async execute(_args, ctx) {
-        const currentModel = getSetting('defaultModel') ?? undefined;
+        // Use the active agent's current model, not the settings default
+        const agent = ctx.agent;
+        const agentModel = agent ? agent.getModel() : undefined;
+        const currentModel = agentModel ?? getSetting('defaultModel') ?? undefined;
         const currentProvider = getSetting('defaultProvider');
         const modelOverlay = new ModelOverlayV2({
             currentModel: currentModel ?? undefined,
             currentProvider: currentProvider === 'auto' ? undefined : currentProvider,
         });
         await ctx.ui.showOverlay(modelOverlay);
-        // Model changes are handled in the detail screen via setSetting()
-        // No need to process result here
+        // After overlay closes, check if the model changed (overlay calls setSetting)
+        // Apply it to the active agent immediately via setModel()
+        if (agent) {
+            const newModel = getSetting('defaultModel');
+            if (newModel && newModel !== agentModel) {
+                try {
+                    agent.setModel(newModel);
+                    const agentId = ctx.team ? ctx.team.getActive().id : 'default';
+                    ctx.ui.print({ type: 'success', message: `Model changed: $${agentId} now using ${newModel}` });
+                }
+                catch (err) {
+                    ctx.ui.print({ type: 'error', message: `Failed to change model: ${err instanceof Error ? err.message : String(err)}` });
+                }
+            }
+        }
         return true;
     },
 };

package/dist/commands-v2/handlers/skill.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Custom Skills command handler
+ *
+ * Opens the Skills overlay (TabbedListOverlayV2) for browsing, creating,
+ * editing, and managing custom skills.
+ *
+ * Spec: project-docs/00-requirements/compilr-dev-cli/skills-overlay-spec.md
+ */
+import type { CommandHandlerV2 } from '../types.js';
+export declare const skillCommands: CommandHandlerV2[];

package/dist/commands-v2/handlers/skill.js

@@ -0,0 +1,63 @@
+/**
+ * Custom Skills command handler
+ *
+ * Opens the Skills overlay (TabbedListOverlayV2) for browsing, creating,
+ * editing, and managing custom skills.
+ *
+ * Spec: project-docs/00-requirements/compilr-dev-cli/skills-overlay-spec.md
+ */
+import { promises as fs } from 'node:fs';
+import { SkillsOverlayV2 } from '../../ui/overlay/impl/skills-overlay-v2.js';
+import { SkillDetailOverlayV2 } from '../../ui/overlay/impl/skill-detail-overlay-v2.js';
+import { getCurrentProject } from '../../tools/project-db.js';
+const skillCommand = {
+    name: 'skill',
+    aliases: ['skills'],
+    description: 'Manage custom and built-in skills',
+    details: 'Browse, create, edit, and manage user-authored skills. Skills are ' +
+        'folders with SKILL.md (Anthropic Agent Skills format). Custom skills ' +
+        'can be scoped to a project or user. Built-in SDK skills are read-only.',
+    examples: [
+        { code: '/skill', description: 'Open Skills overlay' },
+        { code: '/skills', description: 'Alias for /skill' },
+    ],
+    interactions: [
+        '←→ Switch tabs (Custom / Built-in)',
+        '↑↓ or j/k Navigate skills',
+        'Enter Open skill (view/edit/diff)',
+        'n Create new skill',
+        'f Fork SDK skill',
+        'b Bind slash command',
+        'u Unbind slash command',
+        'Space Enable/disable skill',
+        'd Delete skill',
+        'r Rename skill',
+        '/ Search skills',
+        'q/Esc Close',
+    ],
+    async execute(_args, ctx) {
+        const project = getCurrentProject();
+        const overlay = new SkillsOverlayV2({
+            projectPath: project?.path ?? undefined,
+            onOpenDetail: async (filePath, skillName, scope, forkedFrom, boundCommands) => {
+                const content = await fs.readFile(filePath, 'utf-8');
+                const detail = new SkillDetailOverlayV2({
+                    filePath,
+                    skillName,
+                    scope,
+                    content,
+                    forkedFrom,
+                    boundCommands,
+                });
+                await ctx.ui.showOverlay(detail);
+                // The overlay was shown and closed — assume modified if content was changed
+                return true;
+            },
+        });
+        // Load items async before showing
+        await overlay.loadItems();
+        await ctx.ui.showOverlay(overlay);
+        return true;
+    },
+};
+export const skillCommands = [skillCommand];

package/dist/commands-v2/index.d.ts

@@ -4,7 +4,7 @@
  * Command system for the new TerminalUI-based REPL.
  */
 export type { CommandContextV2, CommandHandlerV2, CommandResultV2, CommandExample } from './types.js';
-export { registerCommand, registerCommands, getCommand, executeCommand, getCommandNames, hasCommand, clearCommands, getAutocompleteCommands, getHelpCommands, } from './registry.js';
+export { registerCommand, registerCommands, getCommand, executeCommand, getCommandNames, hasCommand, clearCommands, getAutocompleteCommands, getHelpCommands, setSkillCommandLoader, } from './registry.js';
 export { allCommands } from './handlers/index.js';
 export { coreCommands } from './handlers/core.js';
 export { settingsCommands } from './handlers/settings.js';

package/dist/commands-v2/index.js

@@ -4,7 +4,7 @@
  * Command system for the new TerminalUI-based REPL.
  */
 // Registry
-export { registerCommand, registerCommands, getCommand, executeCommand, getCommandNames, hasCommand, clearCommands, getAutocompleteCommands, getHelpCommands, } from './registry.js';
+export { registerCommand, registerCommands, getCommand, executeCommand, getCommandNames, hasCommand, clearCommands, getAutocompleteCommands, getHelpCommands, setSkillCommandLoader, } from './registry.js';
 // All handlers
 export { allCommands } from './handlers/index.js';
 // Individual handler modules (for selective imports)

package/dist/commands-v2/registry.d.ts

@@ -43,6 +43,10 @@ export declare function getAutocompleteCommands(): {
     command: string;
     description: string;
 }[];
+export declare function setSkillCommandLoader(loader: () => {
+    command: string;
+    description: string;
+}[]): void;
 /**
  * Get all commands formatted for help display.
  */

package/dist/commands-v2/registry.js

@@ -84,6 +84,7 @@ export function clearCommands() {
  */
 export function getAutocompleteCommands() {
     const commands = [];
+    const seen = new Set();
     for (const [name, handler] of handlers) {
         // Skip internal commands (tools, debug commands with underscores/camelCase)
         if (name.includes('_') || /[A-Z]/.test(name))
@@ -92,9 +93,27 @@ export function getAutocompleteCommands() {
             command: `/${name}`,
             description: handler.description,
         });
+        seen.add(name);
+    }
+    // Append custom skills and bindings (if loader is registered)
+    if (skillCommandLoader) {
+        for (const { command, description } of skillCommandLoader()) {
+            if (!seen.has(command)) {
+                commands.push({ command: `/${command}`, description });
+                seen.add(command);
+            }
+        }
     }
     return commands.sort((a, b) => a.command.localeCompare(b.command));
 }
+/**
+ * Register a callback that provides custom skill names + bound commands
+ * for autocomplete. Set by the REPL on startup.
+ */
+let skillCommandLoader = null;
+export function setSkillCommandLoader(loader) {
+    skillCommandLoader = loader;
+}
 /**
  * Get all commands formatted for help display.
  */

package/dist/index.js

@@ -18,6 +18,7 @@ import { getModelForTier, getProviderMetadata } from './models/index.js';
 import { ReplV2 } from './repl-v2.js';
 import { AgentTeam, setActiveSharedContext } from './multi-agent/index.js';
 import { getStyles } from './themes/index.js';
+import { getDefaultModelForTier } from './models/index.js';
 import { getDefaultProvider, getDefaultModel as getDefaultModelSetting, getProjectStartupMode, getLastProjectId, isCheckUpdatesEnabled, getLastUpdateCheck, recordUpdateCheck, isFirstRunComplete, setSetting, getSetting } from './settings/index.js';
 import { checkForUpdates, performUpdate } from './utils/update-checker.js';
 import { showAskUserSimpleOverlay } from './ui/ask-user-simple-overlay.js';
@@ -938,18 +939,13 @@ function detectProvider() {
     return 'claude';
 }
 function getDefaultModel(provider) {
-    switch (provider) {
-        case 'claude':
-            return 'claude-sonnet-4-6';
-        case 'openai':
-            return 'gpt-5-mini-2025-08-07';
-        case 'gemini':
-            return 'gemini-3-flash-preview';
-        case 'ollama':
-            return 'llama3.2:8b';
-        default:
-            return 'claude-sonnet-4-6';
-    }
+    // Dynamic lookup from MODEL_REGISTRY (via SDK) — never goes stale
+    const model = getDefaultModelForTier(provider, 'balanced');
+    if (model)
+        return model.id;
+    // Fallback to any supported model for this provider
+    const anyModel = getDefaultModelForTier(provider, 'fast') ?? getDefaultModelForTier(provider, 'powerful');
+    return anyModel?.id ?? 'claude-sonnet-4-6';
 }
 // =============================================================================
 // Run

package/dist/repl-helpers.d.ts

@@ -39,9 +39,37 @@ export declare function detectCompilrProject(): CompilrProjectInfo;
  */
 export declare function hasBacklogItems(backlogPath: string | null): boolean;
 /**
- * Get skill prompt by name from builtinSkills or codingSkills.
+ * Get skill prompt by name. Delegates to SDK resolveSkillPrompt.
  */
 export declare function getSkillPrompt(name: string): string | null;
+/**
+ * Richer version of getSkillPrompt that returns attribution metadata.
+ * Used by the REPL to show binding/fork info in chat.
+ */
+export declare function getSkillResolution(name: string): {
+    prompt: string;
+    skillName: string;
+    isBound: boolean;
+    forkedFrom?: import('@compilr-dev/sdk').ForkedFromMarker;
+} | null;
+/**
+ * Get autocomplete entries for custom skills + bound commands.
+ * Delegates to SDK getAllAvailableSkills.
+ */
+export declare function getSkillAutocompleteEntries(): {
+    command: string;
+    description: string;
+}[];
+/**
+ * Check for user/project skills that collide with SDK reserved names.
+ * Shows a one-time warning at startup if collisions are found.
+ */
+export declare function checkSkillCollisions(ui: {
+    print: (msg: {
+        type: 'warning';
+        message: string;
+    }) => void;
+}): void;
 /**
  * Select the best backlog item to build.
  * If requestedId is provided, finds that specific item.

package/dist/repl-helpers.js

@@ -5,7 +5,9 @@
  * and improve maintainability. These functions support the REPL but don't
  * depend on REPL instance state.
  */
-import { builtinSkills, platformSkills } from '@compilr-dev/sdk';
+import { detectCollisions, formatCollisionWarnings, resolveSkillPrompt, getAllAvailableSkills } from '@compilr-dev/sdk';
+import { getSkillsDir } from './utils/skill-paths.js';
+import { getProjectPath } from './utils/project-status.js';
 import { codingSkills } from '@compilr-dev/agents-coding';
 import { factorySkills } from '@compilr-dev/factory';
 import * as fs from 'fs';
@@ -199,15 +201,83 @@ export function hasBacklogItems(backlogPath) {
         return false;
     }
 }
+/** Get the current project directory (best effort). */
+function getProjectDir() {
+    try {
+        return getProjectPath(process.cwd());
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Get CLI skill sources (factory + coding). */
+function getCliSkillSources() {
+    return { factorySkills, codingSkills };
+}
 /**
- * Get skill prompt by name from builtinSkills or codingSkills.
+ * Get skill prompt by name. Delegates to SDK resolveSkillPrompt.
  */
 export function getSkillPrompt(name) {
-    const skill = platformSkills.find((s) => s.name === name)
-        ?? factorySkills.find((s) => s.name === name)
-        ?? builtinSkills.find((s) => s.name === name)
-        ?? codingSkills.find((s) => s.name === name);
-    return skill?.prompt ?? null;
+    const resolution = resolveSkillPrompt(name, getProjectDir(), getCliSkillSources());
+    return resolution?.prompt ?? null;
+}
+/**
+ * Richer version of getSkillPrompt that returns attribution metadata.
+ * Used by the REPL to show binding/fork info in chat.
+ */
+export function getSkillResolution(name) {
+    const resolution = resolveSkillPrompt(name, getProjectDir(), getCliSkillSources());
+    if (!resolution)
+        return null;
+    return {
+        prompt: resolution.prompt,
+        skillName: resolution.skillName,
+        isBound: resolution.isBound,
+        forkedFrom: resolution.forkedFrom,
+    };
+}
+/**
+ * Get autocomplete entries for custom skills + bound commands.
+ * Delegates to SDK getAllAvailableSkills.
+ */
+export function getSkillAutocompleteEntries() {
+    const entries = getAllAvailableSkills(getProjectDir(), getCliSkillSources());
+    return entries
+        .filter((e) => e.source !== 'sdk' && e.source !== 'agents') // SDK/agents skills already in built-in commands
+        .map((e) => {
+        const desc = e.description.length > 60 ? e.description.slice(0, 57) + '...' : e.description;
+        return {
+            command: e.boundCommand ?? e.name,
+            description: e.scope ? `[${e.scope}] ${desc}` : desc,
+        };
+    });
+}
+/**
+ * Check for user/project skills that collide with SDK reserved names.
+ * Shows a one-time warning at startup if collisions are found.
+ */
+export function checkSkillCollisions(ui) {
+    const userSkills = [];
+    for (const scope of ['project', 'user']) {
+        try {
+            const dir = getSkillsDir(scope);
+            const entries = fs.readdirSync(dir, { withFileTypes: true });
+            for (const entry of entries) {
+                if (!entry.isDirectory())
+                    continue;
+                userSkills.push({
+                    name: entry.name,
+                    scope,
+                    path: path.join(dir, entry.name),
+                });
+            }
+        }
+        catch { /* dir doesn't exist */ }
+    }
+    const collisions = detectCollisions(userSkills);
+    if (collisions.length > 0) {
+        ui.print({ type: 'warning', message: formatCollisionWarnings(collisions) });
+    }
 }
 // =============================================================================
 // Build Command Helpers

package/dist/repl-v2.js

@@ -29,7 +29,7 @@ import { getSettings, getStartupMode, syncPermissionModeFromUI, getPermissionMod
 import { isReadOnlyTool } from './utils/readonly-tools.js';
 import { renderMascotWithLogo } from './ui/mascot/renderer.js';
 import { getStartupHighlights } from './changelog/index.js';
-import { registerCommands, executeCommand, allCommands, getAutocompleteCommands, saveCurrentSession, saveCurrentTeam, loadProjectSession, archiveCurrentSession, convertMessagesToItems, } from './commands-v2/index.js';
+import { registerCommands, executeCommand, allCommands, getAutocompleteCommands, setSkillCommandLoader, saveCurrentSession, saveCurrentTeam, loadProjectSession, archiveCurrentSession, convertMessagesToItems, } from './commands-v2/index.js';
 import { getCustomCommandRegistry } from './commands/custom-registry.js';
 import { getPlanModePrompt } from '@compilr-dev/sdk';
 import { planRepository } from './db/repositories/index.js';
@@ -52,6 +52,7 @@ import { formatTokens } from './ui/base/index.js';
 import { isMemoryInput } from './input-handlers/index.js';
 import { addAnchor } from './anchors/index.js';
 import { getActiveProject } from './tools/project-db.js';
+import { getSkillResolution, getSkillAutocompleteEntries, checkSkillCollisions } from './repl-helpers.js';
 import { getProjectSessionManager } from './session/project-session-manager.js';
 import { ResumeOverlayV2 } from './ui/overlay/impl/resume-overlay-v2.js';
 import { updateCacheInfo, updateHistoryEstimate, formatBreakdownCompact, formatCacheInfo, estimateTokens } from './utils/token-tracker.js';
@@ -818,6 +819,10 @@ export class ReplV2 {
         // Set initial state
         this.ui.setProjectName(this.projectName);
         this.ui.setCommandsCallback(getAutocompleteCommands);
+        // Register skill commands for autocomplete (custom skills + bindings)
+        setSkillCommandLoader(() => getSkillAutocompleteEntries());
+        // Check for user/SDK skill name collisions (once at startup)
+        checkSkillCollisions(this.ui);
         // Set up agent suggestions callback for $ autocomplete (if team is available)
         if (this.team) {
             const team = this.team; // Capture for closure
@@ -1652,8 +1657,9 @@ export class ReplV2 {
             console.log(s.warning('  ⚠ Simulation mode (no agent)'));
         }
         console.log('');
-        // Show model info
-        console.log(s.muted('Model: ') + s.secondary(this.model));
+        // Show model info (prefer live agent model over startup setting)
+        const currentModel = this.agent ? this.agent.getModel() : this.model;
+        console.log(s.muted('Model: ') + s.secondary(currentModel));
         console.log(s.muted('Provider: ') + s.secondary(this.provider));
         console.log('');
     }
@@ -1788,6 +1794,26 @@ export class ReplV2 {
         const ctx = this.createCommandContext();
         const result = await executeCommand(cmd, args, ctx);
         if (result === null) {
+            // Check if it resolves to a skill (custom or bound)
+            const resolution = getSkillResolution(cmd);
+            if (resolution) {
+                // Show attribution if the command was resolved via binding
+                if (resolution.isBound) {
+                    const forkInfo = resolution.forkedFrom
+                        ? ` (forked from sdk:${resolution.forkedFrom.skill}@${resolution.forkedFrom.version})`
+                        : '';
+                    this.ui.print({ type: 'info', message: `🛠  /${cmd} → ${resolution.skillName}${forkInfo}` });
+                }
+                this.ui.print({ type: 'user-message', text: `/${cmd}${args ? ' ' + args : ''}` });
+                const fullPrompt = args ? `${resolution.prompt}\n\nUser request: ${args}` : resolution.prompt;
+                if (this.agent) {
+                    await this.runAgentReal(fullPrompt);
+                }
+                else {
+                    await this.runAgentSimulation(fullPrompt);
+                }
+                return;
+            }
             // Check if it's a custom command
             const customRegistry = getCustomCommandRegistry();
             if (customRegistry.has(cmd)) {

package/dist/ui/conversation.js

@@ -7,7 +7,7 @@
  */
 import { Chalk } from 'chalk';
 import { marked } from 'marked';
-import { markedTerminal } from 'marked-terminal';
+import { markedTerminal } from './markdown-renderer.js';
 import { highlight } from 'cli-highlight';
 import { getStyles } from '../themes/index.js';
 import { getThemeColors } from '../themes/index.js';
@@ -153,7 +153,6 @@ export function renderMarkdown(text) {
         const preprocessed = preprocessMarkdown(text);
         // Configure marked with theme-aware options
         const options = getThemedMarkedOptions();
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
         marked.use(markedTerminal(options));
         // Parse
         const rendered = marked.parse(preprocessed, { async: false });

package/dist/ui/markdown-renderer.d.ts

@@ -0,0 +1,43 @@
+/**
+ * Terminal markdown renderer for marked.
+ * Drop-in replacement for `marked-terminal` — returns a marked extension.
+ *
+ * Usage:
+ *   import { markedTerminal } from './markdown-renderer.js';
+ *   marked.use(markedTerminal(options));
+ */
+type ChalkFn = (text: string) => string;
+export interface TerminalRendererOptions {
+    heading?: ChalkFn;
+    firstHeading?: ChalkFn;
+    strong?: ChalkFn;
+    em?: ChalkFn;
+    codespan?: ChalkFn;
+    code?: ChalkFn;
+    blockquote?: ChalkFn;
+    del?: ChalkFn;
+    link?: ChalkFn;
+    href?: ChalkFn;
+    html?: ChalkFn;
+    hr?: ChalkFn;
+    table?: ChalkFn;
+    listitem?: ChalkFn;
+    paragraph?: ChalkFn;
+    text?: ChalkFn;
+    width?: number;
+    tab?: number;
+    reflowText?: boolean;
+    showSectionPrefix?: boolean;
+    unescape?: boolean;
+    emoji?: boolean;
+    tableOptions?: Record<string, unknown>;
+}
+/**
+ * Returns a marked extension that renders markdown to ANSI terminal output.
+ * Drop-in replacement for `markedTerminal` from the `marked-terminal` package.
+ */
+export declare function markedTerminal(options?: TerminalRendererOptions): {
+    renderer: Record<string, unknown>;
+    useNewRenderer: boolean;
+};
+export {};