Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions packages/core/src/session/instruction-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ export const prepare = Effect.fn("InstructionState.prepare")(function* (
SessionEvent.InstructionsUpdated,
{ sessionID, delta: admission.delta },
{
// Initial sync establishes the baseline; unlike later deltas it is not chronological history.
...(!stored ? { metadata: { instructions: { initial: true } } } : {}),
commit: () => insertBlobs(db, admission.blobs),
},
)
Expand Down
24 changes: 24 additions & 0 deletions packages/core/test/session-runner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,30 @@ describe("SessionRunnerLLM", () => {
}),
)

it.effect("marks the initial instruction sync as baseline metadata", () =>
Effect.gen(function* () {
const session = yield* setup
const events = yield* EventV2.Service
const instructionEvents: EventV2.Payload[] = []
const unsubscribe = yield* events.listen((event) =>
Effect.sync(() => {
if (event.type === "session.instructions.updated") instructionEvents.push(event)
}),
)
yield* admit(session, "First")

yield* session.resume(sessionID)
systemBaseline = "Changed context"
yield* admit(session, "Second")
yield* session.resume(sessionID)
yield* unsubscribe

expect(instructionEvents).toHaveLength(2)
expect(instructionEvents[0]?.metadata).toEqual({ instructions: { initial: true } })
expect(instructionEvents[1]?.metadata).toBeUndefined()
}),
)

it.effect("retries the first request after system context becomes available", () =>
Effect.gen(function* () {
const session = yield* setup
Expand Down
8 changes: 8 additions & 0 deletions packages/tui/src/context/data.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,14 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
})
break
case "session.instructions.updated":
const instructions = event.metadata?.instructions
if (
typeof instructions === "object" &&
instructions !== null &&
"initial" in instructions &&
instructions.initial === true
)
break
message.update(event.data.sessionID, (draft, index) => {
message.append(draft, index, {
id: messageIDFromEvent(event.id),
Expand Down
20 changes: 16 additions & 4 deletions packages/tui/test/cli/tui/data.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2385,7 +2385,7 @@ test("renders admitted prompts immediately and tracks them until promoted", asyn
}
})

test("projects live instruction updates with their message ID", async () => {
test("skips initial instruction state and projects later updates with their message ID", async () => {
const events = createEventStream()
const calls = createFetch(undefined, events)
let sync!: ReturnType<typeof useData>
Expand Down Expand Up @@ -2419,18 +2419,30 @@ test("projects live instruction updates with their message ID", async () => {
created: 0,
type: "session.instructions.updated",
durable: durable("session-1", 0, 2),
metadata: { instructions: { initial: true } },
data: {
sessionID: "session-1",
delta: { "core/date": "0".repeat(64) },
},
})
emitEvent(events, {
id: "evt_instructions_2",
created: 1,
type: "session.instructions.updated",
durable: durable("session-1", 1, 2),
data: {
sessionID: "session-1",
delta: { "core/date": "1".repeat(64) },
},
})

await wait(() => sync.session.message.list("session-1")?.length === 1)
await wait(() => sync.session.message.list("session-1")?.some((message) => message.time.created === 1))
expect(sync.session.message.list("session-1")).toHaveLength(1)
expect(sync.session.message.list("session-1")?.[0]).toMatchObject({
id: SessionMessage.ID.fromEvent(EventV2.ID.make("evt_instructions_1")),
id: SessionMessage.ID.fromEvent(EventV2.ID.make("evt_instructions_2")),
type: "system",
text: "Instructions updated: core/date",
time: { created: 0 },
time: { created: 1 },
})
} finally {
app.renderer.destroy()
Expand Down
Loading