-
{title()}
+
+ {title()}
+
+ messages={messages()}
+ current={activeMessage()}
+ onMessageSelect={setActiveMessage}
+ size={wide() ? "normal" : "compact"}
+ />
-
+
@@ -313,7 +312,7 @@ export default function () {
{turns()}
+
+ {turns()}
+
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index e0909c194..ae380692d 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -43,7 +43,7 @@
"@actions/github": "6.0.1",
"@agentclientprotocol/sdk": "0.5.1",
"@ai-sdk/amazon-bedrock": "3.0.57",
- "@ai-sdk/anthropic": "2.0.45",
+ "@ai-sdk/anthropic": "2.0.50",
"@ai-sdk/azure": "2.0.73",
"@ai-sdk/google": "2.0.42",
"@ai-sdk/google-vertex": "3.0.74",
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx
index ba1dc70b2..6580c683e 100644
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx
@@ -6,6 +6,7 @@ import { DialogSelect, type DialogSelectRef } from "@tui/ui/dialog-select"
import { useDialog } from "@tui/ui/dialog"
import { createDialogProviderOptions, DialogProvider } from "./dialog-provider"
import { Keybind } from "@/util/keybind"
+import { iife } from "@/util/iife"
export function DialogModel() {
const local = useLocal()
@@ -21,73 +22,48 @@ export function DialogModel() {
const options = createMemo(() => {
const query = ref()?.filter
- const favorites = local.model.favorite()
+ const favorites = connected() ? local.model.favorite() : []
const recents = local.model.recent()
- const currentModel = local.model.current()
- const orderedRecents = currentModel
- ? [
- currentModel,
- ...recents.filter(
- (item) => item.providerID !== currentModel.providerID || item.modelID !== currentModel.modelID,
- ),
- ]
- : recents
-
- const isCurrent = (item: { providerID: string; modelID: string }) =>
- currentModel && item.providerID === currentModel.providerID && item.modelID === currentModel.modelID
-
- const currentIsFavorite = currentModel && favorites.some((fav) => isCurrent(fav))
-
- const recentList = orderedRecents
+ const recentList = recents
.filter((item) => !favorites.some((fav) => fav.providerID === item.providerID && fav.modelID === item.modelID))
.slice(0, 5)
- const orderedFavorites = currentModel
- ? [...favorites.filter((item) => isCurrent(item)), ...favorites.filter((item) => !isCurrent(item))]
- : favorites
-
- const orderedRecentList =
- currentModel && !currentIsFavorite
- ? [...recentList.filter((item) => isCurrent(item)), ...recentList.filter((item) => !isCurrent(item))]
- : recentList
-
- const favoriteOptions =
- !query && favorites.length > 0
- ? orderedFavorites.flatMap((item) => {
- const provider = sync.data.provider.find((x) => x.id === item.providerID)
- if (!provider) return []
- const model = provider.models[item.modelID]
- if (!model) return []
- return [
- {
- key: item,
- value: {
- providerID: provider.id,
- modelID: model.id,
- },
- title: model.name ?? item.modelID,
- description: `${provider.name} ★`,
- category: "Favorites",
- disabled: provider.id === "opencode" && model.id.includes("-nano"),
- footer: model.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
- onSelect: () => {
- dialog.clear()
- local.model.set(
- {
- providerID: provider.id,
- modelID: model.id,
- },
- { recent: true },
- )
- },
+ const favoriteOptions = !query
+ ? favorites.flatMap((item) => {
+ const provider = sync.data.provider.find((x) => x.id === item.providerID)
+ if (!provider) return []
+ const model = provider.models[item.modelID]
+ if (!model) return []
+ return [
+ {
+ key: item,
+ value: {
+ providerID: provider.id,
+ modelID: model.id,
},
- ]
- })
- : []
+ title: model.name ?? item.modelID,
+ description: provider.name,
+ category: "Favorites",
+ disabled: provider.id === "opencode" && model.id.includes("-nano"),
+ footer: model.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
+ onSelect: () => {
+ dialog.clear()
+ local.model.set(
+ {
+ providerID: provider.id,
+ modelID: model.id,
+ },
+ { recent: true },
+ )
+ },
+ },
+ ]
+ })
+ : []
const recentOptions = !query
- ? orderedRecentList.flatMap((item) => {
+ ? recentList.flatMap((item) => {
const provider = sync.data.provider.find((x) => x.id === item.providerID)
if (!provider) return []
const model = provider.models[item.modelID]
@@ -137,13 +113,14 @@ export function DialogModel() {
providerID: provider.id,
modelID: model,
}
- const favorite = favorites.some(
- (item) => item.providerID === value.providerID && item.modelID === value.modelID,
- )
return {
value,
title: info.name ?? model,
- description: connected() ? `${provider.name}${favorite ? " ★" : ""}` : undefined,
+ description: favorites.some(
+ (item) => item.providerID === value.providerID && item.modelID === value.modelID,
+ )
+ ? "(Favorite)"
+ : undefined,
category: connected() ? provider.name : undefined,
disabled: provider.id === "opencode" && model.includes("-nano"),
footer: info.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
@@ -165,10 +142,10 @@ export function DialogModel() {
const inFavorites = favorites.some(
(item) => item.providerID === value.providerID && item.modelID === value.modelID,
)
- const inRecents = orderedRecents.some(
+ if (inFavorites) return false
+ const inRecents = recents.some(
(item) => item.providerID === value.providerID && item.modelID === value.modelID,
)
- if (inFavorites) return false
if (inRecents) return false
return true
}),
@@ -196,7 +173,7 @@ export function DialogModel() {
keybind={[
{
keybind: { ctrl: true, name: "a", meta: false, shift: false, leader: false },
- title: connected() ? "Connect provider" : "More providers",
+ title: connected() ? "Connect provider" : "View more providers",
onTrigger() {
dialog.replace(() =>
)
},
@@ -204,6 +181,7 @@ export function DialogModel() {
{
keybind: Keybind.parse("ctrl+f")[0],
title: "Favorite",
+ disabled: !connected(),
onTrigger: (option) => {
local.model.toggleFavorite(option.value as { providerID: string; modelID: string })
},
diff --git a/packages/opencode/src/cli/cmd/tui/component/dialog-provider.tsx b/packages/opencode/src/cli/cmd/tui/component/dialog-provider.tsx
index 30a8bb2fc..8ba7845f2 100644
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-provider.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-provider.tsx
@@ -26,13 +26,15 @@ export function createDialogProviderOptions() {
const options = createMemo(() => {
return pipe(
sync.data.provider_next.all,
+ sortBy((x) => PROVIDER_PRIORITY[x.id] ?? 99),
map((provider) => ({
title: provider.name,
value: provider.id,
- footer: {
- opencode: "Recommended",
- anthropic: "Claude Max or API key",
+ description: {
+ opencode: "(Recommended)",
+ anthropic: "(Claude Max or API key)",
}[provider.id],
+ category: provider.id in PROVIDER_PRIORITY ? "Popular" : "Other",
async onSelect() {
const methods = sync.data.provider_auth[provider.id] ?? [
{
@@ -85,7 +87,6 @@ export function createDialogProviderOptions() {
}
},
})),
- sortBy((x) => PROVIDER_PRIORITY[x.value] ?? 99),
)
})
return options
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-prompt.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-prompt.tsx
index 83f8e27fc..9ae370658 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-prompt.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-prompt.tsx
@@ -55,9 +55,6 @@ export function DialogPrompt(props: DialogPromptProps) {
enter submit
-
- esc cancel
-
)
diff --git a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
index b8d2a5b14..0b15340b2 100644
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
@@ -21,6 +21,7 @@ export interface DialogSelectProps
{
keybind?: {
keybind: Keybind.Info
title: string
+ disabled?: boolean
onTrigger: (option: DialogSelectOption) => void
}[]
current?: T
@@ -150,6 +151,7 @@ export function DialogSelect(props: DialogSelectProps) {
}
for (const item of props.keybind ?? []) {
+ if (item.disabled) continue
if (Keybind.match(item.keybind, keybind.parse(evt))) {
const s = selected()
if (s) {
@@ -171,8 +173,10 @@ export function DialogSelect(props: DialogSelectProps) {
}
props.ref?.(ref)
+ const keybinds = createMemo(() => props.keybind?.filter((x) => !x.disabled) ?? [])
+
return (
-
+
@@ -253,18 +257,20 @@ export function DialogSelect(props: DialogSelectProps) {
)}
-
-
- {(item) => (
-
-
- {item.title}{" "}
-
- {Keybind.toString(item.keybind)}
-
- )}
-
-
+ }>
+
+
+ {(item) => (
+
+
+ {item.title}{" "}
+
+ {Keybind.toString(item.keybind)}
+
+ )}
+
+
+
)
}
diff --git a/packages/opencode/src/format/formatter.ts b/packages/opencode/src/format/formatter.ts
index d1bff181f..404898080 100644
--- a/packages/opencode/src/format/formatter.ts
+++ b/packages/opencode/src/format/formatter.ts
@@ -246,3 +246,12 @@ export const htmlbeautifier: Info = {
return Bun.which("htmlbeautifier") !== null
},
}
+
+export const dart: Info = {
+ name: "dart",
+ command: ["dart", "format", "$FILE"],
+ extensions: [".dart"],
+ async enabled() {
+ return Bun.which("dart") !== null
+ },
+}
diff --git a/packages/opencode/src/lsp/server.ts b/packages/opencode/src/lsp/server.ts
index 0bc229e97..ce2fbfa69 100644
--- a/packages/opencode/src/lsp/server.ts
+++ b/packages/opencode/src/lsp/server.ts
@@ -1166,4 +1166,22 @@ export namespace LSPServer {
}
},
}
+
+ export const Dart: Info = {
+ id: "dart",
+ extensions: [".dart"],
+ root: NearestRoot(["pubspec.yaml", "analysis_options.yaml"]),
+ async spawn(root) {
+ const dart = Bun.which("dart")
+ if (!dart) {
+ log.info("dart not found, please install dart first")
+ return
+ }
+ return {
+ process: spawn(dart, ["language-server", "--lsp"], {
+ cwd: root,
+ }),
+ }
+ },
+ }
}
diff --git a/packages/opencode/src/session/message-v2.ts b/packages/opencode/src/session/message-v2.ts
index 1a9b08d12..718e90921 100644
--- a/packages/opencode/src/session/message-v2.ts
+++ b/packages/opencode/src/session/message-v2.ts
@@ -666,7 +666,7 @@ export namespace MessageV2 {
}
}
- return convertToModelMessages(result)
+ return convertToModelMessages(result.filter((msg) => msg.parts.length > 0))
}
export const stream = fn(Identifier.schema("session"), async function* (sessionID) {
diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.ts
index 5bd833c0f..2f2ba4e94 100644
--- a/packages/opencode/src/session/processor.ts
+++ b/packages/opencode/src/session/processor.ts
@@ -333,7 +333,7 @@ export namespace SessionProcessor {
error: e,
})
const error = MessageV2.fromError(e, { providerID: input.providerID })
- if ((error?.name === "APIError" && error.data.isRetryable) || error.data.message.includes("Overloaded")) {
+ if (error?.name === "APIError" && error.data.isRetryable) {
attempt++
const delay = SessionRetry.delay(attempt, error.name === "APIError" ? error : undefined)
SessionStatus.set(input.sessionID, {
diff --git a/packages/ui/src/components/message-part.tsx b/packages/ui/src/components/message-part.tsx
index 40740fa1f..1c2ba97f3 100644
--- a/packages/ui/src/components/message-part.tsx
+++ b/packages/ui/src/components/message-part.tsx
@@ -17,7 +17,8 @@ import { Diff } from "./diff"
import { DiffChanges } from "./diff-changes"
import { Markdown } from "./markdown"
import { getDirectory, getFilename } from "@opencode-ai/util/path"
-import { sanitize, sanitizePart } from "@opencode-ai/util/sanitize"
+import { sanitizePart } from "@opencode-ai/util/sanitize"
+import { unwrap } from "solid-js/store"
export interface MessageProps {
message: MessageType
@@ -83,15 +84,10 @@ export function UserMessageDisplay(props: { message: UserMessage; parts: PartTyp
export function Part(props: MessagePartProps) {
const component = createMemo(() => PART_MAPPING[props.part.type])
+ const part = createMemo(() => sanitizePart(unwrap(props.part), props.sanitize))
return (
-
+
)
}
@@ -102,7 +98,6 @@ export interface ToolProps {
tool: string
output?: string
hideDetails?: boolean
- sanitize?: RegExp
}
export type ToolComponent = Component
@@ -170,7 +165,6 @@ PART_MAPPING["tool"] = function ToolPartDisplay(props) {
metadata={metadata}
output={part.state.status === "completed" ? part.state.output : undefined}
hideDetails={props.hideDetails}
- sanitize={props.sanitize}
/>
@@ -182,7 +176,7 @@ PART_MAPPING["tool"] = function ToolPartDisplay(props) {
PART_MAPPING["text"] = function TextPartDisplay(props) {
const part = props.part as TextPart
- const sanitized = createMemo(() => (props.sanitize ? (sanitizePart(part, props.sanitize) as TextPart) : part))
+ const sanitized = createMemo(() => (props.sanitize ? (sanitizePart(unwrap(part), props.sanitize) as TextPart) : part))
return (
@@ -211,7 +205,7 @@ ToolRegistry.register({
icon="glasses"
trigger={{
title: "Read",
- subtitle: props.input.filePath ? getFilename(sanitize(props.input.filePath, props.sanitize)) : "",
+ subtitle: props.input.filePath ? getFilename(props.input.filePath) : "",
}}
/>
)
@@ -222,12 +216,9 @@ ToolRegistry.register({
name: "list",
render(props) {
return (
-
+
- {sanitize(props.output, props.sanitize)}
+ {props.output}
)
@@ -335,7 +326,7 @@ ToolRegistry.register({
>
@@ -355,13 +346,9 @@ ToolRegistry.register({
Edit
-
- {getDirectory(sanitize(props.input.filePath!, props.sanitize))}
-
+ {getDirectory(props.input.filePath!)}
-
- {getFilename(sanitize(props.input.filePath ?? "", props.sanitize))}
-
+ {getFilename(props.input.filePath ?? "")}
@@ -376,11 +363,11 @@ ToolRegistry.register({
diff --git a/packages/ui/src/components/pierre.ts b/packages/ui/src/components/pierre.ts
index ef01318de..5821697c7 100644
--- a/packages/ui/src/components/pierre.ts
+++ b/packages/ui/src/components/pierre.ts
@@ -6,7 +6,7 @@ export function createDefaultOptions(style: FileDiffOptions["diffStyle"])
themeType: "system",
disableLineNumbers: false,
overflow: "wrap",
- diffStyle: style,
+ diffStyle: style ?? "unified",
diffIndicators: "bars",
disableBackground: false,
expansionLineCount: 20,
diff --git a/packages/util/src/sanitize.ts b/packages/util/src/sanitize.ts
index 270b618ae..38ad2b290 100644
--- a/packages/util/src/sanitize.ts
+++ b/packages/util/src/sanitize.ts
@@ -2,7 +2,7 @@ import type { Part } from "@opencode-ai/sdk/client"
export const sanitize = (text: string | undefined, remove?: RegExp) => (remove ? text?.replace(remove, "") : text) ?? ""
-export const sanitizePart = (part: Part, remove: RegExp) => {
+export const sanitizePart = (part: Part, remove: RegExp | undefined) => {
if (part.type === "text") {
part.text = sanitize(part.text, remove)
} else if (part.type === "reasoning") {
diff --git a/packages/web/src/content/docs/formatters.mdx b/packages/web/src/content/docs/formatters.mdx
index 9fc41a53d..cc5cb6056 100644
--- a/packages/web/src/content/docs/formatters.mdx
+++ b/packages/web/src/content/docs/formatters.mdx
@@ -26,6 +26,7 @@ OpenCode comes with several built-in formatters for popular languages and framew
| standardrb | .rb, .rake, .gemspec, .ru | `standardrb` command available |
| htmlbeautifier | .erb, .html.erb | `htmlbeautifier` command available |
| air | .R | `air` command available |
+| dart | .dart | `dart` command available |
So if your project has `prettier` in your `package.json`, OpenCode will automatically use it.
diff --git a/packages/web/src/content/docs/lsp.mdx b/packages/web/src/content/docs/lsp.mdx
index 5c12f03f6..af9f2cfc1 100644
--- a/packages/web/src/content/docs/lsp.mdx
+++ b/packages/web/src/content/docs/lsp.mdx
@@ -32,6 +32,7 @@ OpenCode comes with several built-in LSP servers for popular languages:
| lua-ls | .lua | Auto-installs for Lua projects |
| sourcekit-lsp | .swift, .objc, .objcpp | `swift` installed (`xcode` on macOS) |
| php intelephense | .php | Auto-installs for PHP projects |
+| dart | .dart | `dart` command available |
LSP servers are automatically enabled when one of the above file extensions are detected and the requirements are met.
diff --git a/packages/web/src/content/docs/zen.mdx b/packages/web/src/content/docs/zen.mdx
index f672662ed..5632bcca4 100644
--- a/packages/web/src/content/docs/zen.mdx
+++ b/packages/web/src/content/docs/zen.mdx
@@ -108,8 +108,8 @@ We support a pay-as-you-go model. Below are the prices **per 1M tokens**.
| Big Pickle | Free | Free | Free | - |
| Grok Code Fast 1 | Free | Free | Free | - |
| GLM 4.6 | $0.60 | $2.20 | $0.10 | - |
-| Kimi K2 | $0.45 | $2.50 | - | - |
-| Kimi K2 Thinking | $0.60 | $2.50 | - | - |
+| Kimi K2 | $0.40 | $2.50 | - | - |
+| Kimi K2 Thinking | $0.40 | $2.50 | - | - |
| Qwen3 Coder 480B | $0.45 | $1.50 | - | - |
| Claude Sonnet 4.5 (≤ 200K tokens) | $3.00 | $15.00 | $0.30 | $3.75 |
| Claude Sonnet 4.5 (> 200K tokens) | $6.00 | $22.50 | $0.60 | $7.50 |