* fix(sync): preserve pending questions across session switch and directory eviction Closes #918, completes the gap left by #909. The 'agent question disappears after switching session / coming back later' bug had two root causes that #909 only partially addressed: 1. Directory-eviction TTL (20 min) silently dropped child stores that held pending questions/permissions. The discard wasn't gated on in-flight blocking-request state, so any 'question.asked' event that arrived during the eviction-then-rehydrate window was routed to a non-existent store and silently lost. 2. PR #909 re-fetches listPendingQuestions/Permissions only on SSE reconnect. Switching sessions within the same socket — including navigating back to a directory whose child store was rebuilt after eviction — left the UI relying on store state that may have missed events that fired while a different session was active. Three edits, in src/sync: - eviction.ts / types.ts / child-store.ts: add hasPendingBlockingRequests to EvictPlan + DisposeCheck and never evict a directory whose store carries a non-empty state.question or state.permission record. - sync-context.tsx: extract resyncBlockingRequestsForDirectory from the reconnect path and call it on currentSessionId changes (debounced 250ms), reusing PR #909's signature-based merge so concurrent SSE updates aren't clobbered. - __tests__/eviction.test.ts, __tests__/session-switch-resync.test.ts: new unit coverage for the eviction guard and resync semantics (deduped fetch per switch, in-flight SSE preservation, stale entry cleanup, unknown-session filtering). * fix(sync): refresh store before blocking request resync --------- Co-authored-by: Alexander Busse <alex@ableph.net> Co-authored-by: Bohdan Triapitsyn <artmore@protonmail.com>
136 lines
4.1 KiB
TypeScript
136 lines
4.1 KiB
TypeScript
import { describe, expect, test } from "bun:test"
|
|
import type { PermissionRequest, QuestionRequest } from "@opencode-ai/sdk/v2/client"
|
|
import {
|
|
canDisposeDirectory,
|
|
hasPendingBlockingRequests,
|
|
pickDirectoriesToEvict,
|
|
} from "../eviction"
|
|
import { INITIAL_STATE, type DirState, type State } from "../types"
|
|
|
|
const DAY_MS = 24 * 60 * 60 * 1000
|
|
|
|
function buildState(overrides: Partial<State> = {}): State {
|
|
return {
|
|
...INITIAL_STATE,
|
|
question: {},
|
|
permission: {},
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
function buildQuestion(overrides: Partial<QuestionRequest> = {}): QuestionRequest {
|
|
return {
|
|
id: "que_1",
|
|
sessionID: "ses_1",
|
|
questions: [{ question: "Continue?", header: "Q", options: [{ label: "Yes", description: "" }] }],
|
|
...overrides,
|
|
} as QuestionRequest
|
|
}
|
|
|
|
function buildPermission(overrides: Partial<PermissionRequest> = {}): PermissionRequest {
|
|
return {
|
|
id: "perm_1",
|
|
sessionID: "ses_1",
|
|
permission: "bash",
|
|
patterns: [],
|
|
metadata: {},
|
|
always: [],
|
|
...overrides,
|
|
} as PermissionRequest
|
|
}
|
|
|
|
describe("hasPendingBlockingRequests", () => {
|
|
test("returns false on undefined or empty state", () => {
|
|
expect(hasPendingBlockingRequests(undefined)).toBe(false)
|
|
expect(hasPendingBlockingRequests(buildState())).toBe(false)
|
|
})
|
|
|
|
test("returns true when at least one session has a pending question", () => {
|
|
const state = buildState({ question: { ses_a: [buildQuestion()] } })
|
|
expect(hasPendingBlockingRequests(state)).toBe(true)
|
|
})
|
|
|
|
test("returns true when at least one session has a pending permission", () => {
|
|
const state = buildState({ permission: { ses_a: [buildPermission()] } })
|
|
expect(hasPendingBlockingRequests(state)).toBe(true)
|
|
})
|
|
|
|
test("treats empty arrays under a session key as no pending work", () => {
|
|
const state = buildState({ question: { ses_a: [] }, permission: { ses_b: [] } })
|
|
expect(hasPendingBlockingRequests(state)).toBe(false)
|
|
})
|
|
})
|
|
|
|
describe("pickDirectoriesToEvict", () => {
|
|
test("does not evict an idle directory that has a pending question", () => {
|
|
const stores = ["/idle-with-question", "/idle-empty"]
|
|
const state = new Map<string, DirState>([
|
|
["/idle-with-question", { lastAccessAt: 0 }],
|
|
["/idle-empty", { lastAccessAt: 0 }],
|
|
])
|
|
const list = pickDirectoriesToEvict({
|
|
stores,
|
|
state,
|
|
pins: new Set(),
|
|
max: 30,
|
|
ttl: 1000,
|
|
now: DAY_MS,
|
|
hasPendingBlockingRequests: (dir) => dir === "/idle-with-question",
|
|
})
|
|
expect(list).toEqual(["/idle-empty"])
|
|
})
|
|
|
|
test("never includes a directory with pending blocking requests even under overflow pressure", () => {
|
|
const stores = ["/active", "/overflow-with-permission", "/old-empty"]
|
|
const state = new Map<string, DirState>([
|
|
["/active", { lastAccessAt: DAY_MS }],
|
|
["/overflow-with-permission", { lastAccessAt: DAY_MS - 100_000 }],
|
|
["/old-empty", { lastAccessAt: 0 }],
|
|
])
|
|
const list = pickDirectoriesToEvict({
|
|
stores,
|
|
state,
|
|
pins: new Set(),
|
|
max: 1,
|
|
ttl: 60_000,
|
|
now: DAY_MS,
|
|
hasPendingBlockingRequests: (dir) => dir === "/overflow-with-permission",
|
|
})
|
|
expect(list).not.toContain("/overflow-with-permission")
|
|
expect(list).toContain("/old-empty")
|
|
})
|
|
|
|
test("falls back to legacy behavior when no predicate is provided", () => {
|
|
const stores = ["/idle"]
|
|
const state = new Map<string, DirState>([["/idle", { lastAccessAt: 0 }]])
|
|
const list = pickDirectoriesToEvict({
|
|
stores,
|
|
state,
|
|
pins: new Set(),
|
|
max: 30,
|
|
ttl: 1000,
|
|
now: DAY_MS,
|
|
})
|
|
expect(list).toEqual(["/idle"])
|
|
})
|
|
})
|
|
|
|
describe("canDisposeDirectory", () => {
|
|
const baseInput = {
|
|
directory: "/repo",
|
|
hasStore: true,
|
|
pinned: false,
|
|
booting: false,
|
|
loadingSessions: false,
|
|
hasPendingBlockingRequests: false,
|
|
}
|
|
|
|
test("refuses to dispose a directory holding pending blocking requests", () => {
|
|
expect(canDisposeDirectory({ ...baseInput, hasPendingBlockingRequests: true })).toBe(false)
|
|
})
|
|
|
|
test("permits disposal when no blocking requests are pending", () => {
|
|
expect(canDisposeDirectory(baseInput)).toBe(true)
|
|
})
|
|
})
|