fix(session): ignore internal synthetic turns

src/plugin/chat-message.test.ts

@@ -1,19 +1,19 @@
-import { afterEach, beforeEach, describe, test, expect } from "bun:test"
+import { afterEach, beforeEach, describe, expect, test } from "bun:test"
+import { randomUUID } from "node:crypto"
 import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs"
 import { tmpdir } from "node:os"
 import { join } from "node:path"
-import { randomUUID } from "node:crypto"
-
-import { createChatMessageHandler } from "./chat-message"
+import { unsafeTestValue } from "../../test-support/unsafe-test-value"
+import { readBoulderState } from "../features/boulder-state"
+import { _resetForTesting, getSessionAgent, registerAgentName, setMainSession, subagentSessions, updateSessionAgent } from "../features/claude-code-session-state"
 import { createAutoSlashCommandHook } from "../hooks/auto-slash-command"
 import { createKeywordDetectorHook } from "../hooks/keyword-detector"
 import { createStartWorkHook } from "../hooks/start-work"
-import { readBoulderState } from "../features/boulder-state"
-import { _resetForTesting, setMainSession, subagentSessions, registerAgentName, updateSessionAgent, getSessionAgent } from "../features/claude-code-session-state"
 import { getAgentListDisplayName } from "../shared/agent-display-names"
 import { getOmoOpenCodeCacheDir, getOpenCodeCacheDir } from "../shared/data-path"
+import { OMO_INTERNAL_INITIATOR_MARKER } from "../shared/internal-initiator-marker"
 import { clearSessionModel, getSessionModel, setSessionModel } from "../shared/session-model-state"
-import { unsafeTestValue } from "../../test-support/unsafe-test-value"
+import { createChatMessageHandler } from "./chat-message"
 
 type ChatMessagePart = { type: string; text?: string; [key: string]: unknown }
 type ChatMessageHandlerOutput = { message: Record<string, unknown>; parts: ChatMessagePart[] }
@@ -83,6 +83,56 @@ afterEach(() => {
   clearSessionModel("subagent-session")
 })
 
