Coder/deepseek-harness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(agent-loop): scope blocked admission cleanup

Browse Source
This commit is contained in:
_Kerman
2026-07-31 14:35:58 +08:00
parent 12a48558f2
commit c2ff9ddec8
18 changed files with 162 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/goal/goal-session/src/index.ts
View File

@@ -350,7 +350,7 @@ export function apply(ctx: Context): void {
cancelReservation(agent, attempt)
}
requestDrive(state)
return { kind: 'block', reason: STALE_ROUND_REASON, keepInbox: true }
return { kind: 'block', reason: STALE_ROUND_REASON, discardClaimed: false }
}
let decision: PromptDecision
try {
@@ -398,7 +398,7 @@ export function apply(ctx: Context): void {
cancelReservation(agent, attempt)
}
requestDrive(state)
return { kind: 'block', reason: STALE_ROUND_REASON, keepInbox: true }
return { kind: 'block', reason: STALE_ROUND_REASON, discardClaimed: false }
}
return decision
})

13
packages/goal/goal-session/tests/goal-session.spec.ts
View File

@@ -238,7 +238,7 @@ describe('same-session goal driving', () => {
it('maps a downstream prompt veto to blocked without admitting the round', async () => {
const test = await harness([])
test.ctx.on('agent/prompt-submit', (_agent, messages, _signal, next) => messages[0]?.source.kind === 'goal'
? Promise.resolve({ kind: 'block', reason: 'deployment policy' })
? Promise.resolve({ kind: 'block', reason: 'deployment policy', discardClaimed: true })
: next())
test.ctx.goals.create(test.agent, { objective: 'respect policy' })
@@ -253,7 +253,7 @@ describe('same-session goal driving', () => {
it('does not reserve again when a stopped-goal observer queues cancel-scoped work', async () => {
const test = await harness([textResponse('human follow-up')])
test.ctx.on('agent/prompt-submit', (_agent, messages, _signal, next) => messages[0]?.source.kind === 'goal'
? Promise.resolve({ kind: 'block', reason: 'stop this round' })
? Promise.resolve({ kind: 'block', reason: 'stop this round', discardClaimed: true })
: next())
test.ctx.on('goal/changed', (agent, change) => {
if (change.operation === 'block') agent.followup(createUserMessage({ content: [{ type: 'text', text: 'inspect the blocker' }], source: { kind: 'user' } }))
@@ -264,7 +264,8 @@ describe('same-session goal driving', () => {
await test.agent.whenIdle()
expect(test.adapter.requests).toHaveLength(0)
expect(test.agent.inbox.nextTurn).toHaveLength(0)
expect(test.agent.inbox.nextTurn.map(message => message.content[0]))
.toEqual([{ type: 'text', text: 'inspect the blocker' }])
})
it('pauses and drops a reserved round when cancellation lands before admission', async () => {
@@ -884,7 +885,11 @@ describe('same-session goal driving', () => {
if (messages[0]?.source.kind === 'goal' && !vetoed) {
vetoed = true
agent.cancel({ kind: 'user' })
return Promise.resolve<PromptDecision>({ kind: 'block', reason: 'cancelled by policy' })
return Promise.resolve<PromptDecision>({
kind: 'block',
reason: 'cancelled by policy',
discardClaimed: true,
})
}
return next()
})