refactor: remove manualModeDefault from session state

Author: Tarquinen

index.ts

@@ -18,7 +18,7 @@ const plugin: Plugin = (async (ctx) => {
     }
 
     const logger = new Logger(config.debug)
-    const state = createSessionState(config.manualMode.enabled)
+    const state = createSessionState()
 
     if (isSecureMode()) {
         configureClientAuth(ctx.client)

lib/hooks.ts

@@ -68,7 +68,7 @@ export function createChatMessageTransformHandler(
     config: PluginConfig,
 ) {
     return async (input: {}, output: { messages: WithParts[] }) => {
-        await checkSession(client, state, logger, output.messages)
+        await checkSession(client, state, logger, output.messages, config.manualMode.enabled)
 
         if (state.isSubAgent) {
             return
@@ -162,7 +162,14 @@ export function createCommandExecuteHandler(
             })
             const messages = (messagesResponse.data || messagesResponse) as WithParts[]
 
-            await ensureSessionInitialized(client, state, input.sessionID, logger, messages)
+            await ensureSessionInitialized(
+                client,
+                state,
+                input.sessionID,
+                logger,
+                messages,
+                config.manualMode.enabled,
+            )
 
             const args = (input.arguments || "").trim().split(/\s+/).filter(Boolean)
             const subcommand = args[0]?.toLowerCase() || ""

lib/state/state.ts

@@ -15,6 +15,7 @@ export const checkSession = async (
     state: SessionState,
     logger: Logger,
     messages: WithParts[],
+    manualModeDefault: boolean,
 ): Promise<void> => {
     const lastUserMessage = getLastUserMessage(messages)
     if (!lastUserMessage) {
@@ -26,7 +27,14 @@ export const checkSession = async (
     if (state.sessionId === null || state.sessionId !== lastSessionId) {
         logger.info(`Session changed: ${state.sessionId} -> ${lastSessionId}`)
         try {
-            await ensureSessionInitialized(client, state, lastSessionId, logger, messages)
+            await ensureSessionInitialized(
+                client,
+                state,
+                lastSessionId,
+                logger,
+                messages,
+                manualModeDefault,
+            )
         } catch (err: any) {
             logger.error("Failed to initialize session state", { error: err.message })
         }
@@ -44,12 +52,11 @@ export const checkSession = async (
     state.currentTurn = countTurns(state, messages)
 }
 
-export function createSessionState(manualModeDefault = false): SessionState {
+export function createSessionState(): SessionState {
     return {
         sessionId: null,
         isSubAgent: false,
-        manualMode: manualModeDefault,
-        manualModeDefault,
+        manualMode: false,
         prune: {
             tools: new Map<string, number>(),
             messages: new Map<string, number>(),
@@ -73,7 +80,7 @@ export function createSessionState(manualModeDefault = false): SessionState {
 export function resetSessionState(state: SessionState): void {
     state.sessionId = null
     state.isSubAgent = false
-    state.manualMode = state.manualModeDefault
+    state.manualMode = false
     state.prune = {
         tools: new Map<string, number>(),
         messages: new Map<string, number>(),
@@ -99,20 +106,22 @@ export async function ensureSessionInitialized(
     sessionId: string,
     logger: Logger,
     messages: WithParts[],
+    manualModeDefault: boolean,
 ): Promise<void> {
     if (state.sessionId === sessionId) {
         return
     }
 
-    logger.info("session ID = " + sessionId)
-    logger.info("Initializing session state", { sessionId: sessionId })
+    // logger.info("session ID = " + sessionId)
+    // logger.info("Initializing session state", { sessionId: sessionId })
 
     resetSessionState(state)
+    state.manualMode = manualModeDefault
     state.sessionId = sessionId
 
     const isSubAgent = await isSubAgentSession(client, sessionId)
     state.isSubAgent = isSubAgent
-    logger.info("isSubAgent = " + isSubAgent)
+    // logger.info("isSubAgent = " + isSubAgent)
 
     state.lastCompaction = findLastCompactionTimestamp(messages)
     state.currentTurn = countTurns(state, messages)

lib/state/types.ts

@@ -35,7 +35,6 @@ export interface SessionState {
     sessionId: string | null
     isSubAgent: boolean
     manualMode: boolean
-    manualModeDefault: boolean
     prune: Prune
     compressSummaries: CompressSummary[]
     stats: SessionStats

lib/tools/compress.ts

@@ -73,7 +73,14 @@ export function createCompressTool(ctx: PruneToolContext): ReturnType<typeof too
             })
             const messages: WithParts[] = messagesResponse.data || messagesResponse
 
-            await ensureSessionInitialized(client, state, sessionId, logger, messages)
+            await ensureSessionInitialized(
+                client,
+                state,
+                sessionId,
+                logger,
+                messages,
+                ctx.config.manualMode.enabled,
+            )
 
             const startResult = findStringInMessages(
                 messages,

lib/tools/prune-shared.ts

@@ -50,7 +50,14 @@ export async function executePruneOperation(
 
     // These 3 are probably not needed as they should always be set in the message
     // transform handler, but in case something causes state to reset, this is a safety net
-    await ensureSessionInitialized(ctx.client, state, sessionId, logger, messages)
+    await ensureSessionInitialized(
+        ctx.client,
+        state,
+        sessionId,
+        logger,
+        messages,
+        config.manualMode.enabled,
+    )
     syncToolCache(state, config, logger, messages)
     buildToolIdList(state, messages, logger)