Skip to content

fix: drop session diff patches from tui cache #22176

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
thdxr wants to merge 1 commit into
base: dev
Choose a base branch
from
+15 −3
Open

fix: drop session diff patches from tui cache #22176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions packages/opencode/src/cli/cmd/tui/context/sync.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ import { batch, createEffect, on } from "solid-js"
import { Log } from "@/util/log"
import { ConsoleState, emptyConsoleState, type ConsoleState as ConsoleStateType } from "@/config/console-state"

type SessionDiffSummary = Pick<Snapshot.FileDiff, "file" | "additions" | "deletions">

function summarizeDiff(diff?: Snapshot.FileDiff[]): SessionDiffSummary[] {
return (diff ?? []).map((item) => ({
file: item.file,
additions: item.additions,
deletions: item.deletions,
}))
}

export const { use: useSync, provider: SyncProvider } = createSimpleContext({
name: "Sync",
init: () => {
Expand All @@ -55,7 +65,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
[sessionID: string]: SessionStatus
}
session_diff: {
[sessionID: string]: Snapshot.FileDiff[]
[sessionID: string]: SessionDiffSummary[]
}
todo: {
[sessionID: string]: Todo[]
Expand Down Expand Up @@ -193,7 +203,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
break

case "session.diff":
setStore("session_diff", event.properties.sessionID, event.properties.diff)
setStore("session_diff", event.properties.sessionID, summarizeDiff(event.properties.diff))
break

case "session.deleted": {
Expand Down Expand Up @@ -503,7 +513,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
for (const message of messages.data!) {
draft.part[message.info.id] = message.parts
}
draft.session_diff[sessionID] = diff.data ?? []
draft.session_diff[sessionID] = summarizeDiff(diff.data)
}),
)
fullSyncedSessions.add(sessionID)
Expand Down
2 changes: 2 additions & 0 deletions packages/opencode/test/cli/tui/sync-provider.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ describe("SyncProvider", () => {
expect(sync.data.message.ses_1[0]?.id).toBe("msg_1")
expect(sync.data.part.msg_1[0]).toMatchObject({ type: "text", text: "part-ws_a" })
expect(sync.data.session_diff.ses_1[0]?.file).toBe("ws_a.ts")
expect(sync.data.session_diff.ses_1[0]).not.toHaveProperty("patch")

log.length = 0
project.workspace.set("ws_b")
Expand All @@ -285,6 +286,7 @@ describe("SyncProvider", () => {
expect(sync.data.message.ses_1[0]?.id).toBe("msg_1")
expect(sync.data.part.msg_1[0]).toMatchObject({ type: "text", text: "part-ws_b" })
expect(sync.data.session_diff.ses_1[0]?.file).toBe("ws_b.ts")
expect(sync.data.session_diff.ses_1[0]).not.toHaveProperty("patch")
} finally {
app.renderer.destroy()
}
Expand Down
Loading