@psnext/slingcli 3.0.20260820-2 → 3.1.20260904-1

package/node_modules/@earendil-works/pi-coding-agent/dist/core/tools/read.js

@@ -9,6 +9,7 @@ import { getLanguageFromPath, highlightCode } from "../../modes/interactive/them
 import { processImage } from "../../utils/image-process.js";
 import { detectSupportedImageMimeTypeFromFile } from "../../utils/mime.js";
 import { formatPathRelativeToCwdOrAbsolute } from "../../utils/paths.js";
+import { getExperimentalToolSampling } from "../experimental.js";
 import { resolveReadPathAsync, resolveToCwd } from "./path-utils.js";
 import { getTextOutput, renderToolPath, replaceTabs, str } from "./render-utils.js";
 import { wrapToolDefinition } from "./tool-definition-wrapper.js";
@@ -141,6 +142,7 @@ export function createReadToolDefinition(cwd, options) {
         promptSnippet: readToolSystemPromptContribution.snippet,
         promptGuidelines: [...readToolSystemPromptContribution.guidelines],
         parameters: readSchema,
+        constrainedSampling: getExperimentalToolSampling(),
         async execute(_toolCallId, { path, offset, limit }, signal, _onUpdate, ctx) {
             return new Promise((resolve, reject) => {
                 if (signal?.aborted) {

package/node_modules/@earendil-works/pi-coding-agent/dist/core/tools/write.js

@@ -4,6 +4,7 @@ import { dirname } from "path";
 import { Type } from "typebox";
 import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";
 import { getLanguageFromPath, highlightCode } from "../../modes/interactive/theme/theme.js";
+import { getExperimentalToolSampling } from "../experimental.js";
 import { withFileMutationQueue } from "./file-mutation-queue.js";
 import { resolveToCwd } from "./path-utils.js";
 import { normalizeDisplayText, renderToolPath, replaceTabs, str } from "./render-utils.js";
@@ -141,6 +142,7 @@ export function createWriteToolDefinition(cwd, options) {
         promptSnippet: writeToolSystemPromptContribution.snippet,
         promptGuidelines: [...writeToolSystemPromptContribution.guidelines],
         parameters: writeSchema,
+        constrainedSampling: getExperimentalToolSampling(),
         async execute(_toolCallId, { path, content }, signal, _onUpdate, _ctx) {
             const absolutePath = resolveToCwd(path, cwd);
             const dir = dirname(absolutePath);

package/node_modules/@earendil-works/pi-coding-agent/dist/core/trust-manager.js

@@ -4,6 +4,7 @@ import { dirname, join } from "node:path";
 import lockfile from "proper-lockfile";
 import { CONFIG_DIR_NAME } from "../config.js";
 import { canonicalizePath, resolvePath } from "../utils/paths.js";
+import { stripBom } from "../utils/text.js";
 const TRUST_REQUIRING_PROJECT_CONFIG_RESOURCES = [
     "settings.json",
     "extensions",
@@ -72,7 +73,7 @@ function readTrustFile(path) {
     }
     let parsed;
     try {
-        parsed = JSON.parse(readFileSync(path, "utf-8"));
+        parsed = JSON.parse(stripBom(readFileSync(path, "utf-8")));
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);

package/node_modules/@earendil-works/pi-coding-agent/dist/extensions/llama/client.js

@@ -150,6 +150,13 @@ export class LlamaClient {
             throw new Error("Server is not running in llama.cpp router mode");
         return data;
     }
+    async props(options = {}) {
+        const payload = await this.request("/props", { signal: options.signal });
+        if (typeof payload !== "object" || payload === null)
+            return {};
+        const { models_autoload: modelsAutoload } = payload;
+        return typeof modelsAutoload === "boolean" ? { models_autoload: modelsAutoload } : {};
+    }
     async load(model, signal) {
         await this.request("/models/load", { method: "POST", body: JSON.stringify({ model }), signal });
     }

package/node_modules/@earendil-works/pi-coding-agent/dist/extensions/llama/index.js

@@ -41,6 +41,8 @@ export default function llamaExtension(pi) {
         provider.setCatalog(current, client.serverUrl);
         const result = await ctx.modelRegistry.refresh({
             providers: [LLAMA_PROVIDER_ID],
+            // /llama already contacted the configured llama.cpp server, so keep this refresh live even in PI_OFFLINE.
+            allowNetwork: true,
             signal,
         });
         if (result.aborted)

package/node_modules/@earendil-works/pi-coding-agent/dist/extensions/llama/provider.js

@@ -10,6 +10,25 @@ async function resolveServerUrl(ctx, credential) {
     const configured = credentialServerUrl(credential) ?? (await ctx.env("LLAMA_BASE_URL"))?.trim();
     return configured ? normalizeLlamaServerUrl(configured) : undefined;
 }
+function modelIsSelectable(model, routerAutoload) {
+    if (model.status.value === "loaded")
+        return true;
+    // llama.cpp reports idle-slept models as "sleeping"; requests wake them automatically.
+    if (model.status.value === "sleeping")
+        return true;
+    // Unloaded presets are routable only when llama.cpp router autoload can load them on first use.
+    return routerAutoload && model.status.value === "unloaded" && !model.status.failed && model.source === "preset";
+}
+async function routerAutoloadEnabled(client, catalog, signal) {
+    if (!catalog.some((model) => model.status.value === "unloaded" && model.source === "preset"))
+        return false;
+    try {
+        return (await client.props({ signal })).models_autoload === true;
+    }
+    catch {
+        return false;
+    }
+}
 function toPiModel(model, serverUrl) {
     const reportedContextWindow = model.meta?.n_ctx ?? model.meta?.n_ctx_train;
     const contextWindow = reportedContextWindow && reportedContextWindow > 0 ? reportedContextWindow : 128000;
@@ -36,8 +55,10 @@ function toPiModel(model, serverUrl) {
 }
 export function createLlamaProvider() {
     let models = [];
-    const setCatalog = (catalog, serverUrl) => {
-        models = catalog.filter((model) => model.status.value === "loaded").map((model) => toPiModel(model, serverUrl));
+    const setCatalog = (catalog, serverUrl, options = {}) => {
+        models = catalog
+            .filter((model) => modelIsSelectable(model, options.routerAutoload === true))
+            .map((model) => toPiModel(model, serverUrl));
     };
     const provider = {
         id: LLAMA_PROVIDER_ID,
@@ -100,11 +121,15 @@ export function createLlamaProvider() {
             const serverUrl = credentialServerUrl(context.credential);
             if (!serverUrl)
                 return;
-            const catalog = await new LlamaClient(serverUrl, context.credential.key).list({ signal: context.signal });
+            const client = new LlamaClient(serverUrl, context.credential.key);
+            const catalog = await client.list({ signal: context.signal });
+            if (context.signal.aborted)
+                return;
+            const routerAutoload = await routerAutoloadEnabled(client, catalog, context.signal);
             if (context.signal.aborted)
                 return;
             const refreshed = catalog
-                .filter((model) => model.status.value === "loaded")
+                .filter((model) => modelIsSelectable(model, routerAutoload))
                 .map((model) => toPiModel(model, serverUrl));
             await context.publish({
                 persist: { models: refreshed, checkedAt: Date.now() },

package/node_modules/@earendil-works/pi-coding-agent/dist/index.js

@@ -7,7 +7,7 @@ export { readStoredCredential } from "./core/auth-storage.js";
 // Compaction
 export { calculateContextTokens, collectEntriesForBranchSummary, compact, DEFAULT_COMPACTION_SETTINGS, estimateTokens, findCutPoint, findTurnStartIndex, generateBranchSummary, generateSummary, generateSummaryWithUsage, getLastAssistantUsage, prepareBranchEntries, serializeConversation, shouldCompact, } from "./core/compaction/index.js";
 export { createEventBus } from "./core/event-bus.js";
-export { createExtensionRuntime, defineTool, discoverAndLoadExtensions, ExtensionRunner, isBashToolResult, isEditToolResult, isFindToolResult, isGrepToolResult, isLsToolResult, isReadToolResult, isToolCallEventType, isWriteToolResult, wrapRegisteredTool, wrapRegisteredTools, } from "./core/extensions/index.js";
+export { createExtensionRuntime, defineTool, discoverAndLoadExtensions, ExtensionRunner, isBashToolResult, isEditToolResult, isFindToolResult, isGrepToolResult, isLsToolResult, isPowerShellToolResult, isReadToolResult, isToolCallEventType, isWriteToolResult, wrapRegisteredTool, wrapRegisteredTools, } from "./core/extensions/index.js";
 export { convertToLlm } from "./core/messages.js";
 export { ModelRegistry } from "./core/model-registry.js";
 export { resolveCliModel, resolveModelScopeWithDiagnostics, } from "./core/model-resolver.js";
@@ -19,7 +19,7 @@ export { AgentSessionRuntime,
 // Factory
 createAgentSession, createAgentSessionFromServices, createAgentSessionRuntime, createAgentSessionServices, createBashTool, 
 // Tool factories (for custom cwd)
-createCodingTools, createEditTool, createFindTool, createGrepTool, createLsTool, createReadOnlyTools, createReadTool, createWriteTool, } from "./core/sdk.js";
+createCodingTools, createEditTool, createFindTool, createGrepTool, createLsTool, createPowerShellTool, createReadOnlyTools, createReadTool, createWriteTool, } from "./core/sdk.js";
 export { buildContextEntries, buildSessionContext, CURRENT_SESSION_VERSION, getLatestCompactionEntry, migrateSessionEntries, parseSessionEntries, SessionManager, sessionEntryToContextMessages, } from "./core/session-manager.js";
 export { SettingsManager, } from "./core/settings-manager.js";
 // Skills
@@ -27,7 +27,7 @@ export { formatSkillsForPrompt, loadSkills, loadSkillsFromDir, } from "./core/sk
 export { createSyntheticSourceInfo } from "./core/source-info.js";
 export { generateDiffString, generateUnifiedPatch } from "./core/tools/edit-diff.js";
 // Tools
-export { createBashToolDefinition, createEditToolDefinition, createFindToolDefinition, createGrepToolDefinition, createLocalBashOperations, createLsToolDefinition, createReadToolDefinition, createWriteToolDefinition, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize, truncateHead, truncateLine, truncateTail, withFileMutationQueue, } from "./core/tools/index.js";
+export { createBashToolDefinition, createEditToolDefinition, createFindToolDefinition, createGrepToolDefinition, createLocalBashOperations, createLocalPowerShellOperations, createLsToolDefinition, createPowerShellToolDefinition, createReadToolDefinition, createWriteToolDefinition, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize, truncateHead, truncateLine, truncateTail, withFileMutationQueue, } from "./core/tools/index.js";
 export { hasTrustRequiringProjectResources, ProjectTrustStore, } from "./core/trust-manager.js";
 // Main entry point
 export { main } from "./main.js";
@@ -42,6 +42,7 @@ export { copyToClipboard } from "./utils/clipboard.js";
 export { parseFrontmatter, stripFrontmatter } from "./utils/frontmatter.js";
 export { convertToPng } from "./utils/image-convert.js";
 export { formatDimensionNote, resizeImage } from "./utils/image-resize.js";
+export { detectSupportedImageMimeTypeFromFile } from "./utils/mime.js";
 // Shell utilities
-export { getShellConfig } from "./utils/shell.js";
+export { getPowerShellConfig, getShellConfig } from "./utils/shell.js";
 //# sourceMappingURL=index.js.map

package/node_modules/@earendil-works/pi-coding-agent/dist/main.js

@@ -6,8 +6,9 @@
  */
 import { createInterface } from "node:readline";
 import { modelsAreEqual } from "@earendil-works/pi-ai";
+import { setCapabilityOverrides } from "@earendil-works/pi-tui";
 import chalk from "chalk";
-import { parseArgs, printHelp } from "./cli/args.js";
+import { normalizeSessionName, parseArgs, printHelp } from "./cli/args.js";
 import { checkProviderAuth, createAuthCheckModelRuntime, getProviderCredential, } from "./cli/auth-check.js";
 import { AuthCommandError, getAuthCommandName, getAuthCommandUsage, isAuthCommandHelp, parseAuthCommand, printAuthCommandHelp, validateAuthCommandArgs, } from "./cli/auth-command.js";
 import { resolveCredentialForPrint } from "./cli/credential-print.js";
@@ -30,6 +31,7 @@ import { restoreStdout, takeOverStdout } from "./core/output-guard.js";
 import { resolveProjectTrusted } from "./core/project-trust.js";
 import { formatMissingSessionCwdPrompt, getMissingSessionCwdIssue, MissingSessionCwdError, } from "./core/session-cwd.js";
 import { assertValidSessionId, SessionManager } from "./core/session-manager.js";
+import { collectSettingsDiagnostics, deduplicateDiagnostics } from "./core/settings-diagnostics.js";
 import { SettingsManager } from "./core/settings-manager.js";
 import { printTimings, resetTimings, time } from "./core/timings.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "./core/trust-manager.js";
@@ -37,10 +39,10 @@ import { builtInExtensions } from "./extensions/index.js";
 import { runMigrations, showDeprecationWarnings } from "./migrations.js";
 import { InteractiveMode, runPrintMode, runRpcMode } from "./modes/index.js";
 import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme.js";
-import { handleConfigCommand, handlePackageCommand } from "./package-manager-cli.js";
+import { cleanupManagedInstall, handleConfigCommand, handlePackageCommand } from "./package-manager-cli.js";
 import { isLocalPath, normalizePath, resolvePath } from "./utils/paths.js";
 import { cleanupWindowsSelfUpdateQuarantine } from "./utils/windows-self-update.js";
-const EXTENSION_LOAD_FAILURE_HINT = 'Hint: Start without extensions using "sling -ne".';
+const EXTENSION_LOAD_FAILURE_HINT = `Hint: Start without extensions using "${APP_NAME} -ne".`;
 /**
  * Read all content from piped stdin.
  * Returns undefined if stdin is a TTY (interactive terminal).
@@ -62,12 +64,6 @@ async function readPipedStdin() {
         process.stdin.resume();
     });
 }
-function collectSettingsDiagnostics(settingsManager, context) {
-    return settingsManager.drainErrors().map(({ scope, error }) => ({
-        type: "warning",
-        message: `(${context}, ${scope} settings) ${error.message}`,
-    }));
-}
 function reportDiagnostics(diagnostics) {
     for (const diagnostic of diagnostics) {
         const color = diagnostic.type === "error" ? chalk.red : diagnostic.type === "warning" ? chalk.yellow : chalk.dim;
@@ -279,7 +275,7 @@ function forkSessionOrExit(sourcePath, cwd, sessionDir, sessionId) {
         process.exit(1);
     }
 }
-async function createSessionManager(parsed, cwd, sessionDir, settingsManager) {
+export async function createSessionManager(parsed, cwd, sessionDir, settingsManager) {
     if (parsed.noSession || parsed.help || parsed.listModels !== undefined) {
         return SessionManager.inMemory(cwd, parsed.sessionId !== undefined ? { id: parsed.sessionId } : undefined);
     }
@@ -451,6 +447,7 @@ export async function main(args, options) {
     if (process.platform === "win32") {
         cleanupWindowsSelfUpdateQuarantine(getPackageDir());
     }
+    cleanupManagedInstall();
     const cwd = process.cwd();
     const agentDir = getAgentDir();
     const bootstrapSettingsManager = SettingsManager.create(cwd, agentDir, { projectTrusted: false });
@@ -515,13 +512,16 @@ export async function main(args, options) {
     const { migratedAuthProviders: migratedProviders, deprecationWarnings } = runMigrations(cwd);
     time("runMigrations");
     const startupSettingsManager = SettingsManager.create(cwd, agentDir);
-    reportDiagnostics(collectSettingsDiagnostics(startupSettingsManager, "startup session lookup"));
+    const startupSettingsDiagnostics = collectSettingsDiagnostics(startupSettingsManager);
     // Experimental first-time setup: theme choice and analytics opt-in.
     // Runs before any runtime services are created so the chosen settings apply everywhere.
     if (appMode === "interactive" && !parsed.help && parsed.listModels === undefined && shouldRunFirstTimeSetup()) {
         await showFirstTimeSetup(startupSettingsManager);
         time("firstTimeSetup");
     }
+    if (appMode === "interactive" && parsed.useTheme !== undefined) {
+        startupSettingsManager.applyOverrides({ theme: parsed.useTheme });
+    }
     // Decide the final runtime cwd before creating cwd-bound runtime services.
     // --session and --resume may select a session from another project, so project-local
     // settings, resources, provider registrations, and models must be resolved only after
@@ -547,8 +547,8 @@ export async function main(args, options) {
         }
     }
     if (parsed.name !== undefined) {
-        const name = parsed.name.trim();
-        if (!name) {
+        const name = normalizeSessionName(parsed.name);
+        if (name === undefined) {
             console.error(chalk.red("Error: --name requires a non-empty value"));
             process.exit(1);
         }
@@ -626,7 +626,7 @@ export async function main(args, options) {
         const diagnostics = [
             ...projectTrustDiagnostics,
             ...services.diagnostics,
-            ...collectSettingsDiagnostics(settingsManager, "runtime creation"),
+            ...collectSettingsDiagnostics(settingsManager),
             ...resourceLoader.getExtensions().errors.map(({ path, error }) => ({
                 type: "error",
                 message: `Failed to load extension "${path}": ${error}`,
@@ -680,9 +680,11 @@ export async function main(args, options) {
     time("createAgentSessionRuntime");
     const { services, session, modelFallbackMessage } = runtime;
     const { settingsManager, modelRuntime, resourceLoader } = services;
+    setCapabilityOverrides(settingsManager.getTerminalCapabilityOverrides());
     applyHttpProxySettings(settingsManager.getGlobalSettings().httpProxy);
     configureHttpDispatcher(settingsManager.getHttpIdleTimeoutMs());
     if (parsed.help) {
+        reportDiagnostics(startupSettingsDiagnostics);
         const extensionFlags = resourceLoader
             .getExtensions()
             .extensions.flatMap((extension) => Array.from(extension.flags.values()));
@@ -690,6 +692,7 @@ export async function main(args, options) {
         process.exit(0);
     }
     if (parsed.listModels !== undefined) {
+        reportDiagnostics(startupSettingsDiagnostics);
         const searchPattern = typeof parsed.listModels === "string" ? parsed.listModels : undefined;
         await listModels(modelRuntime, searchPattern, AbortSignal.timeout(15_000));
         process.exit(0);
@@ -712,8 +715,12 @@ export async function main(args, options) {
         await showDeprecationWarnings(deprecationWarnings);
     }
     time("resolveModelScope");
-    reportDiagnostics(runtime.diagnostics);
-    if (runtime.diagnostics.some((diagnostic) => diagnostic.type === "error")) {
+    const startupDiagnostics = deduplicateDiagnostics([...startupSettingsDiagnostics, ...runtime.diagnostics]);
+    const hasRuntimeErrors = runtime.diagnostics.some((diagnostic) => diagnostic.type === "error");
+    if (appMode !== "interactive" || hasRuntimeErrors) {
+        reportDiagnostics(startupDiagnostics);
+    }
+    if (hasRuntimeErrors) {
         if (runtime.diagnostics.some((diagnostic) => diagnostic.message.includes("Failed to load extension"))) {
             console.error(chalk.yellow(EXTENSION_LOAD_FAILURE_HINT));
         }
@@ -745,6 +752,7 @@ export async function main(args, options) {
     else if (appMode === "interactive") {
         const interactiveMode = new InteractiveMode(runtime, {
             migratedProviders,
+            startupDiagnostics,
             modelFallbackMessage,
             autoTrustOnReloadCwd,
             initialMessage,
@@ -752,6 +760,7 @@ export async function main(args, options) {
             initialMessages: parsed.messages,
             verbose: parsed.verbose,
             tuiMode: parsed.tuiMode,
+            initialThemeSetting: parsed.useTheme,
         });
         if (startupBenchmark) {
             await interactiveMode.init();

package/node_modules/@earendil-works/pi-coding-agent/dist/migrations.js

@@ -6,6 +6,7 @@ import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, w
 import { dirname, join } from "path";
 import { CONFIG_DIR_NAME, getAgentDir, getBinDir } from "./config.js";
 import { migrateKeybindingsConfig } from "./core/keybindings.js";
+import { stripBom } from "./utils/text.js";
 const MIGRATION_GUIDE_URL = "https://github.com/earendil-works/pi-mono/blob/main/packages/coding-agent/CHANGELOG.md#extensions-migration";
 const EXTENSIONS_DOC_URL = "https://github.com/earendil-works/pi-mono/blob/main/packages/coding-agent/docs/extensions.md";
 /**
@@ -26,7 +27,7 @@ export function migrateAuthToAuthJson() {
     // Migrate oauth.json
     if (existsSync(oauthPath)) {
         try {
-            const oauth = JSON.parse(readFileSync(oauthPath, "utf-8"));
+            const oauth = JSON.parse(stripBom(readFileSync(oauthPath, "utf-8")));
             for (const [provider, cred] of Object.entries(oauth)) {
                 migrated[provider] = { type: "oauth", ...cred };
                 providers.push(provider);
@@ -41,7 +42,7 @@ export function migrateAuthToAuthJson() {
     if (existsSync(settingsPath)) {
         try {
             const content = readFileSync(settingsPath, "utf-8");
-            const settings = JSON.parse(content);
+            const settings = JSON.parse(stripBom(content));
             if (settings.apiKeys && typeof settings.apiKeys === "object") {
                 for (const [provider, key] of Object.entries(settings.apiKeys)) {
                     if (!migrated[provider] && typeof key === "string") {
@@ -140,7 +141,7 @@ function migrateKeybindingsConfigFile() {
     if (!existsSync(configPath))
         return;
     try {
-        const parsed = JSON.parse(readFileSync(configPath, "utf-8"));
+        const parsed = JSON.parse(stripBom(readFileSync(configPath, "utf-8")));
         if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
             return;
         }

package/node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/components/model-selector.js

@@ -1,5 +1,6 @@
 import { modelsAreEqual } from "@earendil-works/pi-ai";
-import { Container, fuzzyFilter, getKeybindings, Input, Spacer, Text, } from "@earendil-works/pi-tui";
+import { Container, fuzzyFilter, getKeybindings, Input, matchesKey, Spacer, Text, } from "@earendil-works/pi-tui";
+import { refreshModelCatalogs } from "../model-catalog-refresh.js";
 import { getModelSelectorSearchText } from "../model-search.js";
 import { theme } from "../theme/theme.js";
 import { DynamicBorder } from "./dynamic-border.js";
@@ -25,30 +26,32 @@ export class ModelSelectorComponent extends Container {
     filteredModels = [];
     selectedIndex = 0;
     currentModel;
-    settingsManager;
     modelRuntime;
     onSelectCallback;
+    onSelectAsDefaultCallback;
     onCancelCallback;
     errorMessage;
     refreshStatusMessage = "Refreshing model catalogs…";
     refreshStatusSuccess = false;
     tui;
     scopedModels;
+    defaultModel;
     scope = "all";
     scopeText;
     scopeHintText;
     refreshAbortController = new AbortController();
     refreshTimeout;
     closed = false;
-    constructor(tui, currentModel, settingsManager, modelRuntime, scopedModels, onSelect, onCancel, initialSearchInput) {
+    constructor(tui, currentModel, modelRuntime, scopedModels, onSelect, onCancel, initialSearchInput, onSelectAsDefault, defaultModel) {
         super();
         this.tui = tui;
         this.currentModel = currentModel;
-        this.settingsManager = settingsManager;
         this.modelRuntime = modelRuntime;
         this.scopedModels = scopedModels;
+        this.defaultModel = defaultModel;
         this.scope = scopedModels.length > 0 ? "scoped" : "all";
         this.onSelectCallback = onSelect;
+        this.onSelectAsDefaultCallback = onSelectAsDefault;
         this.onCancelCallback = onCancel;
         // Add top border
         this.addChild(new DynamicBorder());
@@ -82,6 +85,10 @@ export class ModelSelectorComponent extends Container {
         this.listContainer = new Container();
         this.addChild(this.listContainer);
         this.addChild(new Spacer(1));
+        // Hint
+        if (this.onSelectAsDefaultCallback) {
+            this.addChild(new Text(theme.fg("dim", "  Enter to select \u00b7 Ctrl+S to set as default \u00b7 Esc to cancel"), 0, 0));
+        }
         // Add bottom border
         this.addChild(new DynamicBorder());
         // Render the current snapshot immediately, then refresh in the background.
@@ -123,7 +130,7 @@ export class ModelSelectorComponent extends Container {
             this.refreshAbortController.abort();
         }, timeoutMs);
         try {
-            const result = await this.modelRuntime.refresh({ signal: this.refreshAbortController.signal });
+            const result = await refreshModelCatalogs(this.modelRuntime, this.refreshAbortController.signal);
             if (this.closed)
                 return;
             this.refreshStatusMessage = "";
@@ -172,7 +179,7 @@ export class ModelSelectorComponent extends Container {
     }
     sortModels(models) {
         const sorted = [...models];
-        // Sort: current model first, then by provider
+        // Sort: current model first, default model second, then by provider.
         sorted.sort((a, b) => {
             const aIsCurrent = modelsAreEqual(this.currentModel, a.model);
             const bIsCurrent = modelsAreEqual(this.currentModel, b.model);
@@ -180,6 +187,12 @@ export class ModelSelectorComponent extends Container {
                 return -1;
             if (!aIsCurrent && bIsCurrent)
                 return 1;
+            const aIsDefault = this.isDefaultModel(a.model);
+            const bIsDefault = this.isDefaultModel(b.model);
+            if (aIsDefault && !bIsDefault)
+                return -1;
+            if (!aIsDefault && bIsDefault)
+                return 1;
             return a.provider.localeCompare(b.provider);
         });
         return sorted;
@@ -192,6 +205,13 @@ export class ModelSelectorComponent extends Container {
     getScopeHintText() {
         return keyHint("tui.input.tab", "scope") + theme.fg("muted", " (all/scoped)");
     }
+    isDefaultModel(model) {
+        return this.defaultModel?.provider === model.provider && this.defaultModel.id === model.id;
+    }
+    isDefaultSearch(query) {
+        const normalized = query.trim().toLowerCase();
+        return normalized.length > 0 && "default".startsWith(normalized);
+    }
     setScope(scope) {
         if (this.scope === scope)
             return;
@@ -205,9 +225,26 @@ export class ModelSelectorComponent extends Container {
         }
     }
     filterModels(query) {
-        this.filteredModels = query
-            ? fuzzyFilter(this.activeModels, query, ({ id, provider, model }) => getModelSelectorSearchText({ id, provider, name: model.name }))
-            : this.activeModels;
+        if (query) {
+            const filtered = fuzzyFilter(this.activeModels, query, (item) => {
+                const defaultText = this.isDefaultModel(item.model) ? " default" : "";
+                return `${getModelSelectorSearchText({ id: item.id, provider: item.provider, name: item.model.name })}${defaultText}`;
+            });
+            if (this.isDefaultSearch(query)) {
+                const defaultItems = this.activeModels.filter((item) => this.isDefaultModel(item.model));
+                const defaultKeys = new Set(defaultItems.map((item) => `${item.provider}\0${item.id}`));
+                this.filteredModels = [
+                    ...defaultItems,
+                    ...filtered.filter((item) => !defaultKeys.has(`${item.provider}\0${item.id}`)),
+                ];
+            }
+            else {
+                this.filteredModels = filtered;
+            }
+        }
+        else {
+            this.filteredModels = this.activeModels;
+        }
         // When filtering by a query, move the selector to the top row so the best
         // match is highlighted. When the query is cleared, keep the current position
         // clamped to the (restored) list length.
@@ -226,19 +263,21 @@ export class ModelSelectorComponent extends Container {
                 continue;
             const isSelected = i === this.selectedIndex;
             const isCurrent = modelsAreEqual(this.currentModel, item.model);
+            const isDefault = this.isDefaultModel(item.model);
+            const defaultBadge = isDefault ? theme.fg("muted", " · default") : "";
             let line = "";
             if (isSelected) {
                 const prefix = theme.fg("accent", "→ ");
                 const modelText = `${item.id}`;
                 const providerBadge = theme.fg("muted", `[${item.provider}]`);
                 const checkmark = isCurrent ? theme.fg("success", " ✓") : "";
-                line = `${prefix + theme.fg("accent", modelText)} ${providerBadge}${checkmark}`;
+                line = `${prefix + theme.fg("accent", modelText)} ${providerBadge}${defaultBadge}${checkmark}`;
             }
             else {
                 const modelText = `  ${item.id}`;
                 const providerBadge = theme.fg("muted", `[${item.provider}]`);
                 const checkmark = isCurrent ? theme.fg("success", " ✓") : "";
-                line = `${modelText} ${providerBadge}${checkmark}`;
+                line = `${modelText} ${providerBadge}${defaultBadge}${checkmark}`;
             }
             this.listContainer.addChild(new Text(line, 0, 0));
         }
@@ -306,6 +345,14 @@ export class ModelSelectorComponent extends Container {
             this.dispose();
             this.onCancelCallback();
         }
+        // Ctrl+S — select and save as default
+        else if (matchesKey(keyData, "ctrl+s") && this.onSelectAsDefaultCallback) {
+            const selectedModel = this.filteredModels[this.selectedIndex];
+            if (selectedModel) {
+                this.dispose();
+                this.onSelectAsDefaultCallback(selectedModel.model);
+            }
+        }
         // Pass everything else to search input
         else {
             this.searchInput.handleInput(keyData);
@@ -314,8 +361,6 @@ export class ModelSelectorComponent extends Container {
     }
     handleSelect(model) {
         this.dispose();
-        // Save as new default
-        this.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
         this.onSelectCallback(model);
     }
     getSearchInput() {