Skip to content

Commit 226a5c2

Browse files
committed
tui: fix optional session access to prevent runtime errors
1 parent f8442ad commit 226a5c2

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

  • packages/opencode/src/cli/cmd/tui/routes/session

‎packages/opencode/src/cli/cmd/tui/routes/session/index.tsx‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export function Session() {
107107
const kv = useKV()
108108
const { theme } = useTheme()
109109
const promptRef = usePromptRef()
110-
const session = createMemo(() => sync.session.get(route.sessionID)!)
110+
const session = createMemo(() => sync.session.get(route.sessionID))
111111
const children = createMemo(() => {
112112
const parentID = session()?.parentID ?? session()?.id
113113
return sync.data.session
@@ -116,7 +116,7 @@ export function Session() {
116116
})
117117
const messages = createMemo(() => sync.data.message[route.sessionID] ?? [])
118118
const permissions = createMemo(() => {
119-
if (session().parentID) return sync.data.permission[route.sessionID] ?? []
119+
if (session()?.parentID) return sync.data.permission[route.sessionID] ?? []
120120
return children().flatMap((x) => sync.data.permission[x.id] ?? [])
121121
})
122122

@@ -381,7 +381,7 @@ export function Session() {
381381
onSelect: async (dialog) => {
382382
const status = sync.data.session_status?.[route.sessionID]
383383
if (status?.type !== "idle") await sdk.client.session.abort({ sessionID: route.sessionID }).catch(() => {})
384-
const revert = session().revert?.messageID
384+
const revert = session()?.revert?.messageID
385385
const message = messages().findLast((x) => (!revert || x.id < revert) && x.role === "user")
386386
if (!message) return
387387
sdk.client.session
@@ -416,7 +416,7 @@ export function Session() {
416416
category: "Session",
417417
onSelect: (dialog) => {
418418
dialog.clear()
419-
const messageID = session().revert?.messageID
419+
const messageID = session()?.revert?.messageID
420420
if (!messageID) return
421421
const message = messages().find((x) => x.role === "user" && x.id > messageID)
422422
if (!message) {
@@ -715,6 +715,7 @@ export function Session() {
715715
onSelect: async (dialog) => {
716716
try {
717717
const sessionData = session()
718+
if (!sessionData) return
718719
const sessionMessages = messages()
719720
const transcript = formatTranscript(
720721
sessionData,
@@ -741,6 +742,7 @@ export function Session() {
741742
onSelect: async (dialog) => {
742743
try {
743744
const sessionData = session()
745+
if (!sessionData) return
744746
const sessionMessages = messages()
745747

746748
const defaultFilename = `session-${sessionData.id.slice(0, 8)}.md`
@@ -1025,7 +1027,7 @@ export function Session() {
10251027
<PermissionPrompt request={permissions()[0]} />
10261028
</Show>
10271029
<Prompt
1028-
visible={!session().parentID && permissions().length === 0}
1030+
visible={!session()?.parentID && permissions().length === 0}
10291031
ref={(r) => {
10301032
prompt = r
10311033
promptRef.set(r)

0 commit comments

Comments
 (0)