Skip to content

Refactor (packages/app/src/context/server-session-v2-reducer.ts): Function with many parameters #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zrusekko-cmu wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Refactor (packages/app/src/context/server-session-v2-reducer.ts): Function with many parameters #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94bc6f1
Add a working devcontainer file
zrusekko-cmu Sep 1, 2026
2959e6f
Add Qlty to devcontainer
zrusekko-cmu Sep 7, 2026
32e149a
Refactor updateContent function to reduce parameters
zrusekko-cmu Sep 8, 2026
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
9 changes: 9 additions & 0 deletions .devcontainer/devcontainer-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"features": {
"ghcr.io/devcontainers/features/git:1": {
"version": "1.3.8",
"resolved": "ghcr.io/devcontainers/features/git@sha256:fd75977de13a9979000e0e78baf949adb0ca71d2398995fa22e0a36d7e7e7fe2",
"integrity": "sha256:fd75977de13a9979000e0e78baf949adb0ca71d2398995fa22e0a36d7e7e7fe2"
}
}
}
11 changes: 11 additions & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "opencode-dev",
"image": "oven/bun:1.3",
"features": {
"ghcr.io/devcontainers/features/git:1": {}
},
"remoteEnv": {
"PATH": "/root/.qlty/bin:${containerEnv:PATH}"
},
"postCreateCommand": "apt-get update && apt-get install -y python3 make g++ lcov curl xz-utils && curl https://qlty.sh | bash"
}
99 changes: 99 additions & 0 deletions packages/app/src/context/server-session-v2-reducer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,103 @@ describe("v2 session reducer", () => {

expect(result).toMatchObject({ sessionID: "ses_1", missing: "msg_user", touched: [] })
})

test("projects streaming reasoning content by ordinal", () => {
const reducer = createV2SessionReducer()
let messages: SessionMessageInfo[] = []
const apply = (input: object) => {
const result = reducer.reduce(messages, event(input))
if (result) messages = result.messages
}

apply({
...base,
id: "evt_step",
type: "session.step.started",
data: {
sessionID: "ses_1",
assistantMessageID: "msg_assistant",
agent: "build",
model: { id: "model", providerID: "provider" },
},
})
apply({
...base,
id: "evt_reasoning_start",
type: "session.reasoning.started",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 0, state: "thinking" },
})
apply({
...base,
id: "evt_reasoning_delta",
type: "session.reasoning.delta",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 0, delta: "hmm" },
})
apply({
...base,
id: "evt_reasoning_end",
type: "session.reasoning.ended",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 0, text: "hmm, ok", state: "done" },
})

expect(messages[0]).toMatchObject({
type: "assistant",
content: [{ type: "reasoning", text: "hmm, ok", state: "done" }],
})
})

test("updates the correct text content by ordinal", () => {
const reducer = createV2SessionReducer()
let messages: SessionMessageInfo[] = []
const apply = (input: object) => {
const result = reducer.reduce(messages, event(input))
if (result) messages = result.messages
}

apply({ ...base, id: "evt_step", type: "session.step.started", data: {
sessionID: "ses_1", assistantMessageID: "msg_assistant", agent: "build",
model: { id: "model", providerID: "provider" },
}})
apply({ ...base, id: "evt_t0_start", type: "session.text.started",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 0 } })
apply({ ...base, id: "evt_t1_start", type: "session.text.started",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 1 } })
apply({ ...base, id: "evt_t0_end", type: "session.text.ended",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 0, text: "first" } })
apply({ ...base, id: "evt_t1_end", type: "session.text.ended",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 1, text: "second" } })

expect(messages[0]).toMatchObject({
content: [{ type: "text", text: "first" }, { type: "text", text: "second" }],
})
})

test("updates reasoning content without affecting text content", () => {
const reducer = createV2SessionReducer()
let messages: SessionMessageInfo[] = []
const apply = (input: object) => {
const result = reducer.reduce(messages, event(input))
if (result) messages = result.messages
}

apply({ ...base, id: "evt_step", type: "session.step.started", data: {
sessionID: "ses_1", assistantMessageID: "msg_assistant", agent: "build",
model: { id: "model", providerID: "provider" },
}})
apply({ ...base, id: "evt_text_start", type: "session.text.started",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 0 } })
apply({ ...base, id: "evt_text_end", type: "session.text.ended",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 0, text: "unchanged" } })
apply({ ...base, id: "evt_reasoning_start", type: "session.reasoning.started",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 0, state: "thinking" } })
apply({ ...base, id: "evt_reasoning_end", type: "session.reasoning.ended",
data: { sessionID: "ses_1", assistantMessageID: "msg_assistant", ordinal: 0, text: "done", state: "done" } })

expect(messages[0]).toMatchObject({
content: [
{ type: "text", text: "unchanged" },
{ type: "reasoning", text: "done" },
],
})
})
})
66 changes: 42 additions & 24 deletions packages/app/src/context/server-session-v2-reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,15 +193,27 @@ export function createV2SessionReducer() {
content: insertOrdinal(item.content, "text", event.data.ordinal, { type: "text", text: "" }),
}))
case "session.text.delta":
return updateContent(source, event.data.assistantMessageID, sessionID, "text", event.data.ordinal, (item) => ({
...item,
text: item.text + event.data.delta,
}))
return updateContent(
source,
{
messageID: event.data.assistantMessageID,
sessionID,
type: "text",
ordinal: event.data.ordinal
},
(item) => ({ ...item, text: item.text + event.data.delta }),
)
case "session.text.ended":
return updateContent(source, event.data.assistantMessageID, sessionID, "text", event.data.ordinal, (item) => ({
...item,
text: event.data.text,
}))
return updateContent(
source,
{
messageID: event.data.assistantMessageID,
sessionID,
type: "text",
ordinal: event.data.ordinal
},
(item) => ({ ...item, text: event.data.text }),
)
case "session.reasoning.started":
return updateAssistant(source, event.data.assistantMessageID, sessionID, (item) => ({
...item,
Expand All @@ -215,22 +227,23 @@ export function createV2SessionReducer() {
case "session.reasoning.delta":
return updateContent(
source,
event.data.assistantMessageID,
sessionID,
"reasoning",
event.data.ordinal,
(item) => ({
...item,
text: item.text + event.data.delta,
}),
{
messageID: event.data.assistantMessageID,
sessionID,
type: "reasoning",
ordinal: event.data.ordinal
},
(item) => ({ ...item, text: item.text + event.data.delta }),
)
case "session.reasoning.ended":
return updateContent(
source,
event.data.assistantMessageID,
sessionID,
"reasoning",
event.data.ordinal,
{
messageID: event.data.assistantMessageID,
sessionID,
type: "reasoning",
ordinal: event.data.ordinal
},
(item) => ({
...item,
text: event.data.text,
Expand Down Expand Up @@ -460,16 +473,21 @@ function updateAssistant(
}
}

interface UpdateContentTarget<T extends "text" | "reasoning"> {
messageID: string
sessionID: string
type: T
ordinal: number
}

function updateContent<T extends "text" | "reasoning">(
source: readonly SessionMessageInfo[],
messageID: string,
sessionID: string,
type: T,
ordinal: number,
target: UpdateContentTarget<T>,
apply: (
item: Extract<Assistant["content"][number], { type: T }>,
) => Extract<Assistant["content"][number], { type: T }>,
) {
const { messageID, sessionID, type, ordinal } = target
return updateAssistant(source, messageID, sessionID, (assistant) => {
let index = -1
return {
Expand Down
Loading