Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.
Fix OpenCode raw text delta assembly (#2526)
Kiri110K271d65e047c5
diff --git a/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts b/apps/server/src/provider/Layers/OpenCodeAdapter.test.tsindex c23d9b62e..66dc5edc6 100644--- a/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts+++ b/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts@@ -559,17 +559,98 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {}),);- it.effect("deduplicates overlapping assistant text deltas after part updates", () =>+ it.effect("appends raw assistant text deltas and reconciles part update snapshots", () =>Effect.sync(() => {const firstUpdate = mergeOpenCodeAssistantText(undefined, "Hello");const overlapDelta = appendOpenCodeAssistantTextDelta(firstUpdate.latestText, "lo world");- const secondUpdate = mergeOpenCodeAssistantText(overlapDelta.nextText, "Hello world!");+ const secondUpdate = mergeOpenCodeAssistantText(overlapDelta.nextText, "Hellolo world");assert.deepEqual([firstUpdate.deltaToEmit, overlapDelta.deltaToEmit, secondUpdate.deltaToEmit],- ["Hello", " world", "!"],+ ["Hello", "lo world", ""],);- assert.equal(secondUpdate.latestText, "Hello world!");+ assert.equal(secondUpdate.latestText, "Hellolo world");+ }),+ );++ it.effect("does not strip coincidental prefix overlap from OpenCode part deltas", () =>+ Effect.gen(function* () {+ const adapter = yield* OpenCodeAdapter;+ const threadId = asThreadId("thread-opencode-raw-delta");+ const part = {+ id: "part-raw-delta",+ sessionID: "http://127.0.0.1:9999/session",+ messageID: "msg-raw-delta",+ type: "text",+ text: "A B",+ time: { start: 1 },+ };+ runtimeMock.state.subscribedEvents = [+ {+ type: "message.updated",+ properties: {+ sessionID: "http://127.0.0.1:9999/session",+ info: {+ id: "msg-raw-delta",+ role: "assistant",+ },+ },+ },+ {+ type: "message.part.updated",+ properties: {+ sessionID: "http://127.0.0.1:9999/session",+ part,+ time: 1,+ },+ },+ {+ type: "message.part.delta",+ properties: {+ sessionID: "http://127.0.0.1:9999/session",+ messageID: "msg-raw-delta",+ partID: "part-raw-delta",+ field: "text",+ delta: "Bonus",+ },+ },+ {+ type: "message.part.updated",+ properties: {+ sessionID: "http://127.0.0.1:9999/session",+ part: {+ ...part,+ text: "A BBonus",+ time: { start: 1, end: 2 },+ },+ time: 2,+ },+ },+ ];+ const eventsFiber = yield* adapter.streamEvents.pipe(+ Stream.filter((event) => event.threadId === threadId),+ Stream.take(5),+ Stream.runCollect,+ Effect.forkChild,+ );++ yield* adapter.startSession({+ provider: ProviderDriverKind.make("opencode"),+ threadId,+ runtimeMode: "full-access",+ });++ const events = Array.from(yield* Fiber.join(eventsFiber).pipe(Effect.timeout("1 second")));+ const deltas = events.filter((event) => event.type === "content.delta");+ assert.deepEqual(+ deltas.map((event) => (event.type === "content.delta" ? event.payload.delta : "")),+ ["A B", "Bonus"],+ );+ assert.equal(events.at(-1)?.type, "item.completed");+ const completed = events.at(-1);+ if (completed?.type === "item.completed") {+ assert.equal(completed.payload.detail, "A BBonus");+ }}),);diff --git a/apps/server/src/provider/Layers/OpenCodeAdapter.ts b/apps/server/src/provider/Layers/OpenCodeAdapter.tsindex 9de9336c1..512e9ed6b 100644--- a/apps/server/src/provider/Layers/OpenCodeAdapter.ts+++ b/apps/server/src/provider/Layers/OpenCodeAdapter.ts@@ -311,16 +311,6 @@ function commonPrefixLength(left: string, right: string): number {return index;}-function suffixPrefixOverlap(text: string, delta: string): number {- const maxLength = Math.min(text.length, delta.length);- for (let length = maxLength; length > 0; length -= 1) {- if (text.endsWith(delta.slice(0, length))) {- return length;- }- }- return 0;-}-function resolveLatestAssistantText(previousText: string | undefined, nextText: string): string {if (previousText && previousText.length > nextText.length && previousText.startsWith(nextText)) {return previousText;@@ -349,10 +339,9 @@ export function appendOpenCodeAssistantTextDelta(readonly nextText: string;readonly deltaToEmit: string;} {- const deltaToEmit = delta.slice(suffixPrefixOverlap(previousText, delta));return {- nextText: previousText + deltaToEmit,- deltaToEmit,+ nextText: previousText + delta,+ deltaToEmit: delta,};}