From bd66fa4855fd085c5c572d46ffb7e80d6c9a6ab3 Mon Sep 17 00:00:00 2001 From: plfavreau Date: Tue, 3 Nov 2026 17:13:27 +0100 Subject: [PATCH] fix: resolve the model context limit before injecting nudges on a fresh process --- lib/hooks.ts | 22 ++++++++++++++++ tests/hooks-permission.test.ts | 48 ++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/lib/hooks.ts b/lib/hooks.ts index 6d6f3862d..6e8654407 100644 --- a/lib/hooks.ts +++ b/lib/hooks.ts @@ -38,6 +38,7 @@ import { type HostPermissionSnapshot } from "./host-permissions" import { compressPermission, syncCompressPermissionState } from "./compress-permission" import { checkSession, ensureSessionInitialized, saveSessionState, syncToolCache } from "./state" import { cacheSystemPromptTokens } from "./ui/utils" +import { getModelInfo } from "./messages/inject/utils" const INTERNAL_AGENT_SIGNATURES = [ "You are a title generator", @@ -104,6 +105,23 @@ export function createSystemPromptHandler( } } +// Messages are transformed before the system prompt hook reports the model limit, +// so the first request of a fresh process would otherwise see no limit and nudge. +async function lookupModelContextLimit( + client: any, + messages: WithParts[], +): Promise { + const { providerId, modelId } = getModelInfo(messages) + if (!providerId || !modelId) return undefined + try { + const response = await client.config.providers() + const provider = response?.data?.providers?.find((p: any) => p.id === providerId) + return provider?.models?.[modelId]?.limit?.context || undefined + } catch { + return undefined + } +} + export function createChatMessageTransformHandler( client: any, state: SessionState, @@ -124,6 +142,10 @@ export function createChatMessageTransformHandler( await checkSession(client, state, logger, output.messages, config.manualMode.enabled) + if (state.modelContextLimit === undefined) { + state.modelContextLimit = await lookupModelContextLimit(client, output.messages) + } + syncCompressPermissionState(state, config, hostPermissions, output.messages) if (state.isSubAgent && !config.experimental.allowSubAgents) { diff --git a/tests/hooks-permission.test.ts b/tests/hooks-permission.test.ts index 58d26c839..9165a7d52 100644 --- a/tests/hooks-permission.test.ts +++ b/tests/hooks-permission.test.ts @@ -807,3 +807,51 @@ test("manual mode persisted setting refreshes server session state", async () => await refreshManualMode(state, sessionId, logger, true) assert.equal(state.manualMode, false) }) + +test("chat message transform resolves a percentage threshold before the system prompt hook runs", async () => { + const state = createSessionState() + const config = buildConfig("allow") + config.compress.minContextLimit = "55%" + config.compress.maxContextLimit = "80%" + const handler = createChatMessageTransformHandler( + { + session: { get: async () => ({}) }, + config: { + providers: async () => ({ + data: { + providers: [ + { + id: "anthropic", + models: { "claude-x": { limit: { context: 200000 } } }, + }, + ], + }, + }), + }, + } as any, + state, + new Logger(false), + config, + buildPromptStore(), + { global: undefined, agents: {} }, + ) + const user = (id: string) => { + const message = buildMessage(id, "user", "short question") + ;(message.info as any).model = { providerID: "anthropic", modelID: "claude-x" } + return message + } + + await handler( + {}, + { + messages: [ + user("user-1"), + buildMessage("assistant-1", "assistant", "short answer"), + user("user-2"), + ], + }, + ) + + assert.equal(state.modelContextLimit, 200000) + assert.equal(state.nudges.turnNudgeAnchors.size, 0) +})