Skip to content

fix(tui): use current model for context-limit display after switch #35542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chethanuk wants to merge 1 commit into
base: dev
Choose a base branch
from
+19 −2
Open

fix(tui): use current model for context-limit display after switch #35542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/tui/src/component/prompt/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,13 @@ export function Prompt(props: PromptProps) {
last.tokens.input + last.tokens.output + last.tokens.reasoning + last.tokens.cache.read + last.tokens.cache.write
if (tokens <= 0) return

const model = sync.data.provider.find((item) => item.id === last.providerID)?.models[last.modelID]
// Use the currently selected model for the context-limit denominator so it
// updates immediately after a model switch, falling back to the last
// assistant message's model when nothing is selected yet.
const selected = local.model.current()
const model =
(selected && sync.data.provider.find((item) => item.id === selected.providerID)?.models[selected.modelID]) ??
sync.data.provider.find((item) => item.id === last.providerID)?.models[last.modelID]
const pct = model?.limit.context ? `${Math.round((tokens / model.limit.context) * 100)}%` : undefined
const cost = session?.cost ?? 0
return {
Expand Down
13 changes: 12 additions & 1 deletion packages/tui/src/feature-plugins/sidebar/context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { AssistantMessage } from "@opencode-ai/sdk/v2"
import type { TuiPlugin, TuiPluginApi } from "@opencode-ai/plugin/tui"
import type { BuiltinTuiPlugin } from "../builtins"
import { createMemo } from "solid-js"
import { useLocal } from "../../context/local"

const id = "internal:sidebar-context"

Expand All @@ -12,6 +13,7 @@ const money = new Intl.NumberFormat("en-US", {

function View(props: { api: TuiPluginApi; session_id: string }) {
const theme = () => props.api.theme.current
const local = useLocal()
const msg = createMemo(() => props.api.state.session.messages(props.session_id))
const session = createMemo(() => props.api.state.session.get(props.session_id))
const cost = createMemo(() => session()?.cost ?? 0)
Expand All @@ -27,7 +29,16 @@ function View(props: { api: TuiPluginApi; session_id: string }) {

const tokens =
last.tokens.input + last.tokens.output + last.tokens.reasoning + last.tokens.cache.read + last.tokens.cache.write
const model = props.api.state.provider.find((item) => item.id === last.providerID)?.models[last.modelID]
// Use the currently selected model for the context-limit denominator so it
// updates immediately after a model switch, falling back to the last
// assistant message's model when nothing is selected yet. The global model
// picker only applies to the top-level session, so for subagent sessions
// (which run their own agent's model and can be viewed via the sidebar) use
// the session's own last-message model instead.
const selected = session()?.parentID ? undefined : local.model.current()
const model =
(selected && props.api.state.provider.find((item) => item.id === selected.providerID)?.models[selected.modelID]) ??
props.api.state.provider.find((item) => item.id === last.providerID)?.models[last.modelID]
return {
tokens,
percent: model?.limit.context ? Math.round((tokens / model.limit.context) * 100) : null,
Expand Down
Loading