Skip to content

Commit 5118520

Browse files
committed
refactor(snapshot): remove git snapshot mechanism entirely (anomalyco#216)
Delete the git snapshot mechanism from engine and frontend: - remove src/snapshot/ module, shadow git tracking, patch part output - revert becomes message-only (no file rollback via git checkout) - drop session_diff storage, sync events, TUI diff consumers - narrow Review panel to git/branch vcs sources, remove turn mode - regenerate SDK types without snapshot diff endpoints - keep deprecated schema parsing for historical session compatibility includes pre-existing openapi drift: cli repair endpoint, dsh status, health cli fields (server code predates this regeneration on main)
1 parent 5e2654c commit 5118520

88 files changed

Lines changed: 1688 additions & 3655 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/ellamaka-app/src/components/prompt-input.tsx‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,15 +224,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
224224
normalizeTab: (tab) => (tab.startsWith("file://") ? files.tab(tab) : tab),
225225
}).activeFileTab
226226

227-
const commentInReview = (path: string) => {
228-
const sessionID = params.id
229-
if (!sessionID) return false
230-
231-
const diffs = sync.data.session_diff[sessionID]
232-
if (!diffs) return false
233-
return diffs.some((diff) => diff.file === path)
234-
}
235-
236227
const openComment = (item: { path: string; commentID?: string; commentOrigin?: "review" | "file" }) => {
237228
if (!item.commentID) return
238229

@@ -256,7 +247,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
256247
schedule(attempts)
257248
}
258249

