@code-yeongyu/senpi 0.74.0 → 2026.5.13-2

package/dist/modes/interactive/interactive-mode.js

@@ -15,7 +15,7 @@ import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
-import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
+import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope, } from "../../core/model-resolver.js";
 import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager } from "../../core/session-manager.js";
@@ -48,6 +48,7 @@ import { FavoriteModelsSelectorComponent } from "./components/favorite-models-se
 import { FooterComponent } from "./components/footer.js";
 import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { LoginDialogComponent } from "./components/login-dialog.js";
+import { getModelFullId } from "./components/model-favorites.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
@@ -945,19 +946,6 @@ export class InteractiveMode {
             return;
         }
         const sectionHeader = (name, color = "mdHeading") => theme.fg(color, `[${name}]`);
-        const _compactPath = (resourcePath, sourceInfo) => {
-            const builtinName = this.getBuiltinExtensionNameFromPath(resourcePath);
-            if (builtinName) {
-                return `builtin/${builtinName}`;
-            }
-            const shortPath = this.getShortPath(resourcePath, sourceInfo);
-            const normalizedPath = shortPath.replace(/\\/g, "/");
-            const segments = normalizedPath.split("/").filter((segment) => segment.length > 0 && segment !== "~");
-            if (segments.length > 0) {
-                return segments[segments.length - 1];
-            }
-            return shortPath;
-        };
         const formatCompactList = (items, options) => {
             const labels = items.map((item) => item.trim()).filter((item) => item.length > 0);
             if (options?.sort !== false) {
@@ -2426,8 +2414,8 @@ export class InteractiveMode {
             return "";
         const textBlocks = typeof message.content === "string"
             ? [{ type: "text", text: message.content }]
-            : message.content.filter((c) => c.type === "text");
-        return textBlocks.map((c) => c.text).join("");
+            : message.content.filter((content) => content.type === "text");
+        return textBlocks.map((content) => content.text).join("");
     }
     /**
      * Show a status message in the chat.
@@ -2525,7 +2513,8 @@ export class InteractiveMode {
                 break;
             }
             default: {
-                const _exhaustive = message;
+                const exhaustive = message;
+                void exhaustive;
             }
         }
     }
@@ -3277,20 +3266,7 @@ export class InteractiveMode {
         }
         const model = await this.findExactModelMatch(searchTerm);
         if (model) {
-            try {
-                const systemPromptChange = await this.session.setModel(model);
-                this.footer.invalidate();
-                this.updateEditorBorderColor();
-                const systemPromptStr = systemPromptChange?.systemPromptName
-                    ? ` (system prompt: ${systemPromptChange.systemPromptName})`
-                    : "";
-                this.showStatus(`Model: ${model.id}${systemPromptStr}`);
-                void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
-                this.checkDaxnutsEasterEgg(model);
-            }
-            catch (error) {
-                this.showError(error instanceof Error ? error.message : String(error));
-            }
+            await this.selectModelFromUi(model);
             return;
         }
         this.showModelSelector(searchTerm);
@@ -3302,7 +3278,7 @@ export class InteractiveMode {
     async getModelCandidates() {
         this.session.modelRegistry.refresh();
         try {
-            const availableModels = await this.session.modelRegistry.getAvailable();
+            const availableModels = this.session.modelRegistry.getAvailable();
             if (this.session.scopedModels.length === 0) {
                 return availableModels;
             }
@@ -3316,6 +3292,63 @@ export class InteractiveMode {
             return [];
         }
     }
+    async selectModelFromUi(model, done) {
+        try {
+            const systemPromptChange = await this.session.setModel(model);
+            this.footer.invalidate();
+            this.updateEditorBorderColor();
+            done?.();
+            const systemPromptStr = systemPromptChange?.systemPromptName
+                ? ` (system prompt: ${systemPromptChange.systemPromptName})`
+                : "";
+            this.showStatus(`Model: ${model.id}${systemPromptStr}`);
+            void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
+            this.checkDaxnutsEasterEgg(model);
+        }
+        catch (error) {
+            done?.();
+            this.showError(error instanceof Error ? error.message : String(error));
+        }
+    }
+    async resolveFavoriteModelsForUi(patterns, candidateModels) {
+        const candidateIds = new Set(candidateModels.map(getModelFullId));
+        const warnings = [];
+        const resolvedModels = await resolveModelScope(patterns, this.session.modelRegistry, {
+            onWarning: (message) => warnings.push(message),
+        });
+        for (const warning of warnings) {
+            this.showWarning(warning);
+        }
+        return resolvedModels.filter((resolved) => candidateIds.has(getModelFullId(resolved.model)));
+    }
+    async getFavoriteModelIdsForUi(candidateModels) {
+        const candidateIds = new Set(candidateModels.map(getModelFullId));
+        const sessionFavoriteIds = this.session.favoriteModels
+            .map((favorite) => getModelFullId(favorite.model))
+            .filter((id) => candidateIds.has(id));
+        if (sessionFavoriteIds.length > 0)
+            return sessionFavoriteIds;
+        const patterns = this.settingsManager.getFavoriteModels() ?? [];
+        if (patterns.length === 0)
+            return [];
+        const favoriteModels = await this.resolveFavoriteModelsForUi(patterns, candidateModels);
+        return favoriteModels.map((favorite) => getModelFullId(favorite.model));
+    }
+    async updateSessionFavoritesFromIds(favoriteIds, candidateModels) {
+        const nextIds = favoriteIds === null ? candidateModels.map(getModelFullId) : favoriteIds;
+        if (nextIds.length === 0) {
+            this.session.setFavoriteModels([]);
+            this.ui.requestRender();
+            return;
+        }
+        const newFavoriteModels = await this.resolveFavoriteModelsForUi(nextIds, candidateModels);
+        this.session.setFavoriteModels(newFavoriteModels.map((favorite) => ({
+            model: favorite.model,
+            thinkingLevel: favorite.thinkingLevel,
+            serviceTier: favorite.serviceTier,
+        })));
+        this.ui.requestRender();
+    }
     /** Update the footer's available provider count from current model candidates */
     async updateAvailableProviderCount() {
         const models = await this.getModelCandidates();
@@ -3352,27 +3385,20 @@ export class InteractiveMode {
     }
     showModelSelector(initialSearchInput) {
         this.showSelector((done) => {
-            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, async (model) => {
-                try {
-                    const systemPromptChange = await this.session.setModel(model);
-                    this.footer.invalidate();
-                    this.updateEditorBorderColor();
-                    done();
-                    const systemPromptStr = systemPromptChange?.systemPromptName
-                        ? ` (system prompt: ${systemPromptChange.systemPromptName})`
-                        : "";
-                    this.showStatus(`Model: ${model.id}${systemPromptStr}`);
-                    void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
-                    this.checkDaxnutsEasterEgg(model);
-                }
-                catch (error) {
-                    done();
-                    this.showError(error instanceof Error ? error.message : String(error));
-                }
+            const favoriteModelIds = this.session.favoriteModels.map((favorite) => getModelFullId(favorite.model));
+            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, (model) => {
+                void this.selectModelFromUi(model, done);
             }, () => {
                 done();
                 this.ui.requestRender();
-            }, initialSearchInput);
+            }, initialSearchInput, {
+                favoriteModelIds,
+                onFavoriteChange: async (favoriteIds, allModels) => {
+                    await this.updateSessionFavoritesFromIds(favoriteIds, allModels);
+                    const newPatterns = favoriteIds === null ? allModels.map(getModelFullId) : favoriteIds;
+                    this.settingsManager.setFavoriteModels(newPatterns.length > 0 ? [...newPatterns] : undefined);
+                },
+            });
             return { component: selector, focus: selector };
         });
     }
@@ -3382,61 +3408,24 @@ export class InteractiveMode {
             this.showStatus("No models available");
             return;
         }
-        // Build favorite model IDs from session state or settings
-        let currentFavoriteIds = [];
-        const candidateIds = new Set(allModels.map((model) => `${model.provider}/${model.id}`));
-        const resolveScopeForUi = async (patterns) => {
-            const warnings = [];
-            const resolvedModels = await resolveModelScope(patterns, this.session.modelRegistry, {
-                onWarning: (message) => warnings.push(message),
-            });
-            for (const warning of warnings) {
-                this.showWarning(warning);
-            }
-            return resolvedModels.filter((resolved) => candidateIds.has(`${resolved.model.provider}/${resolved.model.id}`));
-        };
-        if (this.session.favoriteModels.length > 0) {
-            currentFavoriteIds = this.session.favoriteModels
-                .map((favorite) => `${favorite.model.provider}/${favorite.model.id}`)
-                .filter((id) => candidateIds.has(id));
-        }
-        else {
-            const patterns = this.settingsManager.getFavoriteModels() ?? [];
-            if (patterns.length > 0) {
-                const favoriteModels = await resolveScopeForUi(patterns);
-                currentFavoriteIds = favoriteModels.map((favorite) => `${favorite.model.provider}/${favorite.model.id}`);
-            }
-        }
-        // Helper to update session's favorite models (session-only, no persist)
-        const updateSessionFavorites = async (favoriteIds) => {
-            const nextIds = favoriteIds === null ? allModels.map((model) => `${model.provider}/${model.id}`) : favoriteIds;
-            currentFavoriteIds = favoriteIds === null ? null : [...favoriteIds];
-            if (nextIds.length > 0) {
-                const newFavoriteModels = await resolveScopeForUi(nextIds);
-                this.session.setFavoriteModels(newFavoriteModels.map((sm) => ({
-                    model: sm.model,
-                    thinkingLevel: sm.thinkingLevel,
-                    serviceTier: sm.serviceTier,
-                })));
-            }
-            else {
-                this.session.setFavoriteModels([]);
-            }
-            this.ui.requestRender();
-        };
+        const currentFavoriteIds = await this.getFavoriteModelIdsForUi(allModels);
         this.showSelector((done) => {
             const selector = new FavoriteModelsSelectorComponent({
                 allModels,
                 favoriteModelIds: currentFavoriteIds,
+                currentModel: this.session.model,
             }, {
                 onChange: async (favoriteIds) => {
-                    await updateSessionFavorites(favoriteIds);
+                    await this.updateSessionFavoritesFromIds(favoriteIds, allModels);
                 },
                 onPersist: (favoriteIds) => {
-                    const newPatterns = favoriteIds === null ? allModels.map((model) => `${model.provider}/${model.id}`) : favoriteIds;
+                    const newPatterns = favoriteIds === null ? allModels.map(getModelFullId) : favoriteIds;
                     this.settingsManager.setFavoriteModels(newPatterns.length > 0 ? [...newPatterns] : undefined);
                     this.showStatus("Favorite models saved to settings");
                 },
+                onSelect: (model) => {
+                    void this.selectModelFromUi(model, done);
+                },
                 onCancel: () => {
                     done();
                     this.ui.requestRender();