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
6 changes: 4 additions & 2 deletions packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ import { DialogGoUpsell } from "../../component/dialog-go-upsell"
import { DialogTokenPlan } from "../../component/dialog-token-plan"
import { SessionRetry } from "@/session/retry"
import { getRevertDiffFiles } from "../../util/revert-diff"
import { conversationScrollKey } from "./scroll"

addDefaultParsers(parsers.parsers)

Expand Down Expand Up @@ -1082,8 +1083,9 @@ export function Session() {
}
})

// snap to bottom when session changes
createEffect(on(() => route.sessionID, toBottom))
// Snap to bottom when the rendered conversation changes. Subagent views share
// the same sessionID, so key by agentID as well as sessionID.
createEffect(on(() => conversationScrollKey({ sessionID: route.sessionID, agentID: currentAgentID() }), toBottom))

return (
<context.Provider
Expand Down
3 changes: 3 additions & 0 deletions packages/opencode/src/cli/cmd/tui/routes/session/scroll.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export function conversationScrollKey(input: { sessionID: string; agentID?: string }) {
return `${input.sessionID}:${input.agentID ?? "main"}`
}
11 changes: 11 additions & 0 deletions packages/opencode/test/cli/tui/session-scroll.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { expect, test } from "bun:test"
import { conversationScrollKey } from "../../../src/cli/cmd/tui/routes/session/scroll"

test("conversationScrollKey changes when switching between main and subagent views", () => {
expect(conversationScrollKey({ sessionID: "ses_1", agentID: "main" })).toBe("ses_1:main")
expect(conversationScrollKey({ sessionID: "ses_1", agentID: "agent_1" })).toBe("ses_1:agent_1")
})

test("conversationScrollKey defaults missing agentID to main", () => {
expect(conversationScrollKey({ sessionID: "ses_1" })).toBe("ses_1:main")
})