@@ -196,7 +196,7 @@ export const mergeExtensionState = (prevState: ExtensionState, newState: Partial
 	}
 }
 
-const createInitialExtensionState = (): ExtensionState => ({
+export const createInitialExtensionState = (): ExtensionState => ({
 	apiConfiguration: {},
 	version: "",
 	clineMessages: [],
 
@@ -13,7 +13,12 @@ import {
 	DEFAULT_DIFF_FUZZY_THRESHOLD,
 } from "@roo-code/types"
 
-import { ExtensionStateContextProvider, useExtensionState, mergeExtensionState } from "../ExtensionStateContext"
+import {
+	ExtensionStateContextProvider,
+	useExtensionState,
+	mergeExtensionState,
+	createInitialExtensionState,
+} from "../ExtensionStateContext"
 
 const TestComponent = () => {
 	const { allowedCommands, setAllowedCommands, soundEnabled, showRooIgnoredFiles, setShowRooIgnoredFiles } =
@@ -396,6 +401,16 @@ describe("ExtensionStateContext", () => {
 			}),
 		)
 	})
+
+	it("initializes the per-write checkpoint default before hydration", () => {
+		// The initializer itself (not a merge fixture) must carry the per-write
+		// checkpoint default: a regression that dropped it from
+		// createInitialExtensionState would otherwise stay hidden because the
+		// merge tests supply the key manually.
+		const state = createInitialExtensionState()
+
+		expect(state.perWriteCheckpoints).toBe(true)
+	})
 })
 
 describe("mergeExtensionState", () => {
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ export const mergeExtensionState = (prevState: ExtensionState, newState: Partial`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`-const createInitialExtensionState = (): ExtensionState => ({`
	`199`	`+export const createInitialExtensionState = (): ExtensionState => ({`
`200`	`200`	`apiConfiguration: {},`
`201`	`201`	`version: "",`
`202`	`202`	`clineMessages: [],`