diff --git a/apps/web/src/components/create-model/index.vue b/apps/web/src/components/create-model/index.vue
index 93442bfb0..68a3beae9 100644
--- a/apps/web/src/components/create-model/index.vue
+++ b/apps/web/src/components/create-model/index.vue
@@ -41,6 +41,9 @@
                       <SelectItem value="embedding">
                         Embedding
                       </SelectItem>
+                      <SelectItem value="image">
+                        Image
+                      </SelectItem>
                     </SelectGroup>
                   </SelectContent>
                 </Select>
@@ -107,14 +110,14 @@
             </FormItem>
           </FormField>
 
-          <!-- Compatibilities (chat only) -->
-          <div v-if="selectedType === 'chat'">
+          <!-- Compatibilities -->
+          <div v-if="selectedCompatibilityOptions.length > 0">
             <Label class="mb-4">
               {{ $t('models.compatibilities') }}
             </Label>
             <div class="flex flex-wrap gap-3 mt-2">
               <label
-                v-for="opt in COMPATIBILITY_OPTIONS"
+                v-for="opt in selectedCompatibilityOptions"
                 :key="opt.value"
                 class="flex items-center gap-1.5 text-xs"
               >
@@ -177,7 +180,7 @@ import { useMutation, useQueryCache } from '@pinia/colada'
 import { postModels, putModelsById, putModelsModelByModelId } from '@memohai/sdk'
 import type { ModelsGetResponse, ModelsAddRequest, ModelsUpdateRequest } from '@memohai/sdk'
 import { useI18n } from 'vue-i18n'
-import { COMPATIBILITY_OPTIONS } from '@/constants/compatibilities'
+import { CHAT_COMPATIBILITY_OPTIONS, IMAGE_COMPATIBILITY_OPTIONS } from '@/constants/compatibilities'
 import FormDialogShell from '@/components/form-dialog-shell/index.vue'
 import { useDialogMutation } from '@/composables/useDialogMutation'
 
@@ -201,6 +204,21 @@ const form = useForm({
 })
 
 const selectedType = computed(() => form.values.type || 'chat')
+const selectedCompatibilityOptions = computed(() => {
+  switch (selectedType.value) {
+    case 'chat':
+      return CHAT_COMPATIBILITY_OPTIONS
+    case 'image':
+      return IMAGE_COMPATIBILITY_OPTIONS
+    default:
+      return []
+  }
+})
+
+watch(selectedCompatibilityOptions, (options) => {
+  const allowed = new Set(options.map(option => option.value))
+  selectedCompat.value = selectedCompat.value.filter(value => allowed.has(value))
+}, { immediate: true })
 
 const open = inject<Ref<boolean>>('openModel', ref(false))
 const title = inject<Ref<'edit' | 'title'>>('openModelTitle', ref('title'))
@@ -288,8 +306,11 @@ async function addModel() {
     if (dim) config.dimensions = dim
   }
 
