fix(call-omo-agent): preserve reused session tracking
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
@@ -131,4 +131,28 @@ describe("executeSync session cleanup", () => {
|
|||||||
expect(syncSubagentSessions.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 stays 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 })),
|
||||||
|
})
|
||||||
|
|
||||||
|
subagentSessions.add(sessionID)
|
||||||
|
syncSubagentSessions.add(sessionID)
|
||||||
|
|
||||||
|
// 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)
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -46,10 +46,12 @@ export async function executeSync(
|
|||||||
spawnReservation?: SpawnReservation,
|
spawnReservation?: SpawnReservation,
|
||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
let sessionID: string | undefined
|
let sessionID: string | undefined
|
||||||
|
let createdSessionForExecution = false
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const session = await deps.createOrGetSession(args, toolContext, ctx)
|
const session = await deps.createOrGetSession(args, toolContext, ctx)
|
||||||
sessionID = session.sessionID
|
sessionID = session.sessionID
|
||||||
|
createdSessionForExecution = session.isNew
|
||||||
|
|
||||||
if (session.isNew) {
|
if (session.isNew) {
|
||||||
spawnReservation?.commit()
|
spawnReservation?.commit()
|
||||||
@@ -100,7 +102,7 @@ export async function executeSync(
|
|||||||
spawnReservation?.rollback()
|
spawnReservation?.rollback()
|
||||||
throw error
|
throw error
|
||||||
} finally {
|
} finally {
|
||||||
if (sessionID) {
|
if (sessionID && createdSessionForExecution) {
|
||||||
subagentSessions.delete(sessionID)
|
subagentSessions.delete(sessionID)
|
||||||
syncSubagentSessions.delete(sessionID)
|
syncSubagentSessions.delete(sessionID)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user