From 9bbd1d5baabc06ecefb43b29fea5c4178e940787 Mon Sep 17 00:00:00 2001 From: bchanot Date: Mon, 2 Nov 2026 18:41:58 +0100 Subject: [PATCH] fix(model-router): a non-object Skill answer counts as no deny for the guard latch --- mods/model-router/hooks/register.test.ts | 14 ++++++++++++++ mods/model-router/hooks/register.ts | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/mods/model-router/hooks/register.test.ts b/mods/model-router/hooks/register.test.ts index f405061..9021acb 100644 --- a/mods/model-router/hooks/register.test.ts +++ b/mods/model-router/hooks/register.test.ts @@ -7437,3 +7437,17 @@ test('GUARD: /clear re-arms it', async ($, on) => { await clearSession($) expect(denied(await write($, `${ROOT}/src/a.ts`))).toContain(GUARD) }) + +test('GUARD: a deny-free Skill answer latches, the skill loads once', async ( + $, on) => { + let ran = 0 + on('tool.call', { tool: 'Skill' }, () => { + ran += 1 + return { result: 'ok' as never } + }) + writeBottoms(on) + await bootRig($, on, OPUS, 1000, newWorld()) + await $.tool.call({ tool: 'Skill', skill: 'diagram' } as never) + expect(ran).toBe(1) + expect(denied(await write($, `${ROOT}/src/a.ts`))).toBe('') +}) diff --git a/mods/model-router/hooks/register.ts b/mods/model-router/hooks/register.ts index cdc1ed5..448b13e 100644 --- a/mods/model-router/hooks/register.ts +++ b/mods/model-router/hooks/register.ts @@ -4571,9 +4571,9 @@ function registerSkills(on: On, st: State): void { await tierAsk($, st, st.turnMain, `Skill /${clean(skill, NAME_CAP)}`) } const out = await next(e) - if (e.agentId === undefined && !('deny' in (out as Rec))) { - st.skillRun = true - } + const refused = typeof out === 'object' && out !== null && + 'deny' in out + if (e.agentId === undefined && !refused) st.skillRun = true return out } finally { st.skillCalls -= 1