d83f875740
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
185 lines
6.2 KiB
TypeScript
185 lines
6.2 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test"
|
|
import {
|
|
_resetForTesting,
|
|
subagentSessions,
|
|
syncSubagentSessions,
|
|
} from "../../features/claude-code-session-state"
|
|
import { executeSync } from "./sync-executor"
|
|
|
|
type ExecuteSyncArgs = Parameters<typeof executeSync>[0]
|
|
type ExecuteSyncToolContext = Parameters<typeof executeSync>[1]
|
|
type ExecuteSyncDeps = NonNullable<Parameters<typeof executeSync>[3]>
|
|
|
|
function createArgs(): ExecuteSyncArgs {
|
|
return {
|
|
subagent_type: "explore",
|
|
description: "cleanup leak",
|
|
prompt: "find something",
|
|
run_in_background: false,
|
|
}
|
|
}
|
|
|
|
function createToolContext(): ExecuteSyncToolContext {
|
|
return {
|
|
sessionID: "parent-session",
|
|
messageID: "msg-1",
|
|
agent: "sisyphus",
|
|
abort: new AbortController().signal,
|
|
metadata: mock(async () => {}),
|
|
}
|
|
}
|
|
|
|
function createContext(promptAsync: ReturnType<typeof mock>) {
|
|
return {
|
|
client: {
|
|
session: {
|
|
promptAsync,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
function createDependencies(overrides?: Partial<ExecuteSyncDeps>): ExecuteSyncDeps {
|
|
return {
|
|
createOrGetSession: mock(async () => ({ sessionID: "ses-default", isNew: true })),
|
|
waitForCompletion: mock(async () => {}),
|
|
processMessages: mock(async () => "agent response"),
|
|
setSessionFallbackChain: mock(() => {}),
|
|
clearSessionFallbackChain: mock(() => {}),
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
describe("executeSync session cleanup", () => {
|
|
beforeEach(() => {
|
|
_resetForTesting()
|
|
})
|
|
|
|
afterEach(() => {
|
|
_resetForTesting()
|
|
})
|
|
|
|
describe("#given executeSync creates a session", () => {
|
|
test("#when execution completes successfully #then sessionID is removed from subagentSessions and syncSubagentSessions", async () => {
|
|
// given
|
|
const sessionID = "ses-cleanup-success"
|
|
const args = createArgs()
|
|
const toolContext = createToolContext()
|
|
const promptAsync = mock(async () => ({ data: {} }))
|
|
const deps = createDependencies({
|
|
createOrGetSession: mock(async () => {
|
|
subagentSessions.add(sessionID)
|
|
syncSubagentSessions.add(sessionID)
|
|
return { sessionID, isNew: true }
|
|
}),
|
|
waitForCompletion: mock(async (createdSessionID: string) => {
|
|
expect(createdSessionID).toBe(sessionID)
|
|
expect(subagentSessions.has(sessionID)).toBe(true)
|
|
expect(syncSubagentSessions.has(sessionID)).toBe(true)
|
|
}),
|
|
})
|
|
|
|
expect(subagentSessions.has(sessionID)).toBe(false)
|
|
expect(syncSubagentSessions.has(sessionID)).toBe(false)
|
|
|
|
// when
|
|
const result = await executeSync(args, toolContext, createContext(promptAsync) as never, deps)
|
|
|
|
// then
|
|
expect(result).toContain(`session_id: ${sessionID}`)
|
|
expect(subagentSessions.has(sessionID)).toBe(false)
|
|
expect(syncSubagentSessions.has(sessionID)).toBe(false)
|
|
})
|
|
|
|
test("#when execution throws an error #then sessionID is still removed from both Sets", async () => {
|
|
// given
|
|
const sessionID = "ses-cleanup-error"
|
|
const args = createArgs()
|
|
const toolContext = createToolContext()
|
|
const promptAsync = mock(async () => ({ data: {} }))
|
|
const deps = createDependencies({
|
|
createOrGetSession: mock(async () => {
|
|
subagentSessions.add(sessionID)
|
|
syncSubagentSessions.add(sessionID)
|
|
return { sessionID, isNew: true }
|
|
}),
|
|
waitForCompletion: mock(async (createdSessionID: string) => {
|
|
expect(createdSessionID).toBe(sessionID)
|
|
expect(subagentSessions.has(sessionID)).toBe(true)
|
|
expect(syncSubagentSessions.has(sessionID)).toBe(true)
|
|
throw new Error("poll exploded")
|
|
}),
|
|
})
|
|
|
|
// when
|
|
const resultPromise = executeSync(args, toolContext, createContext(promptAsync) as never, deps)
|
|
|
|
// then
|
|
let thrownError: Error | undefined
|
|
|
|
try {
|
|
await resultPromise
|
|
} catch (error) {
|
|
if (error instanceof Error) {
|
|
thrownError = error
|
|
} else {
|
|
throw error
|
|
}
|
|
}
|
|
|
|
expect(thrownError?.message).toBe("poll exploded")
|
|
expect(subagentSessions.has(sessionID)).toBe(false)
|
|
expect(syncSubagentSessions.has(sessionID)).toBe(false)
|
|
})
|
|
})
|
|
|
|
describe("#given executeSync reuses an existing session", () => {
|
|
test("#when execution completes successfully #then the reused session is tracked in both Sets", async () => {
|
|
// given
|
|
const sessionID = "ses-reused"
|
|
const args = { ...createArgs(), session_id: sessionID }
|
|
const toolContext = createToolContext()
|
|
const promptAsync = mock(async () => ({ data: {} }))
|
|
const deps = createDependencies({
|
|
createOrGetSession: mock(async () => ({ sessionID, isNew: false })),
|
|
waitForCompletion: mock(async (createdSessionID: string) => {
|
|
expect(createdSessionID).toBe(sessionID)
|
|
expect(subagentSessions.has(sessionID)).toBe(true)
|
|
expect(syncSubagentSessions.has(sessionID)).toBe(true)
|
|
}),
|
|
})
|
|
|
|
expect(subagentSessions.has(sessionID)).toBe(false)
|
|
expect(syncSubagentSessions.has(sessionID)).toBe(false)
|
|
|
|
// when
|
|
const result = await executeSync(args, toolContext, createContext(promptAsync) as never, deps)
|
|
|
|
// then
|
|
expect(result).toContain(`session_id: ${sessionID}`)
|
|
expect(subagentSessions.has(sessionID)).toBe(true)
|
|
expect(syncSubagentSessions.has(sessionID)).toBe(true)
|
|
})
|
|
|
|
test("#when execution applies a fallback chain #then it clears that chain in finally", async () => {
|
|
// given
|
|
const sessionID = "ses-reused-fallback"
|
|
const args = { ...createArgs(), session_id: sessionID }
|
|
const toolContext = createToolContext()
|
|
const promptAsync = mock(async () => ({ data: {} }))
|
|
const clearSessionFallbackChain = mock(() => {})
|
|
const deps = createDependencies({
|
|
createOrGetSession: mock(async () => ({ sessionID, isNew: false })),
|
|
clearSessionFallbackChain,
|
|
})
|
|
const fallbackChain = [{ providers: ["openai"], model: "gpt-5.4" }]
|
|
|
|
// when
|
|
await executeSync(args, toolContext, createContext(promptAsync) as never, deps, fallbackChain)
|
|
|
|
// then
|
|
expect(clearSessionFallbackChain).toHaveBeenCalledWith(sessionID)
|
|
})
|
|
})
|
|
})
|