-  if (type === 'chat') {
+  if (type === 'chat' || type === 'image') {
     config.compatibilities = selectedCompat.value
+  }
+
+  if (type === 'chat') {
     const ctxWin = form.values.context_window ?? (isEdit ? fallback!.config?.context_window : undefined)
     if (ctxWin) config.context_window = ctxWin
   }
diff --git a/apps/web/src/components/model-capabilities/index.vue b/apps/web/src/components/model-capabilities/index.vue
index c946e17b9..27e6f207d 100644
--- a/apps/web/src/components/model-capabilities/index.vue
+++ b/apps/web/src/components/model-capabilities/index.vue
@@ -15,7 +15,7 @@
 
 <script setup lang="ts">
 import type { Component } from 'vue'
-import { Wrench, Eye, Image, Brain } from 'lucide-vue-next'
+import { Wrench, Eye, Image, Brain, Pencil } from 'lucide-vue-next'
 
 defineProps<{
   compatibilities: string[]
@@ -25,6 +25,8 @@ const ICONS: Record<string, Component> = {
   'tool-call': Wrench,
   'vision': Eye,
   'image-output': Image,
+  'generate': Image,
+  'edit': Pencil,
   'reasoning': Brain,
 }
 
@@ -32,6 +34,8 @@ const CLASSES: Record<string, string> = {
   'tool-call': 'bg-blue-50 text-blue-700 dark:bg-blue-950 dark:text-blue-300',
   'vision': 'bg-purple-50 text-purple-700 dark:bg-purple-950 dark:text-purple-300',
   'image-output': 'bg-pink-50 text-pink-700 dark:bg-pink-950 dark:text-pink-300',
+  'generate': 'bg-pink-50 text-pink-700 dark:bg-pink-950 dark:text-pink-300',
+  'edit': 'bg-emerald-50 text-emerald-700 dark:bg-emerald-950 dark:text-emerald-300',
   'reasoning': 'bg-amber-50 text-amber-700 dark:bg-amber-950 dark:text-amber-300',
 }
 
diff --git a/apps/web/src/constants/compatibilities.ts b/apps/web/src/constants/compatibilities.ts
index 36aadfac9..f52dc111d 100644
--- a/apps/web/src/constants/compatibilities.ts
+++ b/apps/web/src/constants/compatibilities.ts
@@ -3,9 +3,19 @@ export interface CompatibilityMeta {
   label: string
 }
 
-export const COMPATIBILITY_OPTIONS: CompatibilityMeta[] = [
+export const CHAT_COMPATIBILITY_OPTIONS: CompatibilityMeta[] = [
   { value: 'vision', label: 'Vision' },
   { value: 'tool-call', label: 'Tool Call' },
   { value: 'image-output', label: 'Image Output' },
   { value: 'reasoning', label: 'Reasoning' },
 ]
+
+export const IMAGE_COMPATIBILITY_OPTIONS: CompatibilityMeta[] = [
+  { value: 'generate', label: 'Generate' },
+  { value: 'edit', label: 'Edit' },
+]
+
+export const COMPATIBILITY_OPTIONS: CompatibilityMeta[] = [
+  ...CHAT_COMPATIBILITY_OPTIONS,
+  ...IMAGE_COMPATIBILITY_OPTIONS,
+]
diff --git a/apps/web/src/i18n/locales/en.json b/apps/web/src/i18n/locales/en.json
index b5b211b4b..dc5ae40fe 100644
--- a/apps/web/src/i18n/locales/en.json
+++ b/apps/web/src/i18n/locales/en.json
@@ -257,6 +257,8 @@
       "vision": "Vision",
       "tool-call": "Tool Call",
       "image-output": "Image Output",
+      "generate": "Generate",
+      "edit": "Edit",
       "reasoning": "Reasoning"
     },
     "contextWindow": "Context Window",
@@ -916,7 +918,7 @@
       "ttsModel": "TTS Model",
       "ttsModelPlaceholder": "Select TTS model",
       "imageModel": "Image Generation Model",
-      "imageModelDescription": "Model used for the generate_image tool. Must support image-output compatibility.",
+      "imageModelDescription": "Model used for image tools. Supports chat models with image-output or image models with generate/edit compatibility.",
       "imageModelPlaceholder": "Select image model (optional)",
       "language": "Language",
       "reasoningEnabled": "Enable Reasoning",
diff --git a/apps/web/src/i18n/locales/zh.json b/apps/web/src/i18n/locales/zh.json
index 3840439b7..e5bd35a88 100644
--- a/apps/web/src/i18n/locales/zh.json
+++ b/apps/web/src/i18n/locales/zh.json
@@ -253,6 +253,8 @@
       "vision": "视觉",
       "tool-call": "工具调用",
       "image-output": "图片生成",
+      "generate": "生成",
+      "edit": "编辑",
       "reasoning": "推理"
     },
     "contextWindow": "上下文窗口",
@@ -912,7 +914,7 @@
       "ttsModel": "语音合成模型",
       "ttsModelPlaceholder": "选择语音合成模型",
       "imageModel": "图片生成模型",
-      "imageModelDescription": "用于 generate_image 工具的模型，必须支持 image-output 兼容性。",
+      "imageModelDescription": "用于图片工具的模型。可选择支持 image-output 的 chat 模型，或支持 generate/edit 的 image 模型。",
       "imageModelPlaceholder": "选择图片模型（可选）",
       "language": "语言",
       "reasoningEnabled": "启用推理",
diff --git a/apps/web/src/pages/bots/components/bot-settings.vue b/apps/web/src/pages/bots/components/bot-settings.vue
index 7fd4632bc..311a7868a 100644
--- a/apps/web/src/pages/bots/components/bot-settings.vue
+++ b/apps/web/src/pages/bots/components/bot-settings.vue
@@ -197,7 +197,6 @@
         v-model="form.image_model_id"
         :models="imageCapableModels"
         :providers="providers"
-        model-type="chat"
         :placeholder="$t('bots.settings.imageModelPlaceholder')"
       />
     </div>
@@ -488,7 +487,15 @@ const { mutateAsync: deleteBot, isLoading: deleteLoading } = useMutation({
 const models = computed(() => modelData.value ?? [])
 const providers = computed(() => providerData.value ?? [])
 const imageCapableModels = computed(() =>
-  models.value.filter((m) => m.config?.compatibilities?.includes('image-output')),
+  models.value.filter((m) => {
+    if (m.type === 'chat') {
+      return m.config?.compatibilities?.includes('image-output')
+    }
+    if (m.type === 'image') {
+      return m.config?.compatibilities?.includes('generate') || m.config?.compatibilities?.includes('edit')
+    }
+    return false
+  }),
 )
 const searchProviders = computed(() => (searchProviderData.value ?? []).filter((p) => p.enable !== false))
 const memoryProviders = computed(() => memoryProviderData.value ?? [])
diff --git a/apps/web/src/pages/bots/components/model-options.vue b/apps/web/src/pages/bots/components/model-options.vue
index 5b7a02993..22e065094 100644
--- a/apps/web/src/pages/bots/components/model-options.vue
+++ b/apps/web/src/pages/bots/components/model-options.vue
@@ -93,7 +93,7 @@ export interface ModelOption {
 const props = defineProps<{
   models: ModelsGetResponse[]
   providers: ProvidersGetResponse[]
-  modelType: 'chat' | 'embedding'
+  modelType?: 'chat' | 'embedding' | 'image'
   open?: boolean
 }>()
 
@@ -118,7 +118,7 @@ const providerMap = computed(() => {
 })
 
 const typeFilteredModels = computed(() =>
-  props.models.filter((m) => m.type === props.modelType),
+  props.modelType ? props.models.filter((m) => m.type === props.modelType) : props.models,
 )
 
 const options = computed<ModelOption[]>(() =>
diff --git a/apps/web/src/pages/bots/components/model-select.vue b/apps/web/src/pages/bots/components/model-select.vue
index 897ea1cb3..54b6418e1 100644
--- a/apps/web/src/pages/bots/components/model-select.vue
+++ b/apps/web/src/pages/bots/components/model-select.vue
@@ -41,7 +41,7 @@ import ModelOptions from './model-options.vue'
 const props = defineProps<{
   models: ModelsGetResponse[]
   providers: ProvidersGetResponse[]
-  modelType: 'chat' | 'embedding'
+  modelType?: 'chat' | 'embedding' | 'image'
   placeholder?: string
 }>()
 
diff --git a/apps/web/src/pages/providers/components/model-item.vue b/apps/web/src/pages/providers/components/model-item.vue
index a8fbbfe24..62af89a63 100644
--- a/apps/web/src/pages/providers/components/model-item.vue
+++ b/apps/web/src/pages/providers/components/model-item.vue
@@ -101,7 +101,7 @@ import {
   Button,
   Spinner,
 } from '@memohai/ui'
-import { RefreshCw, Settings, Trash2, MessageSquare, Binary } from 'lucide-vue-next'
+import { RefreshCw, Settings, Trash2, MessageSquare, Binary, Image } from 'lucide-vue-next'
 import ConfirmPopover from '@/components/confirm-popover/index.vue'
 import ModelCapabilities from '@/components/model-capabilities/index.vue'
 import ContextWindowBadge from '@/components/context-window-badge/index.vue'
@@ -128,7 +128,14 @@ const testResult = ref<ModelsTestResponse | null>(null)
 const reasoningEfforts = computed(() => ((props.model.config as ModelConfigWithReasoning | undefined)?.reasoning_efforts ?? []))
 
 const typeIcon = computed(() => {
-  return props.model.type === 'embedding' ? Binary : MessageSquare
+  switch (props.model.type) {
+    case 'embedding':
+      return Binary
+    case 'image':
+      return Image
+    default:
+      return MessageSquare
+  }
 })
 
 const statusDotClass = computed(() => {
diff --git a/db/migrations/0001_init.up.sql b/db/migrations/0001_init.up.sql
index 25c8772ad..6a0e17551 100644
--- a/db/migrations/0001_init.up.sql
+++ b/db/migrations/0001_init.up.sql
@@ -92,7 +92,7 @@ CREATE TABLE IF NOT EXISTS models (
   created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
   updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
   CONSTRAINT models_provider_id_model_id_unique UNIQUE (provider_id, model_id),
-  CONSTRAINT models_type_check CHECK (type IN ('chat', 'embedding', 'speech'))
+  CONSTRAINT models_type_check CHECK (type IN ('chat', 'embedding', 'image', 'speech'))
 );
 
 CREATE TABLE IF NOT EXISTS model_variants (
diff --git a/db/migrations/0067_add_image_model_type.down.sql b/db/migrations/0067_add_image_model_type.down.sql
new file mode 100644
index 000000000..b100be4b8
--- /dev/null
+++ b/db/migrations/0067_add_image_model_type.down.sql
@@ -0,0 +1,7 @@
+-- 0067_add_image_model_type (rollback)
+-- Remove image from the supported model types.
+ALTER TABLE models DROP CONSTRAINT IF EXISTS models_type_check;
+
+ALTER TABLE models
+  ADD CONSTRAINT models_type_check
+  CHECK (type IN ('chat', 'embedding', 'speech'));
diff --git a/db/migrations/0067_add_image_model_type.up.sql b/db/migrations/0067_add_image_model_type.up.sql
new file mode 100644
index 000000000..631ff6dcc
--- /dev/null
+++ b/db/migrations/0067_add_image_model_type.up.sql
@@ -0,0 +1,7 @@
+-- 0067_add_image_model_type
+-- Add image as a supported model type.
+ALTER TABLE models DROP CONSTRAINT IF EXISTS models_type_check;
+
+ALTER TABLE models
+  ADD CONSTRAINT models_type_check
+  CHECK (type IN ('chat', 'embedding', 'image', 'speech'));
diff --git a/internal/agent/tools/image_gen.go b/internal/agent/tools/image_gen.go
index 9e5593992..3259fc5e2 100644
--- a/internal/agent/tools/image_gen.go
+++ b/internal/agent/tools/image_gen.go
@@ -29,6 +29,11 @@ type ImageGenProvider struct {
 	dataMount  string
 }
 
+type generatedImageFile struct {
+	Data      string
+	MediaType string
+}
+
 func NewImageGenProvider(
 	log *slog.Logger,
 	settingsSvc *settings.Service,
@@ -65,6 +70,10 @@ func (p *ImageGenProvider) Tools(ctx context.Context, session SessionContext) ([
 	if strings.TrimSpace(botSettings.ImageModelID) == "" {
 		return nil, nil
 	}
+	modelResp, err := p.models.GetByID(ctx, botSettings.ImageModelID)
+	if err != nil || !supportsImageGeneration(modelResp) {
+		return nil, nil
+	}
 	sess := session
 	return []sdk.Tool{
 		{
@@ -112,7 +121,7 @@ func (p *ImageGenProvider) execGenerateImage(ctx context.Context, session Sessio
 	if err != nil {
 		return nil, fmt.Errorf("failed to load image model: %w", err)
 	}
-	if !modelResp.HasCompatibility(models.CompatImageOutput) {
+	if !supportsImageGeneration(modelResp) {
 		return nil, errors.New("configured model does not support image generation")
 	}
 
@@ -127,6 +136,79 @@ func (p *ImageGenProvider) execGenerateImage(ctx context.Context, session Sessio
 		return nil, fmt.Errorf("failed to resolve provider credentials: %w", err)
 	}
 
+	file, imgBytes, ext, err := generateImage(ctx, modelResp, provider, creds, prompt, size)
+	if err != nil {
+		return nil, err
+	}
+
+	containerPath := fmt.Sprintf("%s/%d.%s", imageGenDir, time.Now().UnixMilli(), ext)
+
+	client, clientErr := p.containers.MCPClient(ctx, botID)
+	if clientErr != nil {
+		return map[string]any{
+			"content": []map[string]any{
+				{"type": "text", "text": "Image generated (container not reachable, not saved to disk)"},
+				{"type": "image", "data": file.Data, "mimeType": file.MediaType},
+			},
+		}, nil
+	}
+
+	mkdirCmd := fmt.Sprintf("mkdir -p %s", imageGenDir)
+	_, _ = client.Exec(ctx, mkdirCmd, "/", 5)
+
+	if writeErr := client.WriteFile(ctx, containerPath, imgBytes); writeErr != nil {
+		return map[string]any{
+			"content": []map[string]any{
+				{"type": "text", "text": fmt.Sprintf("Image generated (failed to save: %s)", writeErr.Error())},
+				{"type": "image", "data": file.Data, "mimeType": file.MediaType},
+			},
+		}, nil
+	}
+
+	return map[string]any{
+		"path":       containerPath,
+		"media_type": file.MediaType,
+		"size_bytes": len(imgBytes),
+	}, nil
+}
+
+func supportsImageGeneration(model models.GetResponse) bool {
+	switch model.Type {
+	case models.ModelTypeChat:
+		return model.HasCompatibility(models.CompatImageOutput)
+	case models.ModelTypeImage:
+		return model.HasCompatibility(models.CompatGenerate)
+	default:
+		return false
+	}
+}
+
+func generateImage(
+	ctx context.Context,
+	modelResp models.GetResponse,
+	provider sqlc.Provider,
+	creds providers.ModelCredentials,
+	prompt string,
+	size string,
+) (generatedImageFile, []byte, string, error) {
+	switch modelResp.Type {
+	case models.ModelTypeChat:
+		return generateImageFromChatModel(ctx, modelResp, provider, creds, prompt, size)
+	case models.ModelTypeImage:
+		return generateImageFromImageModel(ctx, modelResp, provider, creds, prompt, size)
+	default:
+		return generatedImageFile{}, nil, "", fmt.Errorf("unsupported image model type: %s", modelResp.Type)
+	}
+}
+
+func generateImageFromChatModel(
+	ctx context.Context,
+	modelResp models.GetResponse,
+	provider sqlc.Provider,
+	creds providers.ModelCredentials,
+	prompt string,
+	size string,
+) (generatedImageFile, []byte, string, error) {
 	sdkModel := models.NewSDKChatModel(models.SDKModelConfig{
 		ModelID:    modelResp.ModelID,
 		ClientType: provider.ClientType,
@@ -142,20 +224,77 @@ func (p *ImageGenProvider) execGenerateImage(ctx context.Context, session Sessio
 		}),
 	)
 	if err != nil {
-		return nil, fmt.Errorf("image generation failed: %w", err)
+		return generatedImageFile{}, nil, "", fmt.Errorf("image generation failed: %w", err)
 	}
 
 	if len(result.Files) == 0 {
 		if result.Text != "" {
-			return map[string]any{"error": "no image generated", "model_response": result.Text}, nil
+			return generatedImageFile{}, nil, "", fmt.Errorf("no image generated: %s", result.Text)
 		}
-		return nil, errors.New("no image was generated by the model")
+		return generatedImageFile{}, nil, "", errors.New("no image was generated by the model")
+	}
+
+	file := generatedImageFile{
+		Data:      result.Files[0].Data,
+		MediaType: result.Files[0].MediaType,
 	}
+	imgBytes, ext, err := decodeGeneratedImage(file)
+	if err != nil {
+		return generatedImageFile{}, nil, "", err
+	}
+	return file, imgBytes, ext, nil
+}
 
-	file := result.Files[0]
+func generateImageFromImageModel(
+	ctx context.Context,
+	modelResp models.GetResponse,
+	provider sqlc.Provider,
+	creds providers.ModelCredentials,
+	prompt string,
+	size string,
+) (generatedImageFile, []byte, string, error) {
+	imageModel := models.NewSDKImageGenerationModel(models.SDKModelConfig{
+		ModelID:    modelResp.ModelID,
+		ClientType: provider.ClientType,
+		APIKey:     creds.APIKey,
+		BaseURL:    providers.ProviderConfigString(provider, "base_url"),
+	})
+	if imageModel == nil {
+		return generatedImageFile{}, nil, "", errors.New("configured provider does not support image generation API")
+	}
+
+	result, err := sdk.GenerateImage(ctx,
+		sdk.WithImageGenerationModel(imageModel),
+		sdk.WithImagePrompt(prompt),
+		sdk.WithImageSize(size),
+		sdk.WithImageResponseFormat("b64_json"),
+		sdk.WithImageOutputFormat("png"),
+	)
+	if err != nil {
+		return generatedImageFile{}, nil, "", fmt.Errorf("image generation failed: %w", err)
+	}
+	if len(result.Data) == 0 {
+		return generatedImageFile{}, nil, "", errors.New("no image was generated by the model")
+	}
+	if strings.TrimSpace(result.Data[0].B64JSON) == "" {
+		return generatedImageFile{}, nil, "", errors.New("image model did not return inline image data")
+	}
+
+	file := generatedImageFile{
+		Data:      result.Data[0].B64JSON,
+		MediaType: "image/png",
+	}
+	imgBytes, ext, err := decodeGeneratedImage(file)
+	if err != nil {
+		return generatedImageFile{}, nil, "", err
+	}
+	return file, imgBytes, ext, nil
+}
+
+func decodeGeneratedImage(file generatedImageFile) ([]byte, string, error) {
 	imgBytes, err := base64.StdEncoding.DecodeString(file.Data)
 	if err != nil {
-		return nil, fmt.Errorf("failed to decode generated image: %w", err)
+		return nil, "", fmt.Errorf("failed to decode generated image: %w", err)
 	}
 
 	ext := "png"
@@ -165,34 +304,5 @@ func (p *ImageGenProvider) execGenerateImage(ctx context.Context, session Sessio
 	case strings.Contains(file.MediaType, "webp"):
 		ext = "webp"
 	}
-
-	containerPath := fmt.Sprintf("%s/%d.%s", imageGenDir, time.Now().UnixMilli(), ext)
-
-	client, clientErr := p.containers.MCPClient(ctx, botID)
-	if clientErr != nil {
-		return map[string]any{
-			"content": []map[string]any{
-				{"type": "text", "text": "Image generated (container not reachable, not saved to disk)"},
-				{"type": "image", "data": file.Data, "mimeType": file.MediaType},
-			},
-		}, nil
-	}
-
-	mkdirCmd := fmt.Sprintf("mkdir -p %s", imageGenDir)
-	_, _ = client.Exec(ctx, mkdirCmd, "/", 5)
-
-	if writeErr := client.WriteFile(ctx, containerPath, imgBytes); writeErr != nil {
-		return map[string]any{
-			"content": []map[string]any{
-				{"type": "text", "text": fmt.Sprintf("Image generated (failed to save: %s)", writeErr.Error())},
-				{"type": "image", "data": file.Data, "mimeType": file.MediaType},
-			},
-		}, nil
-	}
-
-	return map[string]any{
-		"path":       containerPath,
-		"media_type": file.MediaType,
-		"size_bytes": len(imgBytes),
-	}, nil
+	return imgBytes, ext, nil
 }
diff --git a/internal/handlers/models.go b/internal/handlers/models.go
index 1ec42dce1..33b3d6c7b 100644
--- a/internal/handlers/models.go
+++ b/internal/handlers/models.go
@@ -70,7 +70,7 @@ func (h *ModelsHandler) Create(c echo.Context) error {
 // @Summary List all models
 // @Description Get a list of all configured models, optionally filtered by type or provider client type
 // @Tags models
-// @Param type query string false "Model type (chat, embedding)"
+// @Param type query string false "Model type (chat, embedding, image, speech)"
 // @Param client_type query string false "Provider client type (openai-responses, openai-completions, anthropic-messages, google-generative-ai)"
 // @Success 200 {array} models.GetResponse
 // @Failure 400 {object} ErrorResponse
diff --git a/internal/handlers/providers.go b/internal/handlers/providers.go
index aeb101cb9..a52e95259 100644
--- a/internal/handlers/providers.go
+++ b/internal/handlers/providers.go
@@ -332,12 +332,20 @@ func (h *ProvidersHandler) ImportModels(c echo.Context) error {
 
 	for _, m := range remoteModels {
 		modelType := models.ModelTypeChat
-		if strings.TrimSpace(m.Type) == string(models.ModelTypeEmbedding) {
+		switch strings.TrimSpace(m.Type) {
+		case string(models.ModelTypeEmbedding):
 			modelType = models.ModelTypeEmbedding
+		case string(models.ModelTypeImage):
+			modelType = models.ModelTypeImage
 		}
 		compatibilities := m.Compatibilities
 		if len(compatibilities) == 0 {
-			compatibilities = []string{models.CompatVision, models.CompatToolCall, models.CompatReasoning}
+			switch modelType {
+			case models.ModelTypeImage:
+				compatibilities = []string{models.CompatGenerate, models.CompatEdit}
+			case models.ModelTypeChat:
+				compatibilities = []string{models.CompatVision, models.CompatToolCall, models.CompatReasoning}
+			}
 		}
 		name := strings.TrimSpace(m.Name)
 		if name == "" {
diff --git a/internal/models/models.go b/internal/models/models.go
index 371842bf8..82605ab64 100644
--- a/internal/models/models.go
+++ b/internal/models/models.go
@@ -128,7 +128,7 @@ func (s *Service) List(ctx context.Context) ([]GetResponse, error) {
 
 // ListByType returns models filtered by type (chat, embedding, or speech).
 func (s *Service) ListByType(ctx context.Context, modelType ModelType) ([]GetResponse, error) {
-	if modelType != ModelTypeChat && modelType != ModelTypeEmbedding && modelType != ModelTypeSpeech {
+	if !IsValidModelType(modelType) {
 		return nil, fmt.Errorf("invalid model type: %s", modelType)
 	}
 
@@ -165,7 +165,7 @@ func (s *Service) ListEnabled(ctx context.Context) ([]GetResponse, error) {
 
 // ListEnabledByType returns models from enabled providers filtered by type.
 func (s *Service) ListEnabledByType(ctx context.Context, modelType ModelType) ([]GetResponse, error) {
-	if modelType != ModelTypeChat && modelType != ModelTypeEmbedding && modelType != ModelTypeSpeech {
+	if !IsValidModelType(modelType) {
 		return nil, fmt.Errorf("invalid model type: %s", modelType)
 	}
 	dbModels, err := s.queries.ListEnabledModelsByType(ctx, string(modelType))
@@ -206,7 +206,7 @@ func (s *Service) ListByProviderID(ctx context.Context, providerID string) ([]Ge
 
 // ListByProviderIDAndType returns models filtered by provider ID and type.
 func (s *Service) ListByProviderIDAndType(ctx context.Context, providerID string, modelType ModelType) ([]GetResponse, error) {
-	if modelType != ModelTypeChat && modelType != ModelTypeEmbedding && modelType != ModelTypeSpeech {
+	if !IsValidModelType(modelType) {
 		return nil, fmt.Errorf("invalid model type: %s", modelType)
 	}
 	if strings.TrimSpace(providerID) == "" {
@@ -361,7 +361,7 @@ func (s *Service) Count(ctx context.Context) (int64, error) {
 
 // CountByType returns the number of models of a specific type.
 func (s *Service) CountByType(ctx context.Context, modelType ModelType) (int64, error) {
-	if modelType != ModelTypeChat && modelType != ModelTypeEmbedding && modelType != ModelTypeSpeech {
+	if !IsValidModelType(modelType) {
 		return 0, fmt.Errorf("invalid model type: %s", modelType)
 	}
 
diff --git a/internal/models/models_test.go b/internal/models/models_test.go
index aa0d4cadf..e1b508e29 100644
--- a/internal/models/models_test.go
+++ b/internal/models/models_test.go
@@ -50,6 +50,19 @@ func TestModel_Validate(t *testing.T) {
 			},
 			wantErr: false,
 		},
+		{
+			name: "valid image model",
+			model: models.Model{
+				ModelID:    "gpt-image-1",
+				Name:       "GPT Image 1",
+				ProviderID: "11111111-1111-1111-1111-111111111111",
+				Type:       models.ModelTypeImage,
+				Config: models.ModelConfig{
+					Compatibilities: []string{models.CompatGenerate, models.CompatEdit},
+				},
+			},
+			wantErr: false,
+		},
 		{
 			name: "missing model_id",
 			model: models.Model{
@@ -129,12 +142,14 @@ func TestModel_HasCompatibility(t *testing.T) {
 	assert.True(t, m.HasCompatibility("tool-call"))
 	assert.True(t, m.HasCompatibility("reasoning"))
 	assert.False(t, m.HasCompatibility("image-output"))
+	assert.False(t, m.HasCompatibility("generate"))
 }
 
 func TestModelTypes(t *testing.T) {
 	t.Run("ModelType constants", func(t *testing.T) {
 		assert.Equal(t, models.ModelTypeChat, models.ModelType("chat"))
 		assert.Equal(t, models.ModelTypeEmbedding, models.ModelType("embedding"))
+		assert.Equal(t, models.ModelTypeImage, models.ModelType("image"))
 	})
 
 	t.Run("ClientType constants", func(t *testing.T) {
diff --git a/internal/models/sdk.go b/internal/models/sdk.go
index 4c8a52f63..9252623c5 100644
--- a/internal/models/sdk.go
+++ b/internal/models/sdk.go
@@ -8,6 +8,7 @@ import (
 	googlegenerative "github.com/memohai/twilight-ai/provider/google/generativeai"
 	openaicodex "github.com/memohai/twilight-ai/provider/openai/codex"
 	openaicompletions "github.com/memohai/twilight-ai/provider/openai/completions"
+	openaiimages "github.com/memohai/twilight-ai/provider/openai/images"
 	openairesponses "github.com/memohai/twilight-ai/provider/openai/responses"
 	sdk "github.com/memohai/twilight-ai/sdk"
 
@@ -121,6 +122,40 @@ func NewSDKChatModel(cfg SDKModelConfig) *sdk.Model {
 	}
 }
 
+func NewSDKImageGenerationModel(cfg SDKModelConfig) *sdk.ImageGenerationModel {
+	opts := imageProviderOptions(cfg)
+	if opts == nil {
+		return nil
+	}
+	return openaiimages.New(opts...).GenerationModel(cfg.ModelID)
+}
+
+func NewSDKImageEditModel(cfg SDKModelConfig) *sdk.ImageEditModel {
+	opts := imageProviderOptions(cfg)
+	if opts == nil {
+		return nil
+	}
+	return openaiimages.New(opts...).EditModel(cfg.ModelID)
+}
+
+func imageProviderOptions(cfg SDKModelConfig) []openaiimages.Option {
+	switch ClientType(cfg.ClientType) {
+	case ClientTypeOpenAICompletions, ClientTypeOpenAIResponses:
+		opts := []openaiimages.Option{
+			openaiimages.WithAPIKey(cfg.APIKey),
+		}
+		if cfg.HTTPClient != nil {
+			opts = append(opts, openaiimages.WithHTTPClient(cfg.HTTPClient))
+		}
+		if cfg.BaseURL != "" {
+			opts = append(opts, openaiimages.WithBaseURL(cfg.BaseURL))
+		}
+		return opts
+	default:
+		return nil
+	}
+}
+
 // BuildReasoningOptions returns SDK generation options for reasoning/thinking.
 func BuildReasoningOptions(cfg SDKModelConfig) []sdk.GenerateOption {
 	if cfg.ReasoningConfig == nil || !cfg.ReasoningConfig.Enabled {
diff --git a/internal/models/types.go b/internal/models/types.go
index 18fb6eac5..f3189966c 100644
--- a/internal/models/types.go
+++ b/internal/models/types.go
@@ -11,6 +11,7 @@ type ModelType string
 const (
 	ModelTypeChat      ModelType = "chat"
 	ModelTypeEmbedding ModelType = "embedding"
+	ModelTypeImage     ModelType = "image"
 	ModelTypeSpeech    ModelType = "speech"
 )
 
@@ -30,6 +31,8 @@ const (
 	CompatVision      = "vision"
 	CompatToolCall    = "tool-call"
 	CompatImageOutput = "image-output"
+	CompatGenerate    = "generate"
+	CompatEdit        = "edit"
 	CompatReasoning   = "reasoning"
 )
 
@@ -43,7 +46,12 @@ const (
 
 // validCompatibilities enumerates accepted compatibility tokens.
 var validCompatibilities = map[string]struct{}{
-	CompatVision: {}, CompatToolCall: {}, CompatImageOutput: {}, CompatReasoning: {},
+	CompatVision:      {},
+	CompatToolCall:    {},
+	CompatImageOutput: {},
+	CompatGenerate:    {},
+	CompatEdit:        {},
+	CompatReasoning:   {},
 }
 
 var validReasoningEfforts = map[string]struct{}{
@@ -70,6 +78,15 @@ type Model struct {
 	Config     ModelConfig `json:"config"`
 }
 
+func IsValidModelType(modelType ModelType) bool {
+	switch modelType {
+	case ModelTypeChat, ModelTypeEmbedding, ModelTypeImage, ModelTypeSpeech:
+		return true
+	default:
+		return false
+	}
+}
+
 func (m *Model) Validate() error {
 	if m.ModelID == "" {
 		return errors.New("model ID is required")
@@ -80,7 +97,7 @@ func (m *Model) Validate() error {
 	if _, err := uuid.Parse(m.ProviderID); err != nil {
 		return errors.New("provider ID must be a valid UUID")
 	}
-	if m.Type != ModelTypeChat && m.Type != ModelTypeEmbedding && m.Type != ModelTypeSpeech {
+	if !IsValidModelType(m.Type) {
 		return errors.New("invalid model type")
 	}
 	if m.Type == ModelTypeEmbedding {
diff --git a/packages/sdk/src/types.gen.ts b/packages/sdk/src/types.gen.ts
index cb480490b..3365eb410 100644
--- a/packages/sdk/src/types.gen.ts
+++ b/packages/sdk/src/types.gen.ts
@@ -1354,7 +1354,7 @@ export type ModelsModelConfig = {
     reasoning_efforts?: Array<string>;
 };
 
-export type ModelsModelType = 'chat' | 'embedding' | 'speech';
+export type ModelsModelType = 'chat' | 'embedding' | 'image' | 'speech';
 
 export type ModelsTestResponse = {
     latency_ms?: number;
@@ -7084,7 +7084,7 @@ export type GetModelsData = {
     path?: never;
     query?: {
         /**
-         * Model type (chat, embedding)
+         * Model type (chat, embedding, image, speech)
          */
         type?: string;
         /**
diff --git a/spec/docs.go b/spec/docs.go
index 5f85f9e4e..b89e85bcb 100644
--- a/spec/docs.go
+++ b/spec/docs.go
@@ -6572,7 +6572,7 @@ const docTemplate = `{
                 "parameters": [
                     {
                         "type": "string",
-                        "description": "Model type (chat, embedding)",
+                        "description": "Model type (chat, embedding, image, speech)",
                         "name": "type",
                         "in": "query"
                     },
@@ -12188,11 +12188,13 @@ const docTemplate = `{
             "enum": [
                 "chat",
                 "embedding",
+                "image",
                 "speech"
             ],
             "x-enum-varnames": [
                 "ModelTypeChat",
                 "ModelTypeEmbedding",
+                "ModelTypeImage",
                 "ModelTypeSpeech"
             ]
         },
diff --git a/spec/swagger.json b/spec/swagger.json
index ad64ebe52..a6ad095a1 100644
--- a/spec/swagger.json
+++ b/spec/swagger.json
@@ -6563,7 +6563,7 @@
                 "parameters": [
                     {
                         "type": "string",
-                        "description": "Model type (chat, embedding)",
+                        "description": "Model type (chat, embedding, image, speech)",
                         "name": "type",
                         "in": "query"
                     },
@@ -12179,11 +12179,13 @@
             "enum": [
                 "chat",
                 "embedding",
+                "image",
                 "speech"
             ],
             "x-enum-varnames": [
                 "ModelTypeChat",
                 "ModelTypeEmbedding",
+                "ModelTypeImage",
                 "ModelTypeSpeech"
             ]
         },
diff --git a/spec/swagger.yaml b/spec/swagger.yaml
index 1ec7503bc..25c2d9b59 100644
--- a/spec/swagger.yaml
+++ b/spec/swagger.yaml
@@ -2261,11 +2261,13 @@ definitions:
     enum:
     - chat
     - embedding
+    - image
     - speech
     type: string
     x-enum-varnames:
     - ModelTypeChat
     - ModelTypeEmbedding
+    - ModelTypeImage
     - ModelTypeSpeech
   models.TestResponse:
     properties:
@@ -7231,7 +7233,7 @@ paths:
       description: Get a list of all configured models, optionally filtered by type
         or provider client type
       parameters:
-      - description: Model type (chat, embedding)
+      - description: Model type (chat, embedding, image, speech)
         in: query
         name: type
         type: string