Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
6 changes: 6 additions & 0 deletions .changeset/fix-stale-reload-status.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@kilocode/cli": patch
"kilo-code": patch
---

Prevent failed status notifications from leaving completed sessions marked busy and blocking reload.
6 changes: 4 additions & 2 deletions packages/opencode/src/session/status.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,16 @@ export const layer = Layer.effect(
const ctx = yield* InstanceState.context
const projectID = String(ctx.project.id)
// kilocode_change end
yield* events.publish(Event.Status, { sessionID, status })
// kilocode_change - commit status before publishing so listener failures cannot leave a stopped session busy
if (status.type === "idle") {
yield* events.publish(Event.Idle, { sessionID })
data.delete(sessionID)
// kilocode_change start
const store = stores.get(projectID)
store?.delete(sessionID)
if (store && store.size === 0) stores.delete(projectID)
byDirectory.get(ctx.directory)?.delete(sessionID)
yield* events.publish(Event.Status, { sessionID, status })
yield* events.publish(Event.Idle, { sessionID })
// kilocode_change end
return
}
Expand All @@ -97,6 +98,7 @@ export const layer = Layer.effect(
byDirectory.set(ctx.directory, dir)
}
dir.set(sessionID, projectID)
yield* events.publish(Event.Status, { sessionID, status })
Comment thread
marius-kilocode marked this conversation as resolved.
Resolved
})
// kilocode_change end

Expand Down
56 changes: 56 additions & 0 deletions packages/opencode/test/kilocode/session-status.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import { describe, expect } from "bun:test"
import { Cause, Effect, Exit, Layer } from "effect"
import { EventV2Bridge } from "../../src/event-v2-bridge"
import { SessionID } from "../../src/session/schema"
import { SessionStatus } from "../../src/session/status"
import { testEffect } from "../lib/effect"

const it = testEffect(SessionStatus.layer.pipe(Layer.provideMerge(EventV2Bridge.defaultLayer)))

describe("SessionStatus idle publication", () => {
for (const failure of [undefined, SessionStatus.Event.Status.type, SessionStatus.Event.Idle.type]) {
it.instance(
failure
? `keeps both stores cleared when ${failure} publication fails`
: "clears both stores before idle publication",
() =>
Effect.gen(function* () {
const status = yield* SessionStatus.Service
const events = yield* EventV2Bridge.Service
const id = SessionID.make(`ses_idle_publication_${failure ?? "success"}`)
const error = new Error("deliberate publication failure")
const observed: { type: string; local: boolean; global: boolean }[] = []

yield* status.set(id, { type: "busy" })
expect((yield* status.list()).get(id)).toEqual({ type: "busy" })
expect((yield* SessionStatus.listAll()).get(id)).toEqual({ type: "busy" })

const unsubscribe = yield* events.listen((event) =>
Effect.gen(function* () {
if (event.type !== SessionStatus.Event.Status.type && event.type !== SessionStatus.Event.Idle.type) return
observed.push({
type: event.type,
local: (yield* status.list()).has(id),
global: (yield* SessionStatus.listAll()).has(id),
})
if (event.type === failure) yield* Effect.die(error)
}),
)
yield* Effect.addFinalizer(() => unsubscribe)

const exit = yield* status.set(id, { type: "idle" }).pipe(Effect.exit)

expect(Exit.isFailure(exit)).toBe(failure !== undefined)
if (Exit.isFailure(exit)) expect(Cause.squash(exit.cause)).toBe(error)
expect(observed).toEqual(
(failure === SessionStatus.Event.Status.type
? [SessionStatus.Event.Status.type]
: [SessionStatus.Event.Status.type, SessionStatus.Event.Idle.type]
).map((type) => ({ type, local: false, global: false })),
)
expect((yield* status.list()).has(id)).toBe(false)
expect((yield* SessionStatus.listAll()).has(id)).toBe(false)
}),
)
}
})
Loading