+describe("createChatMessageHandler - synthetic/internal messages", () => {
+  test("skips synthetic-only user messages before session state and hooks mutate", async () => {
+    // given
+    const hookCalls: string[] = []
+    const args = createMockHandlerArgs({ shouldOverride: true })
+    args.hooks.keywordDetector = {
+      "chat.message": async () => {
+        hookCalls.push("keywordDetector")
+      },
+    }
+    const handler = createChatMessageHandler(args)
+    const output: ChatMessageHandlerOutput = {
+      message: {},
+      parts: [{ type: "text", text: "synthetic prompt", synthetic: true }],
+    }
+
+    // when
+    await handler(createMockInput("sisyphus"), output)
+
+    // then
+    expect(args._appliedSessions).toEqual([])
+    expect(hookCalls).toEqual([])
+    expect(getSessionAgent("test-session")).toBeUndefined()
+  })
+
+  test("skips internally marked user messages before first-message gate is consumed", async () => {
+    // given
+    const hookCalls: string[] = []
+    const args = createMockHandlerArgs({ shouldOverride: true })
+    args.hooks.autoSlashCommand = {
+      "chat.message": async () => {
+        hookCalls.push("autoSlashCommand")
+      },
+    }
+    const handler = createChatMessageHandler(args)
+    const output: ChatMessageHandlerOutput = {
+      message: {},
+      parts: [{ type: "text", text: `/commit\n${OMO_INTERNAL_INITIATOR_MARKER}` }],
+    }
+
+    // when
+    await handler(createMockInput("sisyphus"), output)
+
+    // then
+    expect(args._appliedSessions).toEqual([])
+    expect(hookCalls).toEqual([])
+    expect(getSessionAgent("test-session")).toBeUndefined()
+  })
+})
+
 describe("createChatMessageHandler - cache warning behavior", () => {
   let cacheRoot = ""
   let originalXdgCacheHome: string | undefined

src/plugin/chat-message.ts

@@ -1,15 +1,19 @@
 import type { OhMyOpenCodeConfig } from "../config"
-import type { PluginContext } from "./types"
+import type { CreatedHooks } from "../create-hooks"
 
-import { isModelCacheAvailable, log } from "../shared"
+import { getMainSessionID, setSessionAgent, subagentSessions } from "../features/claude-code-session-state"
+import { parseRalphLoopArguments } from "../hooks/ralph-loop/command-arguments"
+import {
+  isModelCacheAvailable,
+  isRealUserTextPart,
+  isSyntheticOrInternalOnlyTextParts,
+  log,
+} from "../shared"
 import { getAgentConfigKey } from "../shared/agent-display-names"
 import { getSessionModel, setSessionModel } from "../shared/session-model-state"
-import { getMainSessionID, setSessionAgent, subagentSessions } from "../features/claude-code-session-state"
-import { applyUltraworkModelOverrideOnMessage } from "./ultrawork-model-override"
 import { NATIVE_LOOP_TRIGGERED_FLAG } from "./command-execute-before"
-import { parseRalphLoopArguments } from "../hooks/ralph-loop/command-arguments"
-
-import type { CreatedHooks } from "../create-hooks"
+import type { PluginContext } from "./types"
+import { applyUltraworkModelOverrideOnMessage } from "./ultrawork-model-override"
 
 type FirstMessageVariantGate = {
   shouldOverride: (sessionID: string) => boolean
@@ -35,12 +39,12 @@ type RawLoopCommand =
 function isStartWorkHookOutput(value: unknown): value is StartWorkHookOutput {
   if (typeof value !== "object" || value === null) return false
   const record = value as Record<string, unknown>
-  const partsValue = record["parts"]
+  const partsValue = record.parts
   if (!Array.isArray(partsValue)) return false
   return partsValue.every((part) => {
     if (typeof part !== "object" || part === null) return false
     const partRecord = part as Record<string, unknown>
-    return typeof partRecord["type"] === "string"
+    return typeof partRecord.type === "string"
   })
 }
 
@@ -62,8 +66,7 @@ function hasExplicitAgentModelOverride(
 function getStoredMainSessionModel(
   input: ChatMessageInput,
   pluginConfig: OhMyOpenCodeConfig,
-  isFirstMessage: boolean,
-  output: ChatMessageHandlerOutput
+  isFirstMessage: boolean
 ): SessionModelOverride | undefined {
   if (isFirstMessage) {
     return undefined
@@ -81,7 +84,7 @@ function getStoredMainSessionModel(
     return undefined
   }
 
-  // Removed: `output.message["model"] !== undefined` guard was unreachable.
+  // Removed: `output.message.model !== undefined` guard was unreachable.
   // OpenCode always populates output.message.model before triggering chat.message,
   // so the guard short-circuited every time, preventing session model recovery.
 
@@ -129,7 +132,7 @@ function parseRawLoopSlashCommand(promptText: string): RawLoopCommand | null {
 function extractPromptText(parts: ChatMessagePart[]): string {
   return (
     parts
-      ?.filter((part) => part.type === "text" && part.text)
+      ?.filter(isRealUserTextPart)
       .map((part) => part.text)
       .join("\n")
       .trim() || ""
@@ -192,6 +195,13 @@ export function createChatMessageHandler(args: {
     input: ChatMessageInput,
     output: ChatMessageHandlerOutput
   ): Promise<void> => {
+    if (isSyntheticOrInternalOnlyTextParts(output.parts)) {
+      log("[chat-message] Skipping synthetic/internal-only message", {
+        sessionID: input.sessionID,
+      })
+      return
+    }
+
     if (input.agent) {
       setSessionAgent(input.sessionID, input.agent)
     }
@@ -205,16 +215,15 @@ export function createChatMessageHandler(args: {
       input,
       pluginConfig,
       isFirstMessage,
-      output,
     )
     if (storedMainSessionModel) {
-      output.message["model"] = storedMainSessionModel
+      output.message.model = storedMainSessionModel
     }
 
     if (!isRuntimeFallbackEnabled) {
       await hooks.modelFallback?.["chat.message"]?.(input, output)
     }
-    const modelOverride = output.message["model"]
+    const modelOverride = output.message.model
     if (
       modelOverride &&
       typeof modelOverride === "object" &&