refactor isIgnoredUserMessage contract

Move the user-role guard into the helper so callers can use it consistently across message flows. Add a regression test to keep non-user messages from being treated as ignored.

Author: Tarquinen

lib/commands/context.ts

@@ -134,7 +134,7 @@ function analyzeTokens(state: SessionState, messages: WithParts[]): TokenBreakdo
         const isCompacted = isMessageCompacted(state, msg)
         const pruneEntry = state.prune.messages.byMessageId.get(msg.info.id)
         const isMessagePruned = !!pruneEntry && pruneEntry.activeBlockIds.length > 0
-        const isIgnoredUser = msg.info.role === "user" && isIgnoredUserMessage(msg)
+        const isIgnoredUser = isIgnoredUserMessage(msg)
 
         for (const part of parts) {
             if (part.type === "tool") {

lib/compress/message-utils.ts

@@ -142,7 +142,7 @@ function resolveMessage(
         !!rawMessage &&
         !!messageId &&
         searchContext.rawIndexById.has(messageId) &&
-        !(rawMessage.info.role === "user" && isIgnoredUserMessage(rawMessage))
+        !isIgnoredUserMessage(rawMessage)
     if (!hasBoundary) {
         throw new SoftIssue(
             `messageId ${parsed.ref} is not available in the current conversation context. Choose an injected mNNNN ID visible in context.`,

lib/compress/pipeline.ts

@@ -88,7 +88,7 @@ export async function finalizeSession(
     const params = getCurrentParams(ctx.state, rawMessages, ctx.logger)
     const totalSessionTokens = getCurrentTokenUsage(ctx.state, rawMessages)
     const sessionMessageIds = rawMessages
-        .filter((msg) => !(msg.info.role === "user" && isIgnoredUserMessage(msg)))
+        .filter((msg) => !isIgnoredUserMessage(msg))
         .map((msg) => msg.info.id)
 
     await sendCompressNotification(

lib/compress/search.ts

@@ -126,7 +126,7 @@ export function resolveSelection(
         if (!rawMessage) {
             continue
         }
-        if (rawMessage.info.role === "user" && isIgnoredUserMessage(rawMessage)) {
+        if (isIgnoredUserMessage(rawMessage)) {
             continue
         }
 
@@ -221,7 +221,7 @@ function buildBoundaryLookup(
         if (!rawMessage) {
             continue
         }
-        if (rawMessage.info.role === "user" && isIgnoredUserMessage(rawMessage)) {
+        if (isIgnoredUserMessage(rawMessage)) {
             continue
         }
 
@@ -244,7 +244,7 @@ function buildBoundaryLookup(
         if (!anchorMessage) {
             continue
         }
-        if (anchorMessage.info.role === "user" && isIgnoredUserMessage(anchorMessage)) {
+        if (isIgnoredUserMessage(anchorMessage)) {
             continue
         }
 

lib/message-ids.ts

@@ -121,7 +121,7 @@ export function assignMessageRefs(state: SessionState, messages: WithParts[]): n
     let skippedSubAgentPrompt = false
 
     for (const message of messages) {
-        if (message.info.role === "user" && isIgnoredUserMessage(message)) {
+        if (isIgnoredUserMessage(message)) {
             continue
         }
 

lib/messages/inject/inject.ts

@@ -147,7 +147,7 @@ export const injectMessageIds = (
     }
 
     for (const message of messages) {
-        if (message.info.role === "user" && isIgnoredUserMessage(message)) {
+        if (isIgnoredUserMessage(message)) {
             continue
         }
 

lib/messages/inject/utils.ts

@@ -35,7 +35,7 @@ export function getIterationNudgeThreshold(config: PluginConfig): number {
 export function findLastNonIgnoredMessage(messages: WithParts[]): LastNonIgnoredMessage | null {
     for (let i = messages.length - 1; i >= 0; i--) {
         const message = messages[i]
-        if (message.info.role === "user" && isIgnoredUserMessage(message)) {
+        if (isIgnoredUserMessage(message)) {
             continue
         }
         return { message, index: i }
@@ -49,7 +49,7 @@ export function countMessagesAfterIndex(messages: WithParts[], index: number): n
 
     for (let i = index + 1; i < messages.length; i++) {
         const message = messages[i]
-        if (message.info.role === "user" && isIgnoredUserMessage(message)) {
+        if (isIgnoredUserMessage(message)) {
             continue
         }
         count++

lib/messages/priority.ts

@@ -28,7 +28,7 @@ export function buildPriorityMap(
     const priorities: CompressionPriorityMap = new Map()
 
     for (const message of messages) {
-        if (message.info.role === "user" && isIgnoredUserMessage(message)) {
+        if (isIgnoredUserMessage(message)) {
             continue
         }
 

lib/messages/utils.ts

@@ -142,6 +142,10 @@ export function buildToolIdList(state: SessionState, messages: WithParts[]): str
 }
 
 export const isIgnoredUserMessage = (message: WithParts): boolean => {
+    if (message.info.role !== "user") {
+        return false
+    }
+
     const parts = Array.isArray(message.parts) ? message.parts : []
     if (parts.length === 0) {
         return true

tests/message-utils.test.ts

@@ -0,0 +1,42 @@
+import assert from "node:assert/strict"
+import test from "node:test"
+import { isIgnoredUserMessage } from "../lib/messages/utils"
+import type { WithParts } from "../lib/state"
+
+function buildMessage(role: "user" | "assistant", parts: WithParts["parts"]): WithParts {
+    const sessionID = "ses_message_utils"
+
+    const info =
+        role === "user"
+            ? {
+                  id: `msg-${role}`,
+                  role,
+                  sessionID,
+                  agent: "assistant",
+                  model: {
+                      providerID: "anthropic",
+                      modelID: "claude-test",
+                  },
+                  time: { created: 1 },
+              }
+            : {
+                  id: `msg-${role}`,
+                  role,
+                  sessionID,
+                  agent: "assistant",
+                  time: { created: 1 },
+              }
+
+    return {
+        info: info as WithParts["info"],
+        parts,
+    }
+}
+
+test("isIgnoredUserMessage only ignores user messages", () => {
+    const ignoredUserMessage = buildMessage("user", [])
+    const assistantMessage = buildMessage("assistant", [])
+
+    assert.equal(isIgnoredUserMessage(ignoredUserMessage), true)
+    assert.equal(isIgnoredUserMessage(assistantMessage), false)
+})