Skip to content

Commit fcb023e

Browse files
ualtinokQiiks
authored andcommitted
fix(session): fire system transform before messages transform
1 parent b7f1408 commit fcb023e

8 files changed

Lines changed: 775 additions & 102 deletions

File tree

‎packages/opencode/src/agent/agent.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { Permission } from "@/permission"
1818
import { mergeDeep, pipe, sortBy, values } from "remeda"
1919
import { Global } from "@opencode-ai/core/global"
2020
import path from "path"
21-
import { Plugin } from "@/plugin"
2221
import { Skill } from "../skill"
2322
import { Effect, Context, Layer, Schema } from "effect"
2423
import { InstanceState } from "@/effect/instance-state"
@@ -90,7 +89,6 @@ const layer = Layer.effect(
9089
Effect.gen(function* () {
9190
const config = yield* Config.Service
9291
const auth = yield* Auth.Service
93-
const plugin = yield* Plugin.Service
9492
const skill = yield* Skill.Service
9593
const provider = yield* Provider.Service
9694
const locations = yield* LocationServiceMap.Service
@@ -378,7 +376,6 @@ const layer = Layer.effect(
378376
: undefined
379377

380378
const system = [PROMPT_GENERATE]
381-
yield* plugin.trigger("experimental.chat.system.transform", { model: resolved }, { system })
382379
const existing = yield* InstanceState.useEffect(state, (s) => s.list())
383380

384381
// TODO: clean this up so provider specific logic doesnt bleed over
@@ -447,7 +444,7 @@ const locationServiceMapNode = LayerNode.make({
447444
export const node = LayerNode.make({
448445
service: Service,
449446
layer: layer,
450-
deps: [Config.node, Auth.node, Plugin.node, Skill.node, Provider.node, locationServiceMapNode],
447+
deps: [Config.node, Auth.node, Skill.node, Provider.node, locationServiceMapNode],
451448
})
452449

453450
export * as Agent from "./agent"

‎packages/opencode/src/session/compaction.ts‎

Lines changed: 68 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import { Session } from "./session"
55
import { SessionID, MessageID, PartID } from "./schema"
66
import { Provider } from "@/provider/provider"
77
import { MessageV2 } from "./message-v2"
8+
import { LLM } from "./llm"
89
import { Token } from "@/util/token"
910
import { SessionProcessor } from "./processor"
1011
import { Agent } from "@/agent/agent"
1112
import { Plugin } from "@/plugin"
1213
import { Config } from "@/config/config"
1314
import { NotFoundError } from "@/storage/storage"
1415

15-
import { Effect, Layer, Context } from "effect"
16+
import { Cause, Effect, Layer, Context } from "effect"
1617
import { InstanceState } from "@/effect/instance-state"
1718
import { isOverflow as overflow, usable } from "./overflow"
1819
import { serviceUse } from "@opencode-ai/core/effect/service-use"
@@ -22,6 +23,7 @@ import { ProviderV2 } from "@opencode-ai/core/provider"
2223
import { ModelV2 } from "@opencode-ai/core/model"
2324
import { buildPrompt } from "@opencode-ai/core/session/compaction"
2425
import { SessionCompactionEvent } from "@opencode-ai/schema/session-compaction-event"
26+
import { SessionStatus } from "./status"
2527

2628
export const Event = SessionCompactionEvent
2729

@@ -164,6 +166,7 @@ const layer = Layer.effect(
164166
const provider = yield* Provider.Service
165167
const events = yield* EventV2Bridge.Service
166168
const flags = yield* RuntimeFlags.Service
169+
const status = yield* SessionStatus.Service
167170

168171
const isOverflow = Effect.fn("SessionCompaction.isOverflow")(function* (input: {
169172
tokens: SessionV1.Assistant["tokens"]
@@ -339,19 +342,7 @@ const layer = Layer.effect(
339342
cfg,
340343
model,
341344
})
342-
// Allow plugins to inject context or replace compaction prompt.
343-
const compacting = yield* plugin.trigger(
344-
"experimental.session.compacting",
345-
{ sessionID: input.sessionID },
346-
{ context: [], prompt: undefined },
347-
)
348-
const nextPrompt = compacting.prompt ?? buildPrompt({ previousSummary, context: compacting.context })
349345
const msgs = structuredClone(selected.head)
350-
yield* plugin.trigger("experimental.chat.messages.transform", {}, { messages: msgs })
351-
const modelMessages = yield* MessageV2.toModelMessagesEffect(msgs, model, {
352-
stripMedia: true,
353-
toolOutputMaxChars: TOOL_OUTPUT_MAX_CHARS,
354-
})
355346
const ctx = yield* InstanceState.context
356347
const msg: SessionV1.Assistant = {
357348
id: MessageID.ascending(),
@@ -380,22 +371,78 @@ const layer = Layer.effect(
380371
},
381372
}
382373
yield* session.updateMessage(msg)
383-
const processor = yield* processors.create({
384-
assistantMessage: msg,
385-
sessionID: input.sessionID,
386-
model,
374+
const system = LLM.buildSystem({ agent, model, parts: [], user: userMessage })
375+
const removeInterruptedSummary = Effect.gen(function* () {
376+
yield* session.removeMessage({ sessionID: input.sessionID, messageID: msg.id }).pipe(Effect.ignore)
377+
yield* status.set(input.sessionID, { type: "idle" })
387378
})
379+
const finalizeFailedSummary = (error: unknown) =>
380+
Effect.gen(function* () {
381+
msg.error = MessageV2.fromError(error, { providerID: model.providerID })
382+
msg.finish = "error"
383+
msg.time.completed = Date.now()
384+
yield* session.updateMessage(msg)
385+
yield* events.publish(Session.Event.Error, { sessionID: input.sessionID, error: msg.error })
386+
yield* status.set(input.sessionID, { type: "idle" })
387+
})
388+
const prepared = yield* Effect.gen(function* () {
389+
// Allow plugins to inject context or replace compaction prompt.
390+
const compacting = yield* plugin.trigger(
391+
"experimental.session.compacting",
392+
{ sessionID: input.sessionID },
393+
{ context: [], prompt: undefined },
394+
)
395+
const systemHeader = system[0]
396+
yield* plugin.trigger(
397+
"experimental.chat.system.transform",
398+
{ sessionID: input.sessionID, model },
399+
{ system },
400+
)
401+
LLM.rejoinSystemForCaching(system, systemHeader)
402+
yield* plugin.trigger(
403+
"experimental.chat.messages.transform",
404+
{ sessionID: input.sessionID, model: { providerID: model.providerID, modelID: model.id } },
405+
{ messages: msgs },
406+
)
407+
const messages = yield* MessageV2.toModelMessagesEffect(msgs, model, {
408+
stripMedia: true,
409+
toolOutputMaxChars: TOOL_OUTPUT_MAX_CHARS,
410+
})
411+
return {
412+
messages,
413+
nextPrompt: compacting.prompt ?? buildPrompt({ previousSummary, context: compacting.context }),
414+
}
415+
}).pipe(
416+
Effect.catchCauseIf((cause) => !Cause.hasInterruptsOnly(cause), (cause) =>
417+
finalizeFailedSummary(Cause.squash(cause)).pipe(Effect.as(undefined)),
418+
),
419+
Effect.onInterrupt(() => removeInterruptedSummary),
420+
)
421+
if (!prepared) return "stop"
422+
const processor = yield* processors
423+
.create({
424+
assistantMessage: msg,
425+
sessionID: input.sessionID,
426+
model,
427+
})
428+
.pipe(
429+
Effect.catchCauseIf((cause) => !Cause.hasInterruptsOnly(cause), (cause) =>
430+
finalizeFailedSummary(Cause.squash(cause)).pipe(Effect.as(undefined)),
431+
),
432+
Effect.onInterrupt(() => removeInterruptedSummary),
433+
)
434+
if (!processor) return "stop"
388435
const result = yield* processor.process({
389436
user: userMessage,
390437
agent,
391438
sessionID: input.sessionID,
392439
tools: {},
393-
system: [],
440+
system,
394441
messages: [
395-
...modelMessages,
442+
...prepared.messages,
396443
{
397444
role: "user",
398-
content: [{ type: "text", text: nextPrompt }],
445+
content: [{ type: "text", text: prepared.nextPrompt }],
399446
},
400447
],
401448
model,
@@ -556,6 +603,7 @@ export const node = LayerNode.make({
556603
Provider.node,
557604
EventV2Bridge.node,
558605
RuntimeFlags.node,
606+
SessionStatus.node,
559607
],
560608
})
561609

‎packages/opencode/src/session/llm.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import * as OtelTracer from "@effect/opentelemetry/Tracer"
2929
import { LLMAISDK } from "./llm/ai-sdk"
3030
import { LLMNativeRuntime } from "./llm/native-runtime"
3131
import { LLMRequestPrep } from "./llm/request"
32+
import { SystemPrompt } from "./system"
3233

3334
export const OUTPUT_TOKEN_MAX = ProviderTransform.OUTPUT_TOKEN_MAX
3435

@@ -39,6 +40,7 @@ export type StreamInput = {
3940
model: Provider.Model
4041
agent: Agent.Info
4142
permission?: PermissionV1.Ruleset
43+
/** Final system prompt for this request. Callers own system assembly and chat system-transform hooks. */
4244
system: string[]
4345
messages: ModelMessage[]
4446
small?: boolean
@@ -51,6 +53,35 @@ export type StreamRequest = StreamInput & {
5153
abort: AbortSignal
5254
}
5355

56+
57+
/** Assemble final system prompt from agent/provider prompt, custom parts, and user override. */
58+
export function buildSystem(input: {
59+
agent: Agent.Info
60+
model: Provider.Model
61+
parts: string[]
62+
user?: { system?: string }
63+
}): string[] {
64+
return [
65+
[
66+
...(input.agent.prompt ? [input.agent.prompt] : SystemPrompt.provider(input.model)),
67+
...input.parts,
68+
...(input.user?.system ? [input.user.system] : []),
69+
]
70+
.filter((x) => x)
71+
.join("\n"),
72+
]
73+
}
74+
75+
/** Rejoin system prompt into 2-part structure for prompt-prefix caching if header unchanged. */
76+
export function rejoinSystemForCaching(system: string[], header: string) {
77+
if (system.length > 2 && system[0] === header) {
78+
const rest = system.slice(1)
79+
system.length = 0
80+
system.push(header, rest.join("\n"))
81+
}
82+
}
83+
84+
5485
export interface Interface {
5586
readonly stream: (input: StreamInput) => Stream.Stream<LLMEvent, unknown>
5687
}

‎packages/opencode/src/session/llm/request.ts‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import type { Agent } from "@/agent/agent"
88
import type { MessageV2 } from "../message-v2"
99
import type { Provider } from "@/provider/provider"
1010
import { ProviderTransform } from "@/provider/transform"
11-
import { SystemPrompt } from "../system"
1211
import { InstallationVersion } from "@opencode-ai/core/installation/version"
1312
import { Effect, Record } from "effect"
1413
import { jsonSchema, tool as aiTool, type ModelMessage, type Tool } from "ai"
@@ -55,27 +54,7 @@ const mergeOptions = (target: Record<string, any>, source: Record<string, any> |
5554

5655
export const prepare = Effect.fn("LLMRequestPrep.prepare")(function* (input: PrepareInput) {
5756
const isOpenaiOauth = input.provider.id === "openai" && input.auth?.type === "oauth"
58-
const system = [
59-
[
60-
...(input.agent.prompt ? [input.agent.prompt] : SystemPrompt.provider(input.model)),
61-
...input.system,
62-
...(input.user.system ? [input.user.system] : []),
63-
]
64-
.filter((x) => x)
65-
.join("\n"),
66-
]
67-
68-
const header = system[0]
69-
yield* input.plugin.trigger(
70-
"experimental.chat.system.transform",
71-
{ sessionID: input.sessionID, model: input.model },
72-
{ system },
73-
)
74-
if (system.length > 2 && system[0] === header) {
75-
const rest = system.slice(1)
76-
system.length = 0
77-
system.push(header, rest.join("\n"))
78-
}
57+
const system = input.system
7958

8059
const variant =
8160
!input.small && input.model.variants && input.user.model.variant

0 commit comments

Comments
 (0)