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
6 changes: 6 additions & 0 deletions .changeset/idle-stopped-sessions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@kilocode/cli": patch
"kilo-code": patch
---

Show deliberately stopped agent sessions as idle instead of finished.
13 changes: 13 additions & 0 deletions packages/kilo-vscode/tests/fixtures/session-provider-activity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,19 @@ try {
await emit({ type: "sessionStatus", sessionID: "root", status: "idle" })
await check("root", "idle")

await emit({ type: "sessionStatus", sessionID: "root", status: "busy" })
value.abort()
assert.deepEqual(sent.at(-1), { type: "abort", sessionID: "root" })
await emit({ type: "sessionTurnClosed", sessionID: "root", reason: "interrupted" })
await emit({ type: "sessionStatus", sessionID: "root", status: "idle" })
await check("root", "idle")
await emit({ type: "sessionStatus", sessionID: "root", status: "busy" })
await emit({ type: "sessionTurnClosed", sessionID: "root", reason: "completed" })
await emit({ type: "sessionStatus", sessionID: "root", status: "idle" })
await check("root", "done")
await emit({ type: "sessionStatus", sessionID: "root", status: "busy" })
await emit({ type: "sessionStatus", sessionID: "root", status: "idle" })

value.setCurrentSessionID("background")
await emit({ type: "sessionStatus", sessionID: "background", status: "busy" })
await check("background", "busy")
Expand Down
9 changes: 8 additions & 1 deletion packages/opencode/src/session/prompt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1925,7 +1925,14 @@ export const layer = Layer.effect(
return yield* Effect.onExit(
state.ensureRunning(
input.sessionID,
lastAssistant(input.sessionID).pipe(Effect.orDie),
lastAssistant(input.sessionID).pipe(
Effect.tap(() =>
Effect.sync(() => {
if (!closeReasons.has(input.sessionID)) closeReasons.set(input.sessionID, "interrupted")
}),
),
Effect.orDie,
),
runLoop(input).pipe(Effect.orDie),
), // kilocode_change
Effect.fnUntraced(function* (exit) {
Expand Down
5 changes: 5 additions & 0 deletions packages/opencode/test/kilocode/session-prompt-queue.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,10 @@ describe("session prompt queue", () => {
fn: async () =>
scoped(tmp.path, async (prompt) => {
const session = await sessions.create({ title: "Queued cancel regression" })
const closed = Promise.withResolvers<KiloSession.CloseReason>()
const off = Bus.subscribe(KiloSession.Event.TurnClose, (event) => {
if (event.properties.sessionID === session.id) closed.resolve(event.properties.reason)
})
const first = Effect.runPromise(
prompt.prompt({
sessionID: session.id,
Expand Down Expand Up @@ -804,6 +808,7 @@ describe("session prompt queue", () => {
// not leak as an unhandled rejection, but still require rejects to be
// interrupt-shaped (not an unrelated provider/session failure).
const settled = await Promise.allSettled([first, second, third])
expect(await closed.promise.finally(off)).toBe("interrupted")
for (const r of settled) {
if (r.status === "rejected") expect(String(r.reason)).toMatch(/interrupt/i)
}
Expand Down
Loading