Resolve merge conflict and align renderer/emotion parsing changes - #39
Open
easonzhou1031-eng wants to merge 14 commits into
Open
Resolve merge conflict and align renderer/emotion parsing changes#39easonzhou1031-eng wants to merge 14 commits into
easonzhou1031-eng wants to merge 14 commits into
Conversation
Introduces the NVIDIA NIM provider (OpenAI-compatible, integrate.api.nvidia.com) with 6 model presets and wires it into the provider factory, env config, and the renderer's Settings UI. Also fixes the cost/context meter: `estimateCost` now returns null for unpriced models so the UI shows "—" instead of $0.00, and the streaming path captures the terminal `done` usage chunk so prompt-token counts (and thus the context-fill meter) are accurate during tool calls. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Shows available commands with category badges, description, and usage. Supports keyboard navigation (↑↓), Enter/Tab to select, Esc to close, and live filtering as user types after "/".
- Browser persistence: tabs, URLs, and active tab auto-save to localStorage and restore on app restart (cookies/logins preserved via persist:browser partition) - /compact command: now triggers AI context compaction instead of overlay mode - Sends conversation to AI with a structured summarization prompt - Replaces chat history with compact summary (preserving last user message) - Saves compacted state to DB - Shows toast notifications via app-toast custom event
…enpai # Conflicts: # apps/desktop/README.md # package.json # pnpm-lock.yaml
SafeDep Report Summary
Package Details
Installation is not linked with SafeDep Tenant. Click here to optionally link your GitHub App installation with SafeDep Tenant. This report is generated by SafeDep Github App |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR resolves the current merge conflict artifacts and keeps the Live2D folder/resource + AI emotion-tag pipeline in the merged branch.