merge dev into master

index.ts

@@ -10,7 +10,6 @@ import { Logger } from "./lib/logger"
 import { createSessionState } from "./lib/state"
 import { PromptStore } from "./lib/prompts/store"
 import {
-    createChatMessageHandler,
     createChatMessageTransformHandler,
     createCommandExecuteHandler,
     createEventHandler,
@@ -68,7 +67,6 @@ const server: Plugin = (async (ctx) => {
             prompts,
             hostPermissions,
         ) as any,
-        "chat.message": createChatMessageHandler(state, logger, config, hostPermissions),
         "experimental.text.complete": createTextCompleteHandler(),
         "command.execute.before": createCommandExecuteHandler(
             ctx.client,
@@ -135,7 +133,4 @@ const server: Plugin = (async (ctx) => {
     }
 }) satisfies Plugin
 
-export default {
-    id,
-    server,
-}
+export default server

lib/hooks.ts

@@ -365,24 +365,3 @@ export function createEventHandler(state: SessionState, logger: Logger) {
         }
     }
 }
-
-export function createChatMessageHandler(
-    state: SessionState,
-    logger: Logger,
-    _config: PluginConfig,
-    _hostPermissions: HostPermissionSnapshot,
-) {
-    return async (
-        input: {
-            sessionID: string
-            agent?: string
-            model?: { providerID: string; modelID: string }
-            messageID?: string
-            variant?: string
-        },
-        _output: any,
-    ) => {
-        state.variant = input.variant
-        logger.debug("Cached variant from chat.message hook", { variant: input.variant })
-    }
-}

lib/messages/prune.ts

@@ -202,12 +202,7 @@ const filterCompressedRanges = (
                             : rawSummaryContent
                     const summarySeed = `${summary.blockId}:${summary.anchorMessageId}`
                     result.push(
-                        createSyntheticUserMessage(
-                            userMessage,
-                            summaryContent,
-                            userInfo.variant,
-                            summarySeed,
-                        ),
+                        createSyntheticUserMessage(userMessage, summaryContent, summarySeed),
                     )
 
                     logger.info("Injected compress summary", {

lib/messages/utils.ts

@@ -16,7 +16,6 @@ const generateStableId = (prefix: string, seed: string): string => {
 export const createSyntheticUserMessage = (
     baseMessage: WithParts,
     content: string,
-    variant?: string,
     stableSeed?: string,
 ): WithParts => {
     const userInfo = baseMessage.info as UserMessage
@@ -33,7 +32,6 @@ export const createSyntheticUserMessage = (
             agent: userInfo.agent,
             model: userInfo.model,
             time: { created: now },
-            ...(variant !== undefined && { variant }),
         },
         parts: [
             {

lib/state/state.ts

@@ -96,7 +96,6 @@ export function createSessionState(): SessionState {
         },
         lastCompaction: 0,
         currentTurn: 0,
-        variant: undefined,
         modelContextLimit: undefined,
         systemPromptTokens: undefined,
     }
@@ -131,7 +130,6 @@ export function resetSessionState(state: SessionState): void {
     }
     state.lastCompaction = 0
     state.currentTurn = 0
-    state.variant = undefined
     state.modelContextLimit = undefined
     state.systemPromptTokens = undefined
 }

lib/state/types.ts

@@ -106,7 +106,6 @@ export interface SessionState {
     messageIds: MessageIdState
     lastCompaction: number
     currentTurn: number
-    variant: string | undefined
     modelContextLimit: number | undefined
     systemPromptTokens: number | undefined
 }

lib/token-utils.ts

@@ -54,14 +54,14 @@ export function getCurrentParams(
             providerId: undefined,
             modelId: undefined,
             agent: undefined,
-            variant: state.variant,
+            variant: undefined,
         }
     }
     const userInfo = userMsg.info as UserMessage
     const agent: string = userInfo.agent
     const providerId: string | undefined = userInfo.model.providerID
     const modelId: string | undefined = userInfo.model.modelID
-    const variant: string | undefined = state.variant ?? userInfo.variant
+    const variant: string | undefined = userInfo.model.variant
 
     return { providerId, modelId, agent, variant }
 }