259-
const wantsReview = item.commentOrigin === "review" || (item.commentOrigin !== "file" && commentInReview(item.path))
250+
const wantsReview = item.commentOrigin === "review"
260251
if (wantsReview) {
261252
if (!view().reviewPanel.opened()) view().reviewPanel.open()
262253
layout.fileTree.setTab("changes")

‎packages/ellamaka-app/src/context/directory-sync.ts‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import { createServerSyncContext } from "./server-sync"
1212
import type { Message, Part } from "@opencode-ai/sdk/v2/client"
1313
import { SESSION_CACHE_LIMIT, dropSessionCaches, pickSessionCacheEvictions } from "./global-sync/session-cache"
14-
import { diffs as list, message as clean } from "@/utils/diffs"
14+
import { message as clean } from "@/utils/diffs"
1515
import { useServerSDK } from "./server-sdk"
1616
import { cmpMessage, keyOf } from "./global-sync/utils"
1717

@@ -246,7 +246,6 @@ export const createDirSyncContext = (directory: string, serverSync: ReturnType<t
246246
const initialMessagePageSize = 80
247247
const historyMessagePageSize = 200
248248
const inflight = new Map<string, Promise<void>>()
249-
const inflightDiff = new Map<string, Promise<void>>()
250249
const inflightTodo = new Map<string, Promise<void>>()
251250
const optimistic = new Map<string, Map<string, OptimisticItem>>()
252251
const maxDirs = 30
@@ -563,19 +562,6 @@ export const createDirSyncContext = (directory: string, serverSync: ReturnType<t
563562
await Promise.all([sessionReq, messagesReq])
564563
})
565564
},
566-
async diff(sessionID: string, opts?: { force?: boolean }) {
567-
const [store, setStore] = serverSync.child(directory)
568-
touch(directory, setStore, sessionID)
569-
if (store.session_diff[sessionID] !== undefined && !opts?.force) return
570-
571-
const key = keyFor(directory, sessionID)
572-
return runInflight(inflightDiff, key, () =>
573-
retry(() => client.session.diff({ sessionID })).then((diff) => {
574-
if (!tracked(directory, sessionID)) return
575-
setStore("session_diff", sessionID, reconcile(list(diff.data), { key: "file" }))
576-
}),
577-
)
578-
},
579565
async todo(sessionID: string, opts?: { force?: boolean }) {
580566
const [store, setStore] = serverSync.child(directory)
581567
touch(directory, setStore, sessionID)

‎packages/ellamaka-app/src/context/global-sync/bootstrap.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ describe("bootstrapDirectory", () => {
2828
session_working(id: string) {
2929
return this.session_status[id]?.type !== "idle"
3030
},
31-
session_diff: {},
3231
todo: {},
3332
permission: {},
3433
question: {},

‎packages/ellamaka-app/src/context/global-sync/child-store.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ export function createChildStoreManager(input: {
221221
const type = this.session_status[id]?.type
222222
return (type ?? "idle") !== "idle"
223223
},
224-
session_diff: {},
225224
todo: {},
226225
permission: {},
227226
question: {},

‎packages/ellamaka-app/src/context/global-sync/event-reducer.test.ts‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ const baseState = (input: Partial<State> = {}) =>
7171
session: [],
7272
sessionTotal: 0,
7373
session_status: {},
74-
session_diff: {},
7574
todo: {},
7675
permission: {},
7776
question: {},
@@ -174,7 +173,6 @@ describe("applyDirectoryEvent", () => {
174173
sessionTotal: 2,
175174
message: { ses_1: [message] },
176175
part: { [message.id]: [textPart("prt_1", "ses_1", message.id)] },
177-
session_diff: { ses_1: [] },
178176
todo: { ses_1: [] },
179177
permission: { ses_1: [] },
180178
question: { ses_1: [] },
@@ -195,7 +193,6 @@ describe("applyDirectoryEvent", () => {
195193
expect(store.sessionTotal).toBe(1)
196194
expect(store.message.ses_1).toEqual([message])
197195
expect(store.part[message.id]).toEqual([textPart("prt_1", "ses_1", message.id)])
198-
expect(store.session_diff.ses_1).toBeUndefined()
199196
expect(store.todo.ses_1).toBeUndefined()
200197
expect(store.permission.ses_1).toBeUndefined()
201198
expect(store.question.ses_1).toBeUndefined()
@@ -220,7 +217,6 @@ describe("applyDirectoryEvent", () => {
220217
sessionTotal: 2,
221218
message: { [item.info.id]: [message] },
222219
part: { [message.id]: [textPart("prt_1", item.info.id, message.id)] },
223-
session_diff: { [item.info.id]: [] },
224220
todo: { [item.info.id]: [] },
225221
permission: { [item.info.id]: [] },
226222
question: { [item.info.id]: [] },
@@ -241,7 +237,6 @@ describe("applyDirectoryEvent", () => {
241237
expect(store.sessionTotal).toBe(item.expectedTotal)
242238
expect(store.message[item.info.id]).toEqual([message])
243239
expect(store.part[message.id]).toEqual([textPart("prt_1", item.info.id, message.id)])
244-
expect(store.session_diff[item.info.id]).toBeUndefined()
245240
expect(store.todo[item.info.id]).toBeUndefined()
246241
expect(store.permission[item.info.id]).toBeUndefined()
247242
expect(store.question[item.info.id]).toBeUndefined()
@@ -260,7 +255,6 @@ describe("applyDirectoryEvent", () => {
260255
session: [dropped],
261256
message: { [dropped.id]: [message] },
262257
part: { [message.id]: [textPart("prt_1", dropped.id, message.id)] },
263-
session_diff: { [dropped.id]: [] },
264258
todo: { [dropped.id]: [] },
265259
permission: { [dropped.id]: [] },
266260
question: { [dropped.id]: [] },
@@ -284,14 +278,31 @@ describe("applyDirectoryEvent", () => {
284278
expect(store.session.map((x) => x.id)).toEqual([kept.id])
285279
expect(store.message[dropped.id]).toEqual([message])
286280
expect(store.part[message.id]).toEqual([textPart("prt_1", dropped.id, message.id)])
287-
expect(store.session_diff[dropped.id]).toBeUndefined()
288281
expect(store.todo[dropped.id]).toBeUndefined()
289282
expect(store.permission[dropped.id]).toBeUndefined()
290283
expect(store.question[dropped.id]).toBeUndefined()
291284
expect(store.session_status[dropped.id]).toBeUndefined()
292285
expect(todos).toEqual([dropped.id])
293286
})
294287

288+
// Snapshot mechanism removed (plan 216): the engine no longer emits
289+
// session.diff events and the session_diff cache no longer exists, so the
290+
// reducer must ignore the event entirely.
291+
test("ignores session.diff events", () => {
292+
const [store, setStore] = createStore(baseState())
293+
294+
applyDirectoryEvent({
295+
event: { type: "session.diff", properties: { sessionID: "ses_1", diff: [] } },
296+
store,
297+
setStore,
298+
push() {},
299+
directory: "/tmp",
300+
loadLsp() {},
301+
})
302+
303+
expect((store as Record<string, unknown>).session_diff).toBeUndefined()
304+
})
305+
295306
test("cleanupDroppedSessionCaches preserves part-only state and message history", () => {
296307
const [store, setStore] = createStore(
297308
baseState({

‎packages/ellamaka-app/src/context/global-sync/event-reducer.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ import type {
88
QuestionRequest,
99
Session,
1010
SessionStatus,
11-
SnapshotFileDiff,
1211
Todo,
1312
} from "@opencode-ai/sdk/v2/client"
1413
import type { State, VcsCache } from "./types"
1514
import { trimSessions } from "./session-trim"
1615
import { dropSessionCaches } from "./session-cache"
17-
import { diffs as list, message as clean } from "@/utils/diffs"
16+
import { message as clean } from "@/utils/diffs"
1817
import { keyOf } from "./utils"
1918

2019
const SKIP_PARTS = new Set(["patch", "step-start", "step-finish"])
@@ -75,7 +74,6 @@ export function cleanupDroppedSessionCaches(
7574
const keep = new Set(next.map((item) => item.id))
7675
const stale = [
7776
...Object.keys(store.message),
78-
...Object.keys(store.session_diff),
7977
...Object.keys(store.todo),
8078
...Object.keys(store.permission),
8179
...Object.keys(store.question),
@@ -171,11 +169,6 @@ export function applyDirectoryEvent(input: {
171169
input.setStore("sessionTotal", (value) => Math.max(0, value - 1))
172170
break
173171
}
174-
case "session.diff": {
175-
const props = event.properties as { sessionID: string; diff: SnapshotFileDiff[] }
176-
input.setStore("session_diff", props.sessionID, reconcile(list(props.diff), { key: "file" }))
177-
break
178-
}
179172
case "todo.updated": {
180173
const props = event.properties as { sessionID: string; todos: Todo[] }
181174
input.setStore("todo", props.sessionID, reconcile(props.todos, { key: "id" }))

‎packages/ellamaka-app/src/context/global-sync/session-cache.test.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import type {
55
PermissionRequest,
66
QuestionRequest,
77
SessionStatus,
8-
SnapshotFileDiff,
98
Todo,
109
} from "@opencode-ai/sdk/v2/client"
1110
import { dropSessionCaches, pickSessionCacheEvictions } from "./session-cache"
@@ -33,7 +32,6 @@ describe("app session cache", () => {
3332
test("dropSessionCaches clears orphaned parts without message rows", () => {
3433
const store: {
3534
session_status: Record<string, SessionStatus | undefined>
36-
session_diff: Record<string, SnapshotFileDiff[] | undefined>
3735
todo: Record<string, Todo[] | undefined>
3836
message: Record<string, Message[] | undefined>
3937
part: Record<string, Part[] | undefined>
@@ -42,7 +40,6 @@ describe("app session cache", () => {
4240
part_text_accum_delta: Record<string, string | undefined>
4341
} = {
4442
session_status: { ses_1: { type: "busy" } as SessionStatus },
45-
session_diff: { ses_1: [] },
4643
todo: { ses_1: [] as Todo[] },
4744
message: {},
4845
part: { msg_1: [part("prt_1", "ses_1", "msg_1")] },
@@ -57,7 +54,6 @@ describe("app session cache", () => {
5754
expect(store.part.msg_1).toEqual([part("prt_1", "ses_1", "msg_1")])
5855
expect(store.part_text_accum_delta.prt_1).toBe("streamed text")
5956
expect(store.todo.ses_1).toBeUndefined()
60-
expect(store.session_diff.ses_1).toBeUndefined()
6157
expect(store.session_status.ses_1).toBeUndefined()
6258
expect(store.permission.ses_1).toBeUndefined()
6359
expect(store.question.ses_1).toBeUndefined()
@@ -67,7 +63,6 @@ describe("app session cache", () => {
6763
const m = msg("msg_1", "ses_1")
6864
const store: {
6965
session_status: Record<string, SessionStatus | undefined>
70-
session_diff: Record<string, SnapshotFileDiff[] | undefined>
7166
todo: Record<string, Todo[] | undefined>
7267
message: Record<string, Message[] | undefined>
7368
part: Record<string, Part[] | undefined>
@@ -76,7 +71,6 @@ describe("app session cache", () => {
7671
part_text_accum_delta: Record<string, string | undefined>
7772
} = {
7873
session_status: {},
79-
session_diff: {},
8074
todo: {},
8175
message: { ses_1: [m] },
8276
part: { [m.id]: [part("prt_1", "ses_1", m.id)] },

‎packages/ellamaka-app/src/context/global-sync/session-cache.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ import type {
44
PermissionRequest,
55
QuestionRequest,
66
SessionStatus,
7-
SnapshotFileDiff,
87
Todo,
98
} from "@opencode-ai/sdk/v2/client"
109

1110
export const SESSION_CACHE_LIMIT = 40
1211

1312
type SessionCache = {
1413
session_status: Record<string, SessionStatus | undefined>
15-
session_diff: Record<string, SnapshotFileDiff[] | undefined>
1614
todo: Record<string, Todo[] | undefined>
1715
message: Record<string, Message[] | undefined>
1816
part: Record<string, Part[] | undefined>
@@ -27,7 +25,6 @@ export function dropSessionCaches(store: SessionCache, sessionIDs: Iterable<stri
2725

2826
for (const sessionID of stale) {
2927
delete store.todo[sessionID]
30-
delete store.session_diff[sessionID]
3128
delete store.session_status[sessionID]
3229
delete store.permission[sessionID]
3330
delete store.question[sessionID]

‎packages/ellamaka-app/src/context/global-sync/types.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import type {
1111
QuestionRequest,
1212
Session,
1313
SessionStatus,
14-
SnapshotFileDiff,
1514
Todo,
1615
VcsInfo,
1716
} from "@opencode-ai/sdk/v2/client"
@@ -47,9 +46,6 @@ export type State = {
4746
[sessionID: string]: SessionStatus
4847
}
4948
session_working(id: string): boolean
50-
session_diff: {
51-
[sessionID: string]: SnapshotFileDiff[]
52-
}
5349
todo: {
5450
[sessionID: string]: Todo[]
5551
}

‎packages/ellamaka-app/src/i18n/ar.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,7 @@ export const dict = {
445445
"session.review.change.other": "تغييرات",
446446
"session.review.loadingChanges": "جارٍ تحميل التغييرات...",
447447
"session.review.empty": "لا توجد تغييرات في هذه الجلسة بعد",
448-
"session.review.noChanges": "لا توجد تغييرات",
449448
"session.review.noVcs": "لم يتم اكتشاف نظام التحكم في الإصدار Git، لن يتم عرض التغييرات",
450-
"session.review.noSnapshot": "تم تعطيل تتبع اللقطات في التكوين، لذا فإن تغييرات الجلسة غير متوفرة",
451449
"session.files.selectToOpen": "اختر ملفًا لفتحه",
452450
"session.files.all": "كل الملفات",
453451
"session.files.empty": "لا توجد ملفات",

0 commit comments

Comments
 (0)