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.
perf(server): index OpenCode text by message and drop unused tool parts (#251)
Leoa5ea58b86026
diff --git a/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts b/apps/server/src/provider/Layers/OpenCodeAdapter.test.tsindex 9a611a554..9d8a16814 100644--- a/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts+++ b/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts@@ -2019,4 +2019,149 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {yield* adapter.stopSession(threadId);}),);++ it.effect("applies late assistant metadata without scanning historical tool parts", () =>+ Effect.gen(function* () {+ const adapter = yield* OpenCodeAdapter;+ const threadId = asThreadId("thread-opencode-text-index");+ const sessionID = "http://127.0.0.1:9999/session";+ const toolEvents = Array.from({ length: 24 }, (_, index) => ({+ type: "message.part.updated",+ properties: {+ sessionID,+ part: {+ id: `tool-${index}`,+ messageID: "msg-tools",+ type: "tool",+ tool: "bash",+ callID: `call-${index}`,+ state: {+ status: "completed",+ output: "x".repeat(1024),+ time: { start: 1, end: 2 },+ },+ },+ },+ }));+ runtimeMock.state.subscribedEvents = [+ ...toolEvents,+ {+ type: "message.part.updated",+ properties: {+ sessionID,+ part: {+ id: "text-1",+ messageID: "msg-assistant",+ type: "text",+ text: "Hello",+ time: { start: 1 },+ },+ },+ },+ {+ type: "message.updated",+ properties: {+ sessionID,+ info: { id: "msg-assistant", role: "assistant" },+ },+ },+ ];+ const eventsFiber = yield* adapter.streamEvents.pipe(+ Stream.filter((event) => event.threadId === threadId && event.type === "content.delta"),+ Stream.runHead,+ Effect.forkChild,+ );++ yield* adapter.startSession({+ provider: ProviderDriverKind.make("opencode"),+ threadId,+ runtimeMode: "full-access",+ });++ const delta = Option.getOrThrow(+ yield* Fiber.join(eventsFiber).pipe(Effect.timeout("1 second")),+ );+ NodeAssert.equal(delta.type, "content.delta");+ if (delta.type === "content.delta") {+ NodeAssert.equal(delta.payload.delta, "Hello");+ }+ yield* adapter.stopSession(threadId);+ }),+ );++ it.effect("does not re-emit an individually removed text part", () =>+ Effect.gen(function* () {+ const adapter = yield* OpenCodeAdapter;+ const threadId = asThreadId("thread-opencode-removed-text-part");+ const sessionID = "http://127.0.0.1:9999/session";+ runtimeMock.state.subscribedEvents = [+ {+ type: "message.updated",+ properties: {+ sessionID,+ info: { id: "msg-assistant", role: "assistant" },+ },+ },+ {+ type: "message.part.updated",+ properties: {+ sessionID,+ part: {+ id: "removed-text-part",+ messageID: "msg-assistant",+ type: "text",+ text: "stale text that was removed",+ time: { start: 1 },+ },+ },+ },+ {+ type: "message.part.removed",+ properties: {+ sessionID,+ messageID: "msg-assistant",+ partID: "removed-text-part",+ },+ },+ {+ type: "message.updated",+ properties: {+ sessionID,+ info: { id: "msg-assistant", role: "assistant" },+ },+ },+ {+ type: "message.part.updated",+ properties: {+ sessionID,+ part: {+ id: "retained-text-part",+ messageID: "msg-assistant",+ type: "text",+ text: "replacement text",+ time: { start: 2 },+ },+ },+ },+ ];+ const eventsFiber = yield* adapter.streamEvents.pipe(+ Stream.filter((event) => event.threadId === threadId && event.type === "content.delta"),+ Stream.take(2),+ Stream.runCollect,+ Effect.forkChild,+ );++ yield* adapter.startSession({+ provider: ProviderDriverKind.make("opencode"),+ threadId,+ runtimeMode: "full-access",+ });++ const deltas = Array.from(+ yield* Fiber.join(eventsFiber).pipe(Effect.timeout("1 second")),+ ).map((event) => (event.type === "content.delta" ? event.payload.delta : undefined));+ NodeAssert.deepEqual(deltas, ["stale text that was removed", "replacement text"]);+ yield* adapter.stopSession(threadId);+ }),+ );});diff --git a/apps/server/src/provider/Layers/OpenCodeAdapter.ts b/apps/server/src/provider/Layers/OpenCodeAdapter.tsindex 41b9b955e..bdc4219c5 100644--- a/apps/server/src/provider/Layers/OpenCodeAdapter.ts+++ b/apps/server/src/provider/Layers/OpenCodeAdapter.ts@@ -255,6 +255,13 @@ interface OpenCodeRequestRelationRetry {terminalEvent?: OpenCodeTerminalRequestEvent;}+type OpenCodeTextPart = Extract<Part, { readonly type: "text" | "reasoning" }>;+type OpenCodeTextPartState = Pick<OpenCodeTextPart, "id" | "messageID" | "type" | "time"> & {+ text: string | undefined;+ emittedText: string | undefined;+ completed: boolean;+};+interface OpenCodeSessionContext {session: ProviderSession;readonly client: OpencodeClient;@@ -268,10 +275,10 @@ interface OpenCodeSessionContext {readonly pendingPermissions: Map<string, PermissionRequest>;readonly pendingQuestions: Map<string, QuestionRequest>;readonly messageRoleById: Map<string, "user" | "assistant">;- readonly partById: Map<string, Part>;- readonly emittedTextByPartId: Map<string, string>;- readonly completedAssistantPartIds: Set<string>;- readonly turns: Array<OpenCodeTurnSnapshot>;+ // OpenCode permits edits to completed parts. Keep text for snapshot comparison+ // until native removal or session teardown, but do not retain other part payloads.+ readonly textPartsByMessageId: Map<string, Map<string, OpenCodeTextPartState>>;+ readonly textPartById: Map<string, OpenCodeTextPartState>;activeTurnId: TurnId | undefined;activeAgent: string | undefined;activeVariant: string | undefined;@@ -397,29 +404,54 @@ function mapPermissionDecision(reply: "once" | "always" | "reject"): string {}}-function resolveTurnSnapshot(- context: OpenCodeSessionContext,- turnId: TurnId,-): OpenCodeTurnSnapshot {- const existing = context.turns.find((turn) => turn.id === turnId);- if (existing) {- return existing;+function forgetOpenCodeTextPart(context: OpenCodeSessionContext, partID: string): void {+ const part = context.textPartById.get(partID);+ if (!part) {+ return;+ }+ context.textPartById.delete(partID);+ const parts = context.textPartsByMessageId.get(part.messageID);+ parts?.delete(partID);+ if (parts?.size === 0) {+ context.textPartsByMessageId.delete(part.messageID);}-- const created: OpenCodeTurnSnapshot = { id: turnId, items: [] };- context.turns.push(created);- return created;}-function appendTurnItem(+function retainOpenCodeTextPart(context: OpenCodeSessionContext,- turnId: TurnId | undefined,- item: unknown,-): void {- if (!turnId) {+ part: OpenCodeTextPart,+): OpenCodeTextPartState {+ const previous = context.textPartById.get(part.id);+ const previousInMessage = previous?.messageID === part.messageID ? previous : undefined;+ if (previous && !previousInMessage) {+ forgetOpenCodeTextPart(context, part.id);+ }+ const parts =+ context.textPartsByMessageId.get(part.messageID) ?? new Map<string, OpenCodeTextPartState>();+ const state: OpenCodeTextPartState = {+ id: part.id,+ messageID: part.messageID,+ type: part.type,+ text: part.text,+ ...(part.time !== undefined ? { time: part.time } : {}),+ emittedText: previousInMessage?.emittedText,+ completed: previousInMessage?.completed ?? false,+ };+ parts.set(part.id, state);+ context.textPartsByMessageId.set(part.messageID, parts);+ context.textPartById.set(part.id, state);+ return state;+}++function forgetOpenCodeTextMessage(context: OpenCodeSessionContext, messageID: string): void {+ const parts = context.textPartsByMessageId.get(messageID);+ if (!parts) {return;}- resolveTurnSnapshot(context, turnId).items.push(item);+ for (const partId of parts.keys()) {+ context.textPartById.delete(partId);+ }+ context.textPartsByMessageId.delete(messageID);}const ensureSessionContext = Effect.fn("ensureSessionContext")(function* (@@ -455,18 +487,8 @@ function normalizeQuestionRequest(request: QuestionRequest): ReadonlyArray<UserI}));}-function resolveTextStreamKind(part: Part | undefined): "assistant_text" | "reasoning_text" {- return part?.type === "reasoning" ? "reasoning_text" : "assistant_text";-}--function textFromPart(part: Part): string | undefined {- switch (part.type) {- case "text":- case "reasoning":- return part.text;- default:- return undefined;- }+function resolveTextStreamKind(part: Pick<Part, "type">): "assistant_text" | "reasoning_text" {+ return part.type === "reasoning" ? "reasoning_text" : "assistant_text";}function commonPrefixLength(left: string, right: string): number {@@ -853,25 +875,17 @@ export function makeOpenCodeAdapter(/** Emit content.delta and item.completed events for an assistant text part. */const emitAssistantTextDelta = Effect.fn("emitAssistantTextDelta")(function* (context: OpenCodeSessionContext,- part: Part,+ part: OpenCodeTextPartState,turnId: TurnId | undefined,raw: unknown,) {- const text = textFromPart(part);+ const text = part.text;if (text === undefined) {return;}- const previousText = context.emittedTextByPartId.get(part.id);- const { latestText, deltaToEmit } = mergeOpenCodeAssistantText(previousText, text);- context.emittedTextByPartId.set(part.id, latestText);- if (latestText !== text) {- context.partById.set(- part.id,- (part.type === "text" || part.type === "reasoning"- ? { ...part, text: latestText }- : part) satisfies Part,- );- }+ const { latestText, deltaToEmit } = mergeOpenCodeAssistantText(part.emittedText, text);+ part.emittedText = latestText;+ part.text = latestText;if (deltaToEmit.length > 0) {yield* emit({...(yield* buildEventBase({@@ -892,12 +906,8 @@ export function makeOpenCodeAdapter(});}- if (- part.type === "text" &&- part.time?.end !== undefined &&- !context.completedAssistantPartIds.has(part.id)- ) {- context.completedAssistantPartIds.add(part.id);+ if (part.type === "text" && part.time?.end !== undefined && !part.completed) {+ part.completed = true;yield* emit({...(yield* buildEventBase({threadId: context.session.threadId,@@ -1283,11 +1293,11 @@ export function makeOpenCodeAdapter(case "message.updated": {context.messageRoleById.set(event.properties.info.id, event.properties.info.role);if (event.properties.info.role === "assistant") {- for (const part of context.partById.values()) {- if (part.messageID !== event.properties.info.id) {- continue;+ const parts = context.textPartsByMessageId.get(event.properties.info.id);+ if (parts) {+ for (const part of parts.values()) {+ yield* emitAssistantTextDelta(context, part, turnId, event);}- yield* emitAssistantTextDelta(context, part, turnId, event);}}break;@@ -1295,11 +1305,17 @@ export function makeOpenCodeAdapter(case "message.removed": {context.messageRoleById.delete(event.properties.messageID);+ forgetOpenCodeTextMessage(context, event.properties.messageID);+ break;+ }++ case "message.part.removed": {+ forgetOpenCodeTextPart(context, event.properties.partID);break;}case "message.part.delta": {- const existingPart = context.partById.get(event.properties.partID);+ const existingPart = context.textPartById.get(event.properties.partID);if (!existingPart) {break;}@@ -1312,21 +1328,13 @@ export function makeOpenCodeAdapter(if (delta.length === 0) {break;}- const previousText =- context.emittedTextByPartId.get(event.properties.partID) ??- textFromPart(existingPart) ??- "";+ const previousText = existingPart.emittedText ?? existingPart.text ?? "";const { nextText, deltaToEmit } = appendOpenCodeAssistantTextDelta(previousText, delta);if (deltaToEmit.length === 0) {break;}- context.emittedTextByPartId.set(event.properties.partID, nextText);- if (existingPart.type === "text" || existingPart.type === "reasoning") {- context.partById.set(event.properties.partID, {- ...existingPart,- text: nextText,- });- }+ existingPart.emittedText = nextText;+ existingPart.text = nextText;yield* emit({...(yield* buildEventBase({threadId: context.session.threadId,@@ -1345,11 +1353,13 @@ export function makeOpenCodeAdapter(case "message.part.updated": {const part = event.properties.part;- context.partById.set(part.id, part);const messageRole = messageRoleForPart(context, part);- if (messageRole === "assistant") {- yield* emitAssistantTextDelta(context, part, turnId, event);+ if (part.type === "text" || part.type === "reasoning") {+ const state = retainOpenCodeTextPart(context, part);+ if (messageRole === "assistant") {+ yield* emitAssistantTextDelta(context, state, turnId, event);+ }}if (part.type === "tool") {@@ -1387,7 +1397,6 @@ export function makeOpenCodeAdapter(: "item.updated",payload,};- appendTurnItem(context, turnId, part);yield* emit(runtimeEvent);}break;@@ -1779,11 +1788,9 @@ export function makeOpenCodeAdapter(requestRelationRetries: new Map(),pendingPermissions: new Map(),pendingQuestions: new Map(),- partById: new Map(),- emittedTextByPartId: new Map(),messageRoleById: new Map(),- completedAssistantPartIds: new Set(),- turns: [],+ textPartsByMessageId: new Map(),+ textPartById: new Map(),activeTurnId: undefined,activeAgent: undefined,activeVariant: undefined,diff --git a/docs/internals/providers.md b/docs/internals/providers.mdindex 4c16c9684..32055dc79 100644--- a/docs/internals/providers.md+++ b/docs/internals/providers.md@@ -60,6 +60,10 @@ the active runtime and starts the selected provider without reusing an incompatibridge is not the Codex turn path, and AgentController never falls back to the legacy Codex loop whena Mastra session is absent.+The legacy OpenCode adapter keeps only per-message text state for later PATCH edits. Tool input and+output are emitted as lifecycle events and are not retained in the session map. Individually removed+text parts and whole removed messages are discarded from retained state. OpenCode Go stays on Mastra.+The legacy OpenCode adapter owns child sessions created for subagents. Permission and question eventsfrom a descendant session are routed onto the parent thread after ancestry is verified. Stop andinterrupt walk the child tree and abort every descendant, not only the parent. Unrelated OpenCode