| undefined,
+ }
const cancelHoverPrefetch = () => {
if (hoverPrefetch.current === undefined) return
clearTimeout(hoverPrefetch.current)
@@ -300,17 +302,15 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
setHoverSession={props.setHoverSession}
messageLabel={messageLabel}
onMessageSelect={(message) => {
- if (!isActive()) {
+ if (!isActive())
layout.pendingMessage.set(`${base64Encode(props.session.directory)}/${props.session.id}`, message.id)
- navigate(`${props.slug}/session/${props.session.id}`)
- return
- }
- window.history.replaceState(null, "", `#message-${message.id}`)
- window.dispatchEvent(new HashChangeEvent("hashchange"))
+
+ navigate(`${props.slug}/session/${props.session.id}#message-${message.id}`)
}}
trigger={item}
/>
+
()
+
+ createEffect(() => {
+ if (!untrack(() => prompt.ready())) return
+ prompt.ready()
+ untrack(() => {
+ if (params.id || !prompt.ready()) return
+ const text = searchParams.prompt
+ if (!text) return
+ prompt.set([{ type: "text", content: text, start: 0, end: text.length }], text.length)
+ setSearchParams({ ...searchParams, prompt: undefined })
+ })
+ })
const [ui, setUi] = createStore({
pendingMessage: undefined as string | undefined,
@@ -405,7 +416,10 @@ export default function Page() {
() => {
const msg = lastUserMessage()
if (!msg) return
- if (msg.agent) local.agent.set(msg.agent)
+ if (msg.agent) {
+ local.agent.set(msg.agent)
+ if (local.agent.current()?.model) return
+ }
if (msg.model) local.model.set(msg.model)
},
),
@@ -679,7 +693,11 @@ export default function Page() {
on(
sessionKey,
() => {
- setTree({ reviewScroll: undefined, pendingDiff: undefined, activeDiff: undefined })
+ setTree({
+ reviewScroll: undefined,
+ pendingDiff: undefined,
+ activeDiff: undefined,
+ })
},
{ defer: true },
),
@@ -702,6 +720,7 @@ export default function Page() {
showAllFiles,
tabForPath: file.tab,
openTab: tabs().open,
+ setActive: tabs().setActive,
loadFile: file.load,
})
diff --git a/packages/app/src/pages/session/composer/session-question-dock.tsx b/packages/app/src/pages/session/composer/session-question-dock.tsx
index fd2ced3dc8..b22a92eb0a 100644
--- a/packages/app/src/pages/session/composer/session-question-dock.tsx
+++ b/packages/app/src/pages/session/composer/session-question-dock.tsx
@@ -8,6 +8,8 @@ import type { QuestionAnswer, QuestionRequest } from "@opencode-ai/sdk/v2"
import { useLanguage } from "@/context/language"
import { useSDK } from "@/context/sdk"
+const cache = new Map()
+
export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit: () => void }> = (props) => {
const sdk = useSDK()
const language = useLanguage()
@@ -15,16 +17,18 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
const questions = createMemo(() => props.request.questions)
const total = createMemo(() => questions().length)
+ const cached = cache.get(props.request.id)
const [store, setStore] = createStore({
- tab: 0,
- answers: [] as QuestionAnswer[],
- custom: [] as string[],
- customOn: [] as boolean[],
+ tab: cached?.tab ?? 0,
+ answers: cached?.answers ?? ([] as QuestionAnswer[]),
+ custom: cached?.custom ?? ([] as string[]),
+ customOn: cached?.customOn ?? ([] as boolean[]),
editing: false,
sending: false,
})
let root: HTMLDivElement | undefined
+ let replied = false
const question = createMemo(() => questions()[store.tab])
const options = createMemo(() => question()?.options ?? [])
@@ -107,6 +111,16 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
})
})
+ onCleanup(() => {
+ if (replied) return
+ cache.set(props.request.id, {
+ tab: store.tab,
+ answers: store.answers.map((a) => (a ? [...a] : [])),
+ custom: store.custom.map((s) => s ?? ""),
+ customOn: store.customOn.map((b) => b ?? false),
+ })
+ })
+
const fail = (err: unknown) => {
const message = err instanceof Error ? err.message : String(err)
showToast({ title: language.t("common.requestFailed"), description: message })
@@ -119,6 +133,8 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
setStore("sending", true)
try {
await sdk.client.question.reply({ requestID: props.request.id, answers })
+ replied = true
+ cache.delete(props.request.id)
} catch (err) {
fail(err)
} finally {
@@ -133,6 +149,8 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
setStore("sending", true)
try {
await sdk.client.question.reject({ requestID: props.request.id })
+ replied = true
+ cache.delete(props.request.id)
} catch (err) {
fail(err)
} finally {
diff --git a/packages/app/src/pages/session/file-tabs.tsx b/packages/app/src/pages/session/file-tabs.tsx
index 93264353bd..77643789d0 100644
--- a/packages/app/src/pages/session/file-tabs.tsx
+++ b/packages/app/src/pages/session/file-tabs.tsx
@@ -234,7 +234,6 @@ export function FileTabContent(props: { tab: string }) {
if (typeof window === "undefined") return
const onKeyDown = (event: KeyboardEvent) => {
- if (event.defaultPrevented) return
if (tabs().active() !== props.tab) return
if (!(event.metaKey || event.ctrlKey) || event.altKey || event.shiftKey) return
if (event.key.toLowerCase() !== "f") return
diff --git a/packages/app/src/pages/session/helpers.test.ts b/packages/app/src/pages/session/helpers.test.ts
index aaa5b932fe..9c77c34af4 100644
--- a/packages/app/src/pages/session/helpers.test.ts
+++ b/packages/app/src/pages/session/helpers.test.ts
@@ -11,12 +11,13 @@ describe("createOpenReviewFile", () => {
return `file://${path}`
},
openTab: (tab) => calls.push(`open:${tab}`),
+ setActive: (tab) => calls.push(`active:${tab}`),
loadFile: (path) => calls.push(`load:${path}`),
})
openReviewFile("src/a.ts")
- expect(calls).toEqual(["show", "load:src/a.ts", "tab:src/a.ts", "open:file://src/a.ts"])
+ expect(calls).toEqual(["show", "load:src/a.ts", "tab:src/a.ts", "open:file://src/a.ts", "active:file://src/a.ts"])
})
})
diff --git a/packages/app/src/pages/session/helpers.ts b/packages/app/src/pages/session/helpers.ts
index 20f1d99a8b..60b26cdf47 100644
--- a/packages/app/src/pages/session/helpers.ts
+++ b/packages/app/src/pages/session/helpers.ts
@@ -24,15 +24,20 @@ export const createOpenReviewFile = (input: {
showAllFiles: () => void
tabForPath: (path: string) => string
openTab: (tab: string) => void
+ setActive: (tab: string) => void
loadFile: (path: string) => any | Promise
}) => {
return (path: string) => {
batch(() => {
input.showAllFiles()
const maybePromise = input.loadFile(path)
- const openTab = () => input.openTab(input.tabForPath(path))
- if (maybePromise instanceof Promise) maybePromise.then(openTab)
- else openTab()
+ const open = () => {
+ const tab = input.tabForPath(path)
+ input.openTab(tab)
+ input.setActive(tab)
+ }
+ if (maybePromise instanceof Promise) maybePromise.then(open)
+ else open()
})
}
}
diff --git a/packages/app/src/pages/session/message-id-from-hash.ts b/packages/app/src/pages/session/message-id-from-hash.ts
new file mode 100644
index 0000000000..2857f4b01d
--- /dev/null
+++ b/packages/app/src/pages/session/message-id-from-hash.ts
@@ -0,0 +1,6 @@
+export const messageIdFromHash = (hash: string) => {
+ const value = hash.startsWith("#") ? hash.slice(1) : hash
+ const match = value.match(/^message-(.+)$/)
+ if (!match) return
+ return match[1]
+}
diff --git a/packages/app/src/pages/session/message-timeline.tsx b/packages/app/src/pages/session/message-timeline.tsx
index 433c36e2e6..f320a2ebbf 100644
--- a/packages/app/src/pages/session/message-timeline.tsx
+++ b/packages/app/src/pages/session/message-timeline.tsx
@@ -1,4 +1,4 @@
-import { For, createEffect, createMemo, on, onCleanup, Show, startTransition, Index, type JSX } from "solid-js"
+import { For, createEffect, createMemo, on, onCleanup, Show, Index, type JSX } from "solid-js"
import { createStore, produce } from "solid-js/store"
import { useNavigate, useParams } from "@solidjs/router"
import { Button } from "@opencode-ai/ui/button"
@@ -160,7 +160,7 @@ function createTimelineStaging(input: TimelineStageInput) {
}
const currentTotal = input.messages().length
count = Math.min(currentTotal, count + input.config.batch)
- startTransition(() => setState("count", count))
+ setState("count", count)
if (count >= currentTotal) {
setState({ completedSession: sessionKey, activeSession: "" })
frame = undefined
@@ -611,7 +611,7 @@ export function MessageTimeline(props: {
-
+
{(id) => (
@@ -646,12 +646,12 @@ export function MessageTimeline(props: {
>
{language.t("common.rename")}
-
void archiveSession(id())}>
+ void archiveSession(id)}>
{language.t("common.archive")}
dialog.show(() => )}
+ onSelect={() => dialog.show(() => )}
>
{language.t("common.delete")}
diff --git a/packages/app/src/pages/session/session-side-panel.tsx b/packages/app/src/pages/session/session-side-panel.tsx
index ad802d15d1..55c1607a09 100644
--- a/packages/app/src/pages/session/session-side-panel.tsx
+++ b/packages/app/src/pages/session/session-side-panel.tsx
@@ -331,7 +331,9 @@ export function SessionSidePanel(props: {
const path = createMemo(() => file.pathFromTab(tab))
return (
- {(p) => }
+
+ {(p) => }
+
)
}}
diff --git a/packages/app/src/pages/session/terminal-panel.tsx b/packages/app/src/pages/session/terminal-panel.tsx
index cc4c17ee21..c8bfc14053 100644
--- a/packages/app/src/pages/session/terminal-panel.tsx
+++ b/packages/app/src/pages/session/terminal-panel.tsx
@@ -191,8 +191,8 @@ export function TerminalPanel() {
{(id) => (
-
- {(pty) => }
+
+ {(pty) => }
)}
@@ -217,10 +217,10 @@ export function TerminalPanel() {
{(id) => (
-
+
{(pty) => (
- terminal.clone(id)} />
+ terminal.clone(id)} />
)}
@@ -229,14 +229,14 @@ export function TerminalPanel() {
-
+
{(draggedId) => (
-
+
{(t) => (
{terminalTabLabel({
- title: t().title,
- titleNumber: t().titleNumber,
+ title: t.title,
+ titleNumber: t.titleNumber,
t: language.t as (key: string, vars?: Record) => string,
})}
diff --git a/packages/app/src/pages/session/use-session-hash-scroll.test.ts b/packages/app/src/pages/session/use-session-hash-scroll.test.ts
index 844f5451e3..7f3389baaa 100644
--- a/packages/app/src/pages/session/use-session-hash-scroll.test.ts
+++ b/packages/app/src/pages/session/use-session-hash-scroll.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, test } from "bun:test"
-import { messageIdFromHash } from "./use-session-hash-scroll"
+import { messageIdFromHash } from "./message-id-from-hash"
describe("messageIdFromHash", () => {
test("parses hash with leading #", () => {
diff --git a/packages/app/src/pages/session/use-session-hash-scroll.ts b/packages/app/src/pages/session/use-session-hash-scroll.ts
index 473409fd99..20e88a3ea3 100644
--- a/packages/app/src/pages/session/use-session-hash-scroll.ts
+++ b/packages/app/src/pages/session/use-session-hash-scroll.ts
@@ -1,12 +1,9 @@
-import { createEffect, createMemo, onCleanup, onMount } from "solid-js"
-import { UserMessage } from "@opencode-ai/sdk/v2"
+import type { UserMessage } from "@opencode-ai/sdk/v2"
+import { useLocation, useNavigate } from "@solidjs/router"
+import { createEffect, createMemo, onMount } from "solid-js"
+import { messageIdFromHash } from "./message-id-from-hash"
-export const messageIdFromHash = (hash: string) => {
- const value = hash.startsWith("#") ? hash.slice(1) : hash
- const match = value.match(/^message-(.+)$/)
- if (!match) return
- return match[1]
-}
+export { messageIdFromHash } from "./message-id-from-hash"
export const useSessionHashScroll = (input: {
sessionKey: () => string
@@ -30,13 +27,18 @@ export const useSessionHashScroll = (input: {
const messageIndex = createMemo(() => new Map(visibleUserMessages().map((m, i) => [m.id, i])))
let pendingKey = ""
+ const location = useLocation()
+ const navigate = useNavigate()
+
const clearMessageHash = () => {
- if (!window.location.hash) return
- window.history.replaceState(null, "", window.location.href.replace(/#.*$/, ""))
+ if (!location.hash) return
+ navigate(location.pathname + location.search, { replace: true })
}
const updateHash = (id: string) => {
- window.history.replaceState(null, "", `#${input.anchor(id)}`)
+ navigate(location.pathname + location.search + `#${input.anchor(id)}`, {
+ replace: true,
+ })
}
const scrollToElement = (el: HTMLElement, behavior: ScrollBehavior) => {
@@ -53,6 +55,7 @@ export const useSessionHashScroll = (input: {
}
const scrollToMessage = (message: UserMessage, behavior: ScrollBehavior = "smooth") => {
+ console.log({ message, behavior })
if (input.currentMessageId() !== message.id) input.setActiveMessage(message)
const index = messageIndex().get(message.id) ?? -1
@@ -100,7 +103,7 @@ export const useSessionHashScroll = (input: {
}
const applyHash = (behavior: ScrollBehavior) => {
- const hash = window.location.hash.slice(1)
+ const hash = location.hash.slice(1)
if (!hash) {
input.autoScroll.forceScrollToBottom()
const el = input.scroller()
@@ -132,6 +135,7 @@ export const useSessionHashScroll = (input: {
}
createEffect(() => {
+ location.hash
if (!input.sessionID() || !input.messagesReady()) return
requestAnimationFrame(() => applyHash("auto"))
})
@@ -155,7 +159,7 @@ export const useSessionHashScroll = (input: {
}
}
- if (!targetId) targetId = messageIdFromHash(window.location.hash)
+ if (!targetId) targetId = messageIdFromHash(location.hash)
if (!targetId) return
if (input.currentMessageId() === targetId) return
@@ -171,14 +175,6 @@ export const useSessionHashScroll = (input: {
if (typeof window !== "undefined" && "scrollRestoration" in window.history) {
window.history.scrollRestoration = "manual"
}
-
- const handler = () => {
- if (!input.sessionID() || !input.messagesReady()) return
- requestAnimationFrame(() => applyHash("auto"))
- }
-
- window.addEventListener("hashchange", handler)
- onCleanup(() => window.removeEventListener("hashchange", handler))
})
return {
diff --git a/packages/app/src/utils/notification-click.ts b/packages/app/src/utils/notification-click.ts
index 94086c5959..316b278206 100644
--- a/packages/app/src/utils/notification-click.ts
+++ b/packages/app/src/utils/notification-click.ts
@@ -7,6 +7,7 @@ export const setNavigate = (fn: (href: string) => void) => {
export const handleNotificationClick = (href?: string) => {
window.focus()
if (!href) return
- if (nav) nav(href)
- else window.location.assign(href)
+ if (nav) return nav(href)
+ console.warn("notification-click: navigate function not set, falling back to window.location.assign")
+ window.location.assign(href)
}
diff --git a/packages/app/src/utils/server-errors.test.ts b/packages/app/src/utils/server-errors.test.ts
index 1969d1afc2..1f53bb8cf6 100644
--- a/packages/app/src/utils/server-errors.test.ts
+++ b/packages/app/src/utils/server-errors.test.ts
@@ -1,8 +1,37 @@
import { describe, expect, test } from "bun:test"
-import type { ConfigInvalidError } from "./server-errors"
-import { formatServerError, parseReabaleConfigInvalidError } from "./server-errors"
+import type { ConfigInvalidError, ProviderModelNotFoundError } from "./server-errors"
+import { formatServerError, parseReadableConfigInvalidError } from "./server-errors"
-describe("parseReabaleConfigInvalidError", () => {
+function fill(text: string, vars?: Record) {
+ if (!vars) return text
+ return text.replace(/{{\s*(\w+)\s*}}/g, (_, key: string) => {
+ const value = vars[key]
+ if (value === undefined) return ""
+ return String(value)
+ })
+}
+
+function useLanguageMock() {
+ const dict: Record = {
+ "error.chain.unknown": "Erro desconhecido",
+ "error.chain.configInvalid": "Arquivo de config em {{path}} invalido",
+ "error.chain.configInvalidWithMessage": "Arquivo de config em {{path}} invalido: {{message}}",
+ "error.chain.modelNotFound": "Modelo nao encontrado: {{provider}}/{{model}}",
+ "error.chain.didYouMean": "Voce quis dizer: {{suggestions}}",
+ "error.chain.checkConfig": "Revise provider/model no config",
+ }
+ return {
+ t(key: string, vars?: Record) {
+ const text = dict[key]
+ if (!text) return key
+ return fill(text, vars)
+ },
+ }
+}
+
+const language = useLanguageMock()
+
+describe("parseReadableConfigInvalidError", () => {
test("formats issues with file path", () => {
const error = {
name: "ConfigInvalidError",
@@ -15,10 +44,10 @@ describe("parseReabaleConfigInvalidError", () => {
},
} satisfies ConfigInvalidError
- const result = parseReabaleConfigInvalidError(error)
+ const result = parseReadableConfigInvalidError(error, language.t)
expect(result).toBe(
- ["Invalid configuration", "opencode.config.ts", "settings.host: Required", "mode: Invalid"].join("\n"),
+ ["Arquivo de config em opencode.config.ts invalido: settings.host: Required", "mode: Invalid"].join("\n"),
)
})
@@ -31,9 +60,9 @@ describe("parseReabaleConfigInvalidError", () => {
},
} satisfies ConfigInvalidError
- const result = parseReabaleConfigInvalidError(error)
+ const result = parseReadableConfigInvalidError(error, language.t)
- expect(result).toBe(["Invalid configuration", "Bad value"].join("\n"))
+ expect(result).toBe("Arquivo de config em config invalido: Bad value")
})
})
@@ -46,24 +75,57 @@ describe("formatServerError", () => {
},
} satisfies ConfigInvalidError
- const result = formatServerError(error)
+ const result = formatServerError(error, language.t)
- expect(result).toBe(["Invalid configuration", "Missing host"].join("\n"))
+ expect(result).toBe("Arquivo de config em config invalido: Missing host")
})
test("returns error messages", () => {
- expect(formatServerError(new Error("Request failed with status 503"))).toBe("Request failed with status 503")
+ expect(formatServerError(new Error("Request failed with status 503"), language.t)).toBe(
+ "Request failed with status 503",
+ )
})
test("returns provided string errors", () => {
- expect(formatServerError("Failed to connect to server")).toBe("Failed to connect to server")
+ expect(formatServerError("Failed to connect to server", language.t)).toBe("Failed to connect to server")
})
- test("falls back to unknown", () => {
- expect(formatServerError(0)).toBe("Unknown error")
+ test("uses translated unknown fallback", () => {
+ expect(formatServerError(0, language.t)).toBe("Erro desconhecido")
})
test("falls back for unknown error objects and names", () => {
- expect(formatServerError({ name: "ServerTimeoutError", data: { seconds: 30 } })).toBe("Unknown error")
+ expect(formatServerError({ name: "ServerTimeoutError", data: { seconds: 30 } }, language.t)).toBe(
+ "Erro desconhecido",
+ )
+ })
+
+ test("formats provider model errors using provider/model", () => {
+ const error = {
+ name: "ProviderModelNotFoundError",
+ data: {
+ providerID: "openai",
+ modelID: "gpt-4.1",
+ },
+ } satisfies ProviderModelNotFoundError
+
+ expect(formatServerError(error, language.t)).toBe(
+ ["Modelo nao encontrado: openai/gpt-4.1", "Revise provider/model no config"].join("\n"),
+ )
+ })
+
+ test("formats provider model suggestions", () => {
+ const error = {
+ name: "ProviderModelNotFoundError",
+ data: {
+ providerID: "x",
+ modelID: "y",
+ suggestions: ["x/y2", "x/y3"],
+ },
+ } satisfies ProviderModelNotFoundError
+
+ expect(formatServerError(error, language.t)).toBe(
+ ["Modelo nao encontrado: x/y", "Voce quis dizer: x/y2, x/y3", "Revise provider/model no config"].join("\n"),
+ )
})
})
diff --git a/packages/app/src/utils/server-errors.ts b/packages/app/src/utils/server-errors.ts
index 85ebca1320..2c3a8c54db 100644
--- a/packages/app/src/utils/server-errors.ts
+++ b/packages/app/src/utils/server-errors.ts
@@ -7,28 +7,31 @@ export type ConfigInvalidError = {
}
}
-type Label = {
- unknown: string
- invalidConfiguration: string
-}
-
-const fallback: Label = {
- unknown: "Unknown error",
- invalidConfiguration: "Invalid configuration",
-}
-
-function resolveLabel(labels: Partial