Skip to content

Commit 0ca4289

Browse files
committed
fix(core): bump session time_updated on step lifecycle events
time_updated was set when a prompt was enqueued but never while the turn ran, so a busy session kept an old timestamp and sorted wrong in recency lists. Also touch the session row on step started, ended and failed. Fixes anomalyco#36893
1 parent 8d8a7bc commit 0ca4289

2 files changed

Lines changed: 65 additions & 1 deletion

File tree

‎packages/core/src/session/projector.ts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,15 @@ function applyUsage(db: DatabaseService, sessionID: SessionSchema.ID, value: Usa
7272
.pipe(Effect.orDie)
7373
}
7474

75+
function touch(db: DatabaseService, event: MessageEvent) {
76+
return db
77+
.update(SessionTable)
78+
.set({ time_updated: event.created })
79+
.where(eq(SessionTable.id, event.data.sessionID))
80+
.run()
81+
.pipe(Effect.orDie)
82+
}
83+
7584
const publishSessionUsage = Effect.fn("SessionProjector.publishUsage")(function* (
7685
db: DatabaseService,
7786
bus: Bus.Interface,
@@ -681,19 +690,26 @@ const layer = Layer.effectDiscard(
681690
yield* bus.project(SessionEvent.Skill.Activated, (event) => run(db, event))
682691
yield* bus.project(SessionEvent.Shell.Started, (event) => run(db, event))
683692
yield* bus.project(SessionEvent.Shell.Ended, (event) => run(db, event))
684-
yield* bus.project(SessionEvent.Step.Started, (event) => run(db, event))
693+
yield* bus.project(SessionEvent.Step.Started, (event) =>
694+
Effect.gen(function* () {
695+
yield* run(db, event)
696+
yield* touch(db, event)
697+
}),
698+
)
685699
yield* bus.project(SessionEvent.Step.Streamed, (event) => run(db, event))
686700
yield* bus.project(SessionEvent.Step.Ended, (event) =>
687701
Effect.gen(function* () {
688702
yield* run(db, event)
689703
yield* applyUsage(db, event.data.sessionID, event.data)
704+
yield* touch(db, event)
690705
}),
691706
)
692707
yield* bus.project(SessionEvent.Step.Failed, (event) =>
693708
Effect.gen(function* () {
694709
yield* run(db, event)
695710
if (event.data.cost !== undefined && event.data.tokens !== undefined)
696711
yield* applyUsage(db, event.data.sessionID, { cost: event.data.cost, tokens: event.data.tokens })
712+
yield* touch(db, event)
697713
}),
698714
)
699715
yield* bus.project(SessionEvent.Text.Started, (event) => run(db, event))

‎packages/core/test/session-projector.test.ts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { describe, expect } from "bun:test"
22
import { DateTime, Effect, Fiber, Option, Schema, Stream } from "effect"
3+
import { TestClock } from "effect/testing"
34
import { asc, eq, sql } from "drizzle-orm"
45
import { Database } from "@opencode/core/database/database"
56
import { Agent } from "@opencode/core/agent"
@@ -760,4 +761,51 @@ describe("SessionProjector", () => {
760761
])
761762
}),
762763
)
764+
765+
it.effect("bumps session time_updated on step lifecycle events", () =>
766+
Effect.gen(function* () {
767+
const db = yield* seedSession({ time_created: 0, time_updated: 0 })
768+
const bus = yield* Bus.Service
769+
const updated = () =>
770+
db.select({ time_updated: SessionTable.time_updated }).from(SessionTable).get().pipe(Effect.orDie)
771+
const first = SessionMessage.ID.make("msg_touch_first")
772+
const second = SessionMessage.ID.make("msg_touch_second")
773+
774+
yield* TestClock.setTime(5)
775+
yield* bus.publish(SessionEvent.Step.Started, {
776+
sessionID,
777+
assistantMessageID: first,
778+
agent: build,
779+
model,
780+
started: 5,
781+
})
782+
expect(yield* updated()).toEqual({ time_updated: 5 })
783+
784+
yield* TestClock.setTime(9)
785+
yield* bus.publish(SessionEvent.Step.Ended, {
786+
sessionID,
787+
assistantMessageID: first,
788+
finish: "stop",
789+
cost: Money.USD.make(0),
790+
tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
791+
})
792+
expect(yield* updated()).toEqual({ time_updated: 9 })
793+
794+
yield* TestClock.setTime(12)
795+
yield* bus.publish(SessionEvent.Step.Started, {
796+
sessionID,
797+
assistantMessageID: second,
798+
agent: build,
799+
model,
800+
started: 12,
801+
})
802+
yield* TestClock.setTime(15)
803+
yield* bus.publish(SessionEvent.Step.Failed, {
804+
sessionID,
805+
assistantMessageID: second,
806+
error: { type: "provider.invalid-request", message: "Failed" },
807+
})
808+
expect(yield* updated()).toEqual({ time_updated: 15 })
809+
}),
810+
)
763811
})

0 commit comments

Comments
 (0)