Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function DialogAgent() {
return (
<DialogSelect
title="Select agent"
current={local.agent.current().name}
current={local.agent.current()?.name ?? ""}
options={options()}
onSelect={(option) => {
local.agent.set(option.value)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function DialogStatus() {
const sync = useSync()
const { theme } = useTheme()

const enabledFormatters = createMemo(() => sync.data.formatter.filter((f) => f.enabled))
const enabledFormatters = createMemo(() => sync.data.formatter?.filter((f) => f.enabled) ?? [])

const plugins = createMemo(() => {
const list = sync.data.config.plugin ?? []
Expand Down
16 changes: 8 additions & 8 deletions packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ export function Prompt(props: PromptProps) {
if (store.mode === "shell") {
sdk.client.session.shell({
sessionID,
agent: local.agent.current().name,
agent: currentAgent(),
model: {
providerID: selectedModel.providerID,
modelID: selectedModel.modelID,
Expand All @@ -551,7 +551,7 @@ export function Prompt(props: PromptProps) {
sessionID,
command: command.slice(1),
arguments: args.join(" "),
agent: local.agent.current().name,
agent: currentAgent(),
model: `${selectedModel.providerID}/${selectedModel.modelID}`,
messageID,
variant,
Expand All @@ -568,7 +568,7 @@ export function Prompt(props: PromptProps) {
sessionID,
...selectedModel,
messageID,
agent: local.agent.current().name,
agent: currentAgent(),
model: selectedModel,
variant,
parts: [
Expand Down Expand Up @@ -689,7 +689,7 @@ export function Prompt(props: PromptProps) {
const highlight = createMemo(() => {
if (keybind.leader) return theme.border
if (store.mode === "shell") return theme.primary
return local.agent.color(local.agent.current().name)
return local.agent.color(currentAgent())
})

const showVariant = createMemo(() => {
Expand All @@ -699,8 +699,10 @@ export function Prompt(props: PromptProps) {
return !!current
})

const currentAgent = createMemo(() => local.agent.current()?.name ?? "build")

const spinnerDef = createMemo(() => {
const color = local.agent.color(local.agent.current().name)
const color = local.agent.color(local.agent.current()?.name ?? "build")
return {
frames: createFrames({
color,
Expand Down Expand Up @@ -933,9 +935,7 @@ export function Prompt(props: PromptProps) {
syntaxStyle={syntax()}
/>
<box flexDirection="row" flexShrink={0} paddingTop={1} gap={1}>
<text fg={highlight()}>
{store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
</text>
<text fg={highlight()}>{store.mode === "shell" ? "Shell" : Locale.titlecase(currentAgent())} </text>
<Show when={store.mode === "normal"}>
<box flexDirection="row" gap={1}>
<text flexShrink={0} fg={keybind.leader ? theme.textMuted : theme.text}>
Expand Down
2 changes: 1 addition & 1 deletion packages/opencode/src/session/message-v2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ export namespace MessageV2 {
case (e as SystemError)?.code === "ECONNRESET":
return new MessageV2.APIError(
{
message: "Connection reset by server",
message: "Connection reset by server. If this persists, check your network/proxy settings.",
isRetryable: true,
metadata: {
code: (e as SystemError).code ?? "",
Expand Down
7 changes: 4 additions & 3 deletions packages/opencode/test/session/retry.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ describe("session.message-v2.fromError", () => {

expect(MessageV2.APIError.isInstance(result)).toBe(true)
expect((result as MessageV2.APIError).data.isRetryable).toBe(true)
expect((result as MessageV2.APIError).data.message).toBe("Connection reset by server")
expect((result as MessageV2.APIError).data.message).toInclude("Connection reset by server")
expect((result as MessageV2.APIError).data.message).toInclude("network/proxy")
expect((result as MessageV2.APIError).data.metadata?.code).toBe("ECONNRESET")
expect((result as MessageV2.APIError).data.metadata?.message).toInclude("socket connection")
},
Expand All @@ -119,13 +120,13 @@ describe("session.message-v2.fromError", () => {

test("ECONNRESET socket error is retryable", () => {
const error = new MessageV2.APIError({
message: "Connection reset by server",
message: "Connection reset by server. If this persists, check your network/proxy settings.",
isRetryable: true,
metadata: { code: "ECONNRESET", message: "The socket connection was closed unexpectedly" },
}).toObject() as MessageV2.APIError

const retryable = SessionRetry.retryable(error)
expect(retryable).toBeDefined()
expect(retryable).toBe("Connection reset by server")
expect(retryable).toInclude("Connection reset by server")
})
})