feat(ui): redesign image generator floating composer and settings panel

Compact the floating composer with an auto-resizing prompt editor and a
scrollable settings popover, add a titled settings panel, and show the
resolved image size in the settings summary. Add the imageCountLabel
string for the count section.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

frontend/src/i18n/locales/en-US.json

@@ -242,6 +242,7 @@
   "referenceImage": "Reference",
   "imageSettings": "Image settings",
   "imageCountUnit": "{count} img",
+  "imageCountLabel": "Image",
   "quality": "Quality",
   "qualityAuto": "Auto",
   "qualityHigh": "High",

frontend/src/i18n/locales/zh-CN.json

@@ -242,6 +242,7 @@
   "referenceImage": "参考图",
   "imageSettings": "图片参数",
   "imageCountUnit": "{count} 张",
+  "imageCountLabel": "生成数量",
   "quality": "质量",
   "qualityAuto": "自动",
   "qualityHigh": "高",

frontend/src/ui/components/ArtboardPreview/index.css

@@ -104,43 +104,75 @@
 }
 
 .image-generator-preview {
+  --image-generator-viewport-scale: 1;
   position: relative;
   width: 100%;
   height: 100%;
   overflow: visible;
 }
 
-.image-generator-label {
+.image-generator-meta {
   position: absolute;
   left: 0;
-  top: -28px;
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
+  right: 0;
+  top: calc(-30px / var(--image-generator-viewport-scale));
+  z-index: 2;
+  height: calc(24px / var(--image-generator-viewport-scale));
   color: #2f80ff;
-  font-size: 15px;
+  font-size: calc(16px / var(--image-generator-viewport-scale));
   font-weight: 500;
-  line-height: 22px;
+  line-height: calc(24px / var(--image-generator-viewport-scale));
+  letter-spacing: 0;
+  pointer-events: none;
   white-space: nowrap;
 }
 
+.image-generator-label {
+  position: absolute;
+  left: 0;
+  top: 0;
+  display: inline-flex;
+  align-items: center;
+  gap: calc(6px / var(--image-generator-viewport-scale));
+  max-width: calc(100% - (126px / var(--image-generator-viewport-scale)));
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .image-generator-label svg {
-  width: 15px;
-  height: 15px;
+  width: calc(17px / var(--image-generator-viewport-scale));
+  height: calc(17px / var(--image-generator-viewport-scale));
+  flex: 0 0 auto;
   fill: #2f80ff;
   stroke: #2f80ff;
 }
 
+.image-generator-label span {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.image-generator-size-label {
+  position: absolute;
+  top: 0;
+  right: 0;
+  text-align: right;
+}
+
 .image-generator-frame {
+  box-sizing: border-box;
   width: 100%;
   height: 100%;
   display: grid;
   place-items: center;
-  border: 2px solid #2f80ff;
+  border: calc(2px / var(--image-generator-viewport-scale)) solid #2f80ff;
   background: #eeeeed;
 }
 
 .image-generator-frame svg {
+  width: calc(34px / var(--image-generator-viewport-scale));
+  height: calc(34px / var(--image-generator-viewport-scale));
   color: #cfd0d2;
   fill: #cfd0d2;
   stroke: #cfd0d2;

frontend/src/ui/components/ArtboardPreview/index.tsx

@@ -10,9 +10,10 @@ import { imageAdjustmentImageStyle, imageAdjustmentLayerStyle, isDefaultImageAdj
 import { canvasImageUrl } from "@/ui/lib/imageDelivery";
 import { isImageUrl } from "@/ui/pages/CanvasWorkspace/canvas/canvasNodeOps";
 import { framePreviewStyle } from "@/ui/pages/CanvasWorkspace/canvas/frameStyle";
+import { imageGeneratorTargetSizeFromNode, type ImageGeneratorTargetSize } from "@/ui/pages/CanvasWorkspace/canvas/imageGeneratorSizing";
 import "./index.css";
 
-export function ArtboardPreview({ node, viewportScale = 1 }: { node: CanvasNode; viewportScale?: number }) {
+export function ArtboardPreview({ node, viewportScale = 1, imageGeneratorTargetSize }: { node: CanvasNode; viewportScale?: number; imageGeneratorTargetSize?: ImageGeneratorTargetSize }) {
   const { t } = useI18n();
   const overlayUiStyle = workOverlayUiStyle(viewportScale, node);
 
@@ -57,7 +58,7 @@ export function ArtboardPreview({ node, viewportScale = 1 }: { node: CanvasNode;
   }
 
   if (node.type === "image" && node.layerRole === "image-generator") {
-    return <ImageGeneratorPreview node={node} />;
+    return <ImageGeneratorPreview node={node} viewportScale={viewportScale} targetSize={imageGeneratorTargetSize} />;
   }
 
   if (node.type === "frame" && node.layerRole === "manual-frame") {
@@ -110,21 +111,31 @@ function clampNumber(value: number, min: number, max: number) {
   return Math.min(Math.max(value, min), max);
 }
 
+function imageGeneratorUiStyle(viewportScale: number) {
+  return {
+    "--image-generator-viewport-scale": String(Math.max(viewportScale, 0.01))
+  } as CSSProperties;
+}
+
 function artboardKind(node: CanvasNode) {
   if (node.height > node.width * 1.24) return "tall";
   if (node.width > node.height * 1.35) return "wide";
   return "square";
 }
 
-function ImageGeneratorPreview({ node }: { node: CanvasNode }) {
+function ImageGeneratorPreview({ node, viewportScale, targetSize }: { node: CanvasNode; viewportScale: number; targetSize?: ImageGeneratorTargetSize }) {
+  const size = targetSize ?? imageGeneratorTargetSizeFromNode(node);
   return (
-    <div className="image-generator-preview">
-      <div className="image-generator-label">
-        <ImageIcon size={14} />
-        <span>{node.title}</span>
+    <div className="image-generator-preview" style={imageGeneratorUiStyle(viewportScale)}>
+      <div className="image-generator-meta">
+        <div className="image-generator-label">
+          <ImageIcon aria-hidden="true" />
+          <span>{node.title}</span>
+        </div>
+        <div className="image-generator-size-label">{size.width} × {size.height}</div>
       </div>
       <div className="image-generator-frame">
-        <ImageIcon size={34} />
+        <ImageIcon aria-hidden="true" />
       </div>
     </div>
   );

frontend/src/ui/components/CanvasAgentComposer/index.css

@@ -413,6 +413,14 @@
   gap: 20px;
 }
 
+.composer-settings-panel h3 {
+  margin: 0;
+  color: #242a34;
+  font-size: 15px;
+  font-weight: 700;
+  line-height: 22px;
+}
+
 .composer-settings-panel section {
   display: grid;
   gap: 12px;

frontend/src/ui/components/CanvasAgentComposer/index.tsx

@@ -107,7 +107,8 @@ export function composerImageSize(settings: ComposerImageSettings) {
 
 export function composerSettingsSummary(settings: ComposerImageSettings) {
   const ratioLabel = composerRatioOptions.find((option) => option.id === settings.ratio)?.label ?? settings.ratio;
-  return `${qualityLabel(settings.quality)} · ${ratioLabel} · ${settings.count} img`;
+  const sizeLabel = settings.ratio === "auto" ? composerImageSize(settings).replace("x", "×") : ratioLabel;
+  return `${qualityLabel(settings.quality)} · ${sizeLabel} · ${settings.count} img`;
 }
 
 function qualityLabel(quality: ComposerImageQuality) {
@@ -348,16 +349,19 @@ export const CanvasAgentComposer = forwardRef<PromptComposerHandle, CanvasAgentC
 export function ComposerSettingsPanel({
   settings,
   onPatch,
-  onSelectRatio
+  onSelectRatio,
+  title
 }: {
   settings: ComposerImageSettings;
   onPatch: (patch: Partial<ComposerImageSettings>) => void;
   onSelectRatio: (ratio: ComposerImageRatio) => void;
+  title?: string;
 }) {
   const { t } = useI18n();
 
   return (
     <div className="composer-settings-panel">
+      {title && <h3>{title}</h3>}
       <section>
         <h4>{t("quality")}</h4>
         <div className="composer-quality-control">
@@ -391,7 +395,7 @@ export function ComposerSettingsPanel({
         </div>
       </section>
       <section>
-        <h4>Image</h4>
+        <h4>{t("imageCountLabel")}</h4>
         <div className="composer-count-grid">
           {Array.from({ length: 10 }, (_, index) => index + 1).map((count) => (
             <button key={count} type="button" className={settings.count === count ? "selected" : ""} onClick={() => onPatch({ count })}>

frontend/src/ui/components/ImageGeneratorFloatingComposer/index.css

@@ -1,36 +1,47 @@
 .image-generator-floating-composer {
   position: absolute;
   z-index: 36;
-  min-height: 188px;
-  border: 1px solid #cbd2dc;
-  border-radius: 28px;
+  min-height: 150px;
+  overflow: hidden;
+  border: 0.5px solid #d7d9de;
+  border-radius: 24px;
   background: rgba(255, 255, 255, 0.98);
-  box-shadow: 0 18px 45px rgba(17, 24, 39, 0.14);
+  box-shadow: 0 18px 45px rgba(17, 24, 39, 0.13);
+  backdrop-filter: blur(18px);
   pointer-events: auto;
 }
 
 .image-generator-reference-row {
   display: flex;
   align-items: flex-start;
-  gap: 10px;
-  min-height: 72px;
-  margin: 14px 16px 0;
+  padding: 6px;
+  gap: 8px;
+  min-height: 68px;
+  margin: 8px 8px 0;
+  overflow-x: auto;
+  scrollbar-width: none;
+}
+
+.image-generator-reference-row::-webkit-scrollbar {
+  display: none;
 }
 
 .image-generator-reference-tile,
 .image-generator-reference-preview {
-  width: 72px;
-  height: 72px;
-  border-radius: 20px;
+  width: 56px;
+  height: 68px;
+  border-radius: 16px;
 }
 
 .image-generator-reference-tile {
   display: grid;
   place-items: center;
-  gap: 6px;
-  color: #a6abb5;
+  gap: 5px;
+  flex: 0 0 auto;
+  color: rgba(20, 20, 20, 0.46);
   background: #f4f4f4;
-  font-size: 12px;
+  font-size: 11px;
+  line-height: 1.2;
 }
 
 .image-generator-reference-tile span {
@@ -48,7 +59,7 @@
   display: block;
   width: 100%;
   height: 100%;
-  border-radius: 20px;
+  border-radius: 16px;
   object-fit: cover;
   user-select: none;
   -webkit-user-drag: none;
@@ -77,23 +88,26 @@
   display: block;
   box-sizing: border-box;
   width: 100%;
-  min-height: 92px;
-  margin: 10px 0 0;
-  padding: 0 32px;
+  height: auto;
+  min-height: 44px;
+  max-height: 176px;
+  margin: 2px 0 0;
+  padding: 1px 16px 0;
   border: 0;
   outline: 0;
   resize: none;
-  color: #1f2937;
+  overflow-y: hidden;
+  color: rgba(0, 0, 0, 0.9);
   background: transparent;
   caret-color: #111827;
   font-family: inherit;
-  font-size: 18px;
-  font-weight: 520;
-  line-height: 26px;
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 25px;
 }
 
 .image-generator-prompt-editor::placeholder {
-  color: #a6acb6;
+  color: rgba(0, 0, 0, 0.3);
   opacity: 1;
 }
 
@@ -111,8 +125,8 @@
 .image-generator-composer-toolbar {
   display: flex;
   align-items: center;
-  gap: 9px;
-  padding: 8px 14px 13px 28px;
+  gap: 4px;
+  padding: 4px 8px 8px;
 }
 
 .image-generator-settings-chip,
@@ -121,17 +135,21 @@
   height: 36px;
   display: inline-flex;
   align-items: center;
-  gap: 8px;
+  gap: 6px;
   flex: 0 0 auto;
   border-radius: 999px;
   color: #222831;
   background: #fff;
-  font-size: 15px;
-  font-weight: 560;
+  font-size: 13px;
+  font-weight: 500;
 }
 
 .image-generator-settings-chip {
-  padding: 0 8px;
+  height: 32px;
+  max-width: 220px;
+  padding: 0 8px 0 10px;
+  overflow: hidden;
+  white-space: nowrap;
 }
 
 .image-generator-settings-chip:hover,
@@ -150,11 +168,13 @@
 
 .image-generator-composer-spacer {
   flex: 1;
+  min-width: 6px;
 }
 
 .image-generator-model-button {
-  max-width: 162px;
-  padding: 0 10px;
+  height: 32px;
+  max-width: 140px;
+  padding: 0 6px 0 8px;
   overflow: hidden;
   white-space: nowrap;
 }
@@ -166,9 +186,10 @@
 }
 
 .image-generator-send-button {
-  min-width: 58px;
+  height: 32px;
+  min-width: 56px;
   justify-content: center;
-  padding: 0 18px;
+  padding: 0 12px;
   color: #fff;
   background: #222;
   font-weight: 760;
@@ -179,3 +200,144 @@
   background: #efefef;
   opacity: 1;
 }
+
+.composer-settings-popover.image-generator-settings-popover-panel {
+  width: min(312px, calc(100vw - 24px));
+  max-height: min(480px, calc(100vh - 40px));
+  overflow: auto;
+  padding: 0;
+  border: 0.5px solid #d9dce2;
+  border-radius: 16px;
+  box-shadow: 0 14px 36px rgba(17, 24, 39, 0.14);
+  scrollbar-width: thin;
+  scrollbar-color: rgba(16, 24, 40, 0.28) transparent;
+}
+
+.image-generator-settings-popover-panel::-webkit-scrollbar {
+  width: 10px;
+}
+
+.image-generator-settings-popover-panel::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+.image-generator-settings-popover-panel::-webkit-scrollbar-thumb {
+  min-height: 42px;
+  border: 3px solid transparent;
+  border-radius: 999px;
+  background: rgba(16, 24, 40, 0.28);
+  background-clip: content-box;
+}
+
+.image-generator-settings-popover-panel::-webkit-scrollbar-thumb:hover {
+  background: rgba(16, 24, 40, 0.38);
+  background-clip: content-box;
+}
+
+.image-generator-settings-popover-panel .composer-settings-panel {
+  gap: 16px;
+  padding: 14px 16px 16px;
+}
+
+.image-generator-settings-popover-panel .composer-settings-panel h3 {
+  font-size: 14px;
+  font-weight: 700;
+  line-height: 22px;
+}
+
+.image-generator-settings-popover-panel .composer-settings-panel section {
+  gap: 8px;
+}
+
+.image-generator-settings-popover-panel .composer-settings-panel h4 {
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 20px;
+}
+
+.image-generator-settings-popover-panel .composer-quality-control {
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 8px;
+  overflow: visible;
+  border-radius: 0;
+  background: transparent;
+}
+
+.image-generator-settings-popover-panel .composer-quality-control button,
+.image-generator-settings-popover-panel .composer-count-grid button {
+  height: 32px;
+  border: 1px solid #d8dbe1;
+  border-radius: 999px;
+  background: #fff;
+  color: #262b34;
+  font-size: 13px;
+  line-height: 20px;
+}
+
+.image-generator-settings-popover-panel .composer-quality-control button.selected {
+  border-color: #2d3036;
+  background: #fff;
+}
+
+.image-generator-settings-popover-panel .composer-dimensions {
+  gap: 8px;
+}
+
+.image-generator-settings-popover-panel .composer-dimensions label {
+  height: 32px;
+  gap: 6px;
+  padding: 0 8px;
+  border-radius: 8px;
+  background: #f3f3f3;
+}
+
+.image-generator-settings-popover-panel .composer-dimensions input {
+  font-size: 13px;
+  line-height: 20px;
+}
+
+.image-generator-settings-popover-panel .composer-dimensions i {
+  width: 32px;
+  color: #7c828c;
+  text-align: center;
+}
+
+.image-generator-settings-popover-panel .composer-ratio-grid,
+.image-generator-settings-popover-panel .composer-count-grid {
+  gap: 8px;
+}
+
+.image-generator-settings-popover-panel .composer-ratio-grid button {
+  aspect-ratio: auto;
+  height: 72px;
+  gap: 6px;
+  padding: 8px;
+  border-radius: 12px;
+  color: #262b34;
+  font-size: 12px;
+  line-height: 1;
+}
+
+.image-generator-settings-popover-panel .composer-ratio-grid button.selected,
+.image-generator-settings-popover-panel .composer-count-grid button.selected {
+  border-color: #d3d6dd;
+  background: #eeeeee;
+}
+
+.image-generator-settings-popover-panel .ratio-glyph {
+  width: 20px;
+  height: 20px;
+  border-width: 2px;
+  border-color: #525862;
+  border-radius: 4px;
+}
+
+.image-generator-settings-popover-panel .ratio-glyph.wide {
+  width: 24px;
+  height: 16px;
+}
+
+.image-generator-settings-popover-panel .ratio-glyph.portrait {
+  width: 16px;
+  height: 24px;
+}

frontend/src/ui/components/ImageGeneratorFloatingComposer/index.tsx

@@ -9,6 +9,7 @@ import type { AgentContent } from "@/domain/design";
 import { useI18n } from "@/i18n/i18n";
 import {
   ComposerSettingsPanel,
+  composerImageSize,
   composerRatioOptions,
   type CanvasComposerModel,
   type ComposerImageRatio,
@@ -34,12 +35,12 @@ type ImageGeneratorFloatingComposerProps = {
   onSubmit: (contents: AgentContent[], reset: () => void) => void;
 };
 
-const horizontalInset = 36;
-const preferredWidth = 860;
-const minimumWidth = 520;
+const horizontalInset = 24;
+const preferredWidth = 536;
+const minimumWidth = 320;
 const verticalInset = 18;
-const estimatedComposerHeight = 210;
-const composerGap = 18;
+const estimatedComposerHeight = 150;
+const composerGap = 16;
 
 function clamp(value: number, min: number, max: number) {
   return Math.min(Math.max(value, min), max);
@@ -85,8 +86,9 @@ function composerStyle(bounds: NodeScreenBounds, stageWidth: number, stageHeight
 
 function imageSettingsSummary(settings: ComposerImageSettings, t: (key: string) => string) {
   const ratioLabel = composerRatioOptions.find((option) => option.id === settings.ratio)?.label ?? settings.ratio;
+  const sizeLabel = settings.ratio === "auto" ? composerImageSize(settings).replace("x", "×") : ratioLabel;
   const countLabel = t("imageCountUnit").replace("{count}", String(settings.count));
-  return `${t(`quality${settings.quality[0].toUpperCase()}${settings.quality.slice(1)}`)} · ${ratioLabel} · ${countLabel}`;
+  return `${t(`quality${settings.quality[0].toUpperCase()}${settings.quality.slice(1)}`)} · ${sizeLabel} · ${countLabel}`;
 }
 
 export function ImageGeneratorFloatingComposer({
@@ -106,6 +108,7 @@ export function ImageGeneratorFloatingComposer({
 }: ImageGeneratorFloatingComposerProps) {
   const { t } = useI18n();
   const rootRef = useRef<HTMLDivElement | null>(null);
+  const promptEditorRef = useRef<HTMLTextAreaElement | null>(null);
   const fileInputRef = useRef<HTMLInputElement | null>(null);
   const [text, setText] = useState("");
   const [references, setReferences] = useState<UploadedReferenceImage[]>([]);
@@ -126,6 +129,18 @@ export function ImageGeneratorFloatingComposer({
     return () => observer.disconnect();
   }, []);
 
+  useLayoutEffect(() => {
+    const editor = promptEditorRef.current;
+    if (!editor) return;
+    const style = window.getComputedStyle(editor);
+    const minHeight = Number.parseFloat(style.minHeight) || 44;
+    const maxHeight = Number.parseFloat(style.maxHeight) || 176;
+    editor.style.height = "auto";
+    const nextHeight = Math.min(Math.max(editor.scrollHeight, minHeight), maxHeight);
+    editor.style.height = `${nextHeight}px`;
+    editor.style.overflowY = editor.scrollHeight > maxHeight ? "auto" : "hidden";
+  }, [promptValue]);
+
   const patchSettings = (patch: Partial<ComposerImageSettings>) => {
     onSettingsChange({ ...settings, ...patch });
   };
@@ -209,6 +224,7 @@ export function ImageGeneratorFloatingComposer({
         </button>
       </div>
       <textarea
+        ref={promptEditorRef}
         value={promptValue}
         placeholder={t("canvasPromptPlaceholder")}
         aria-label={t("canvasPromptPlaceholder")}
@@ -225,8 +241,8 @@ export function ImageGeneratorFloatingComposer({
               {settingsOpen ? <ChevronUp size={14} /> : <ChevronDown size={14} />}
             </button>
           </PopoverTrigger>
-          <PopoverContent className="composer-settings-popover" align="start" sideOffset={12}>
-            <ComposerSettingsPanel settings={settings} onPatch={patchSettings} onSelectRatio={selectRatio} />
+          <PopoverContent className="composer-settings-popover image-generator-settings-popover-panel" align="start" sideOffset={12}>
+            <ComposerSettingsPanel settings={settings} onPatch={patchSettings} onSelectRatio={selectRatio} title={t("imageSettings")} />
           </PopoverContent>
         </Popover>
 

frontend/src/ui/pages/CanvasWorkspace/canvas/CanvasSelectionFrame/index.tsx

@@ -27,7 +27,7 @@ export function CanvasSelectionFrame({
   title: string;
   size: string;
   Icon: ComponentType<{ size?: number }>;
-  variant?: "frame" | "pen" | "text" | "shape" | "line-shape";
+  variant?: "frame" | "image-generator" | "pen" | "text" | "shape" | "line-shape";
   selectionScale: number;
   transform: NodeTransform;
   onResizePointerDown: (event: ReactPointerEvent<HTMLButtonElement>, handle: ResizeHandle) => void;
@@ -41,7 +41,10 @@ export function CanvasSelectionFrame({
   }
 
   return (
-    <div className={`moteva-selection-frame ${variant === "frame" ? "frame-selection-frame" : ""} ${variant === "pen" ? "pen-stroke-selection-frame" : ""} ${variant === "shape" ? "shape-selection-frame" : ""}`} style={{ "--selection-scale": selectionScale } as CSSProperties}>
+    <div
+      className={`moteva-selection-frame ${variant === "frame" ? "frame-selection-frame" : ""} ${variant === "image-generator" ? "image-generator-selection-frame" : ""} ${variant === "pen" ? "pen-stroke-selection-frame" : ""} ${variant === "shape" ? "shape-selection-frame" : ""}`}
+      style={{ "--selection-scale": selectionScale } as CSSProperties}
+    >
       <div className="moteva-selection-meta">
         <span className="moteva-selection-title-wrap">
           <Icon size={17} />

frontend/src/ui/pages/CanvasWorkspace/canvas/hooks/useGenerationStream.ts

@@ -34,10 +34,10 @@ export function useGenerationStream({
   const toUserMessageText = useUserMessage();
   const closeAgentEventsRef = useRef<(() => void) | null>(null);
   const closeAgentProjectPollRef = useRef<(() => void) | null>(null);
-  const closeImageGeneratorEventsRef = useRef<(() => void) | null>(null);
+  const closeImageGeneratorEventsRef = useRef<Map<string, () => void>>(new Map());
   const closeCanvasActionEventsRef = useRef<Map<string, () => void>>(new Map());
   const agentStreamingProjectIdRef = useRef<string | null>(null);
-  const imageGeneratorStreamingProjectIdRef = useRef<string | null>(null);
+  const imageGeneratorStreamingProjectIdRef = useRef<Set<string>>(new Set());
   const canvasActionStreamingProjectIdRef = useRef<Set<string>>(new Set());
 
   const completeCanvasActionStream = useCallback(
@@ -49,10 +49,19 @@ export function useGenerationStream({
     [setCanvasActionGenerating]
   );
 
+  const completeImageGeneratorStream = useCallback(
+    (streamKey: string) => {
+      closeImageGeneratorEventsRef.current.delete(streamKey);
+      imageGeneratorStreamingProjectIdRef.current.delete(streamKey);
+      setImageGeneratorGenerating(closeImageGeneratorEventsRef.current.size > 0);
+    },
+    [setImageGeneratorGenerating]
+  );
+
   const completeChannel = useCallback(
     (channel: GenerationChannel) => {
       if (channel === "image-generator") {
-        setImageGeneratorGenerating(false);
+        setImageGeneratorGenerating(closeImageGeneratorEventsRef.current.size > 0);
         return;
       }
       setAgentGenerating(false);
@@ -66,12 +75,12 @@ export function useGenerationStream({
       if (!threadId) return;
 
       if (channel === "canvas-action") {
-        if (closeCanvasActionEventsRef.current.has(streamKey)) return;
+        closeCanvasActionEventsRef.current.get(streamKey)?.();
         setCanvasActionGenerating(true);
         canvasActionStreamingProjectIdRef.current.add(streamKey);
       } else {
-        closeImageGeneratorEventsRef.current?.();
-        imageGeneratorStreamingProjectIdRef.current = streamKey;
+        closeImageGeneratorEventsRef.current.get(streamKey)?.();
+        imageGeneratorStreamingProjectIdRef.current.add(streamKey);
         setImageGeneratorGenerating(true);
       }
 
@@ -90,9 +99,7 @@ export function useGenerationStream({
           completeCanvasActionStream(streamKey);
           return;
         }
-        completeChannel(channel);
-        imageGeneratorStreamingProjectIdRef.current = null;
-        closeImageGeneratorEventsRef.current = null;
+        completeImageGeneratorStream(streamKey);
       };
       const poll = () => {
         void (async () => {
@@ -128,11 +135,11 @@ export function useGenerationStream({
       if (channel === "canvas-action") {
         closeCanvasActionEventsRef.current.set(streamKey, close);
       } else {
-        closeImageGeneratorEventsRef.current = close;
+        closeImageGeneratorEventsRef.current.set(streamKey, close);
       }
       poll();
     },
-    [applyProject, completeCanvasActionStream, completeChannel, toUserMessageText, messages.generateError, setCanvasActionGenerating, setError, setImageGeneratorGenerating]
+    [applyProject, completeCanvasActionStream, completeImageGeneratorStream, toUserMessageText, messages.generateError, setCanvasActionGenerating, setError, setImageGeneratorGenerating]
   );
 
   const startAgentProjectPolling = useCallback(
@@ -253,14 +260,24 @@ export function useGenerationStream({
     (nextProjectId: string, payload: AgentChatPayload, channel: GenerationChannel = "agent") => {
       const streamKey = generationStreamKey(nextProjectId, payload.threadId);
       if (channel !== "agent") {
-        const closeRef = generationCloseRef(channel, closeAgentEventsRef, closeImageGeneratorEventsRef, closeCanvasActionEventsRef);
-        const streamingRef = generationStreamingRef(channel, agentStreamingProjectIdRef, imageGeneratorStreamingProjectIdRef, canvasActionStreamingProjectIdRef);
-        closeRef.current?.();
+        if (channel === "canvas-action") {
+          closeCanvasActionEventsRef.current.get(streamKey)?.();
+          setCanvasActionGenerating(true);
+          canvasActionStreamingProjectIdRef.current.add(streamKey);
+        } else {
+          closeImageGeneratorEventsRef.current.get(streamKey)?.();
+          setImageGeneratorGenerating(true);
+          imageGeneratorStreamingProjectIdRef.current.add(streamKey);
+        }
         let closed = false;
-        closeRef.current = () => {
+        const close = () => {
           closed = true;
         };
-        streamingRef.current = streamKey;
+        if (channel === "canvas-action") {
+          closeCanvasActionEventsRef.current.set(streamKey, close);
+        } else {
+          closeImageGeneratorEventsRef.current.set(streamKey, close);
+        }
         void designGateway
           .agentChat(nextProjectId, payload)
           .then((response) => {
@@ -270,10 +287,12 @@ export function useGenerationStream({
           })
           .catch((error: unknown) => {
             if (closed) return;
-            completeChannel(channel);
+            if (channel === "canvas-action") {
+              completeCanvasActionStream(streamKey);
+            } else {
+              completeImageGeneratorStream(streamKey);
+            }
             setError(toUserMessageText(error, "generateError"));
-            streamingRef.current = null;
-            closeRef.current = null;
           });
         return;
       }
@@ -319,7 +338,7 @@ export function useGenerationStream({
         }
       });
     },
-    [appendThinkingMessage, applyProject, completeChannel, toUserMessageText, messages.generateError, messages.generateTimeout, setError, startAgentProjectPolling, startGeneratorTaskPolling]
+    [appendThinkingMessage, applyProject, completeCanvasActionStream, completeChannel, completeImageGeneratorStream, toUserMessageText, messages.generateError, messages.generateTimeout, setCanvasActionGenerating, setError, setImageGeneratorGenerating, startAgentProjectPolling, startGeneratorTaskPolling]
   );
 
   const stopGenerationStream = useCallback(
@@ -331,6 +350,13 @@ export function useGenerationStream({
         setCanvasActionGenerating(false);
         return;
       }
+      if (channel === "image-generator") {
+        closeImageGeneratorEventsRef.current.forEach((close) => close());
+        closeImageGeneratorEventsRef.current.clear();
+        imageGeneratorStreamingProjectIdRef.current.clear();
+        setImageGeneratorGenerating(false);
+        return;
+      }
       const closeRef = generationCloseRef(channel, closeAgentEventsRef, closeImageGeneratorEventsRef, closeCanvasActionEventsRef);
       const streamingRef = generationStreamingRef(channel, agentStreamingProjectIdRef, imageGeneratorStreamingProjectIdRef, canvasActionStreamingProjectIdRef);
       closeRef.current?.();
@@ -342,21 +368,21 @@ export function useGenerationStream({
       streamingRef.current = null;
       completeChannel(channel);
     },
-    [completeChannel, setCanvasActionGenerating]
+    [completeChannel, setCanvasActionGenerating, setImageGeneratorGenerating]
   );
 
   useEffect(() => {
     return () => {
       closeAgentEventsRef.current?.();
       closeAgentProjectPollRef.current?.();
-      closeImageGeneratorEventsRef.current?.();
+      closeImageGeneratorEventsRef.current.forEach((close) => close());
       closeCanvasActionEventsRef.current.forEach((close) => close());
       closeAgentEventsRef.current = null;
       closeAgentProjectPollRef.current = null;
-      closeImageGeneratorEventsRef.current = null;
+      closeImageGeneratorEventsRef.current.clear();
       closeCanvasActionEventsRef.current.clear();
       agentStreamingProjectIdRef.current = null;
-      imageGeneratorStreamingProjectIdRef.current = null;
+      imageGeneratorStreamingProjectIdRef.current.clear();
       canvasActionStreamingProjectIdRef.current.clear();
     };
   }, []);
@@ -375,20 +401,18 @@ export function useGenerationStream({
 function generationCloseRef(
   channel: GenerationChannel,
   agentRef: RefObject<(() => void) | null>,
-  imageGeneratorRef: RefObject<(() => void) | null>,
+  _imageGeneratorRef: RefObject<Map<string, () => void>>,
   _canvasActionRef: RefObject<Map<string, () => void>>
 ) {
-  if (channel === "image-generator") return imageGeneratorRef;
   return agentRef;
 }
 
 function generationStreamingRef(
   channel: GenerationChannel,
   agentRef: RefObject<string | null>,
-  imageGeneratorRef: RefObject<string | null>,
+  _imageGeneratorRef: RefObject<Set<string>>,
   _canvasActionRef: RefObject<Set<string>>
 ) {
-  if (channel === "image-generator") return imageGeneratorRef;
   return agentRef;
 }
 

frontend/src/ui/pages/CanvasWorkspace/canvas/imageGeneratorSizing.ts

@@ -1,10 +1,18 @@
 import type { ComposerImageSettings } from "@/ui/components/CanvasAgentComposer";
+import type { CanvasNode } from "@/domain/design";
 
 type StageSize = {
   width: number;
   height: number;
 };
 
+export type ImageGeneratorTargetSize = {
+  width: number;
+  height: number;
+};
+
+const targetMetadataKey = "imageGeneratorTarget";
+
 export function imageGeneratorPlaceholderSize(settings: ComposerImageSettings, viewportScale: number, stage: StageSize) {
   const width = Math.max(1, settings.width);
   const height = Math.max(1, settings.height);
@@ -26,6 +34,67 @@ export function imageGeneratorPlaceholderSize(settings: ComposerImageSettings, v
   };
 }
 
+export function imageGeneratorTargetSizeFromSettings(settings: ComposerImageSettings): ImageGeneratorTargetSize {
+  return {
+    width: positiveInteger(settings.width, 1024),
+    height: positiveInteger(settings.height, 1024)
+  };
+}
+
+export function imageGeneratorTargetSizeFromNode(node: CanvasNode): ImageGeneratorTargetSize {
+  const metadata = parseImageGeneratorTargetMetadata(node.imageAdjustments);
+  if (metadata) {
+    return {
+      width: positiveInteger(metadata.width, 1024),
+      height: positiveInteger(metadata.height, 1024)
+    };
+  }
+  const ratio = Math.max(node.width, 1) / Math.max(node.height, 1);
+  if (ratio >= 1) {
+    return {
+      width: positiveInteger(1024 * ratio, 1024),
+      height: 1024
+    };
+  }
+  return {
+    width: 1024,
+    height: positiveInteger(1024 / ratio, 1024)
+  };
+}
+
+export function serializeImageGeneratorTargetSize(settings: ComposerImageSettings, previous?: string): string {
+  const metadata = parseJsonObject(previous);
+  metadata[targetMetadataKey] = imageGeneratorTargetSizeFromSettings(settings);
+  return JSON.stringify(metadata);
+}
+
 function clamp(value: number, min: number, max: number) {
   return Math.min(Math.max(value, min), max);
 }
+
+function parseImageGeneratorTargetMetadata(value?: string | null): Partial<ImageGeneratorTargetSize> | null {
+  const metadata = parseJsonObject(value)[targetMetadataKey];
+  if (!metadata || typeof metadata !== "object") return null;
+  const source = metadata as Partial<Record<keyof ImageGeneratorTargetSize, unknown>>;
+  return {
+    width: Number(source.width),
+    height: Number(source.height)
+  };
+}
+
+function parseJsonObject(value?: string | null): Record<string, unknown> {
+  if (!value) return {};
+  try {
+    const parsed = JSON.parse(value) as unknown;
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) return { ...(parsed as Record<string, unknown>) };
+  } catch {
+    return {};
+  }
+  return {};
+}
+
+function positiveInteger(value: unknown, fallback: number) {
+  const numeric = Number(value);
+  if (!Number.isFinite(numeric) || numeric <= 0) return Math.max(1, Math.round(fallback));
+  return Math.max(1, Math.round(numeric));
+}

frontend/src/ui/pages/CanvasWorkspace/index.tsx

@@ -46,7 +46,7 @@ import { useCanvasDocument } from "./canvas/hooks/useCanvasDocument";
 import { useCanvasPersistence } from "./canvas/hooks/useCanvasPersistence";
 import { useCanvasSelection } from "./canvas/hooks/useCanvasSelection";
 import { useGenerationStream, type GenerationChannel } from "./canvas/hooks/useGenerationStream";
-import { imageGeneratorPlaceholderSize } from "./canvas/imageGeneratorSizing";
+import { imageGeneratorPlaceholderSize, imageGeneratorTargetSizeFromNode, imageGeneratorTargetSizeFromSettings, serializeImageGeneratorTargetSize, type ImageGeneratorTargetSize } from "./canvas/imageGeneratorSizing";
 import { canvasNodeToReferenceImage, isAssetReferencedByCanvas, isCanvasNodeReferenceImage } from "./canvas/nodeReferenceImages";
 import { canvasNodeSvg, exportCanvasNode, exportImageNode, exportTextNode, imageNodeRasterBlob, svgToRasterBlob } from "./canvas/nodeExport";
 import { beginPenStroke, createPenStrokeNode, PenStrokeDraftOverlay, PenToolControls, type PenDraft, type PenSettings } from "@/ui/pages/CanvasWorkspace/canvas/PenTool";
@@ -707,12 +707,13 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
   }, [editingTextNodeId, nodes]);
 
   const applyProject = useCallback((nextProject: Project, options: { preserveMessages?: boolean } = {}) => {
-    applyProjectDocument(nextProject);
+    const mergedProject = preserveLocalDraftImageGenerators(nextProject, nodesRef.current);
+    applyProjectDocument(mergedProject);
     if (!options.preserveMessages) {
-      setMessages(visibleAgentMessagesForThread(nextProject, imageGeneratorThreadIdsRef.current, selectedAgentThreadIdRef.current));
+      setMessages(visibleAgentMessagesForThread(mergedProject, imageGeneratorThreadIdsRef.current, selectedAgentThreadIdRef.current));
     }
     setEditingTextNodeId(null);
-  }, [applyProjectDocument]);
+  }, [applyProjectDocument, nodesRef]);
 
   const appendThinkingMessage = useCallback((message: AgentMessage) => {
     if (isImageGeneratorThreadMessage(message, imageGeneratorThreadIdsRef.current)) return;
@@ -937,7 +938,7 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
   const selectedImageNode = selectedControlNode && isRealCanvasImageNode(selectedControlNode) ? selectedControlNode : null;
   const selectedImageNodeBusy = selectedImageNode ? isImageActionBusy(selectedImageNode) : false;
   const selectedImageGeneratorNode = selectedControlNode?.type === "image" && selectedControlNode.layerRole === "image-generator" ? selectedControlNode : null;
-  const selectedImageGeneratorBusy = imageGeneratorGenerating || selectedImageGeneratorNode?.status === "generating";
+  const selectedImageGeneratorBusy = selectedImageGeneratorNode?.status === "generating";
   const selectedPenStrokeNode = selectedControlNode && isCanvasPenStrokeNode(selectedControlNode) ? selectedControlNode : null;
   const selectedFrameNode = selectedControlNode?.type === "frame" && selectedControlNode.layerRole === "manual-frame" ? selectedControlNode : null;
   const selectedShapeNode = selectedControlNode && isShapeNode(selectedControlNode) ? selectedControlNode : null;
@@ -962,6 +963,16 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
       height: selectedImageGeneratorNode.height * viewport.k
     };
   }, [selectedImageGeneratorNode, viewport]);
+
+  useEffect(() => {
+    if (!selectedImageGeneratorNode) return;
+    const targetSize = imageGeneratorTargetSizeFromNode(selectedImageGeneratorNode);
+    setComposerImageSettings((current) => {
+      if (current.width === targetSize.width && current.height === targetSize.height) return current;
+      return { ...current, width: targetSize.width, height: targetSize.height, ratio: "auto" };
+    });
+  }, [selectedImageGeneratorNode?.id]);
+
   const selectedFrameBounds = useMemo<NodeScreenBounds | null>(() => {
     if (!selectedFrameNode) return null;
     return {
@@ -2105,6 +2116,7 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
   const deleteSelectedNodes = () => {
     const ids = new Set(selectedNodes.filter((node) => !lockedNodeIds.has(node.id) && !hiddenNodeIds.has(node.id)).map((node) => node.id));
     if (ids.size === 0) return;
+    nodesRef.current = removeNodesById(nodesRef.current, ids);
     setNodes((current) => removeNodesById(current, ids));
     setHiddenNodeIds((current) => new Set(Array.from(current).filter((nodeId) => !ids.has(nodeId))));
     setLockedNodeIds((current) => new Set(Array.from(current).filter((nodeId) => !ids.has(nodeId))));
@@ -2227,6 +2239,7 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
       const primary = isPrimaryShortcut(event);
       const selected = selectedNode;
       const selectedHandlers = selected && !lockedNodeIds.has(selected.id) && canUseNodeContextMenu(selected) ? createNodeContextMenuHandlers(selected) : null;
+      const selectedCanDelete = selected && !lockedNodeIds.has(selected.id) && !hiddenNodeIds.has(selected.id);
       const run = (action: (() => void) | undefined, prevent = true) => {
         if (!action) return false;
         if (prevent) event.preventDefault();
@@ -2276,7 +2289,7 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
       if (primary && event.shiftKey && key === "h") return void run(selectedHandlers?.toggleHidden);
       if (primary && event.shiftKey && key === "l") return void run(selectedHandlers?.toggleLocked);
       if ((event.key === "Backspace" || event.key === "Delete") && selectedNodes.length > 1) return void run(deleteSelectedNodes);
-      if ((event.key === "Backspace" || event.key === "Delete") && selected) return void run(selectedHandlers?.deleteNode);
+      if ((event.key === "Backspace" || event.key === "Delete") && selected) return void run(selectedHandlers?.deleteNode ?? (selectedCanDelete ? () => removeNode(selected.id) : undefined));
     };
 
     window.addEventListener("keydown", handleKeyDown);
@@ -2335,18 +2348,20 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
     };
     const origin = point ?? center;
     const size = imageGeneratorPlaceholderSize(composerImageSettings, viewport.k, { width: stageWidth, height: stageHeight });
+    const position = point ? { x: origin.x - size.width / 2, y: origin.y - size.height / 2 } : nextImageGeneratorPosition(origin, size, nodesRef.current, viewport.k);
     const node: CanvasNode = {
       id: cryptoFallbackId(),
       type: "image",
       title: t("imageGeneratorNode"),
-      x: origin.x - size.width / 2,
-      y: origin.y - size.height / 2,
+      x: position.x,
+      y: position.y,
       width: size.width,
       height: size.height,
       content: "",
       tone: "image-generator",
       status: "draft",
-      layerRole: "image-generator"
+      layerRole: "image-generator",
+      imageAdjustments: serializeImageGeneratorTargetSize(composerImageSettings)
     };
     setComposerMode("image");
     setActiveTool("select");
@@ -2375,7 +2390,8 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
           x: centerX - size.width / 2,
           y: centerY - size.height / 2,
           width: size.width,
-          height: size.height
+          height: size.height,
+          imageAdjustments: serializeImageGeneratorTargetSize(settings, node.imageAdjustments)
         };
       });
       nodesRef.current = next;
@@ -2577,7 +2593,7 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
         setNodes((current) => {
           const next = current.map((node) =>
             node.id === selectedGeneratorNode.id && node.type === "image" && node.layerRole === "image-generator"
-              ? { ...node, content: lockedPrompt, status: "generating" }
+              ? { ...node, content: lockedPrompt, status: "generating", imageAdjustments: serializeImageGeneratorTargetSize(composerImageSettings, node.imageAdjustments) }
               : node
           );
           nodesRef.current = next;
@@ -3437,6 +3453,12 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
               const locked = lockedNodeIds.has(node.id);
               const canOperateNode = !locked;
               const suppressSelectionFrame = (imageActionMode === "expand" || imageActionMode === "crop") && selectedImageNode?.id === node.id;
+              const imageGeneratorTargetSize =
+                node.type === "image" && node.layerRole === "image-generator"
+                  ? node.id === selectedImageGeneratorNode?.id
+                    ? imageGeneratorTargetSizeFromSettings(composerImageSettings)
+                    : imageGeneratorTargetSizeFromNode(node)
+                  : undefined;
               return (
                 <CanvasNodeView
                   key={node.id}
@@ -3455,6 +3477,7 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
                   }}
                   selectionScale={viewport.k}
                   viewportScale={viewport.k}
+                  imageGeneratorTargetSize={imageGeneratorTargetSize}
                   hasClipboard
                   contextMenuHandlers={canOperateNode && canUseNodeContextMenu(node) ? createNodeContextMenuHandlers(node) : null}
                   onPointerDown={(event) => handleNodePointerDown(event, node)}
@@ -3475,7 +3498,7 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
           <FrameDraftOverlay draft={frameDraft} label={t("newFrameNode")} />
           <ShapeDraftOverlay draft={shapeDraft} kind={selectedShapeKind} label={shapeTitle(selectedShapeKind, t)} />
           <PenStrokeDraftOverlay draft={penDraft} />
-          {selectedImageGeneratorBounds && (
+          {selectedImageGeneratorBounds && selectedImageGeneratorNode?.status === "draft" && (
             <ImageGeneratorFloatingComposer
               bounds={selectedImageGeneratorBounds}
               stageWidth={canvasStageSize.width}
@@ -3484,7 +3507,7 @@ export function CanvasWorkspace({ projectId }: { projectId: string }) {
               selectedModel={selectedCanvasModel}
               settings={composerImageSettings}
               generating={selectedImageGeneratorBusy}
-              lockedPrompt={selectedImageGeneratorNode?.status === "generating" ? cleanImageGeneratorPrompt(selectedImageGeneratorNode.content) : ""}
+              lockedPrompt=""
               onSettingsChange={updateComposerImageSettings}
               onModelChange={setSelectedCanvasModelId}
               onUploadFile={uploadReferenceToImageGenerator}
@@ -4006,6 +4029,7 @@ function CanvasNodeView({
   transform,
   selectionScale,
   viewportScale,
+  imageGeneratorTargetSize,
   hasClipboard,
   contextMenuHandlers,
   onPointerDown,
@@ -4027,6 +4051,7 @@ function CanvasNodeView({
   transform: NodeTransform;
   selectionScale: number;
   viewportScale: number;
+  imageGeneratorTargetSize?: ImageGeneratorTargetSize;
   hasClipboard: boolean;
   contextMenuHandlers: NodeContextMenuHandlers | null;
   onPointerDown: (event: React.PointerEvent<HTMLDivElement>) => void;
@@ -4044,11 +4069,13 @@ function CanvasNodeView({
   const booleanShapeGroup = isBooleanShapeGroupNode(node);
   const lineShapeNode = isLineShapeNode(node);
   const penStroke = node.type === "image" && node.layerRole === "pen-stroke";
+  const imageGenerator = node.type === "image" && node.layerRole === "image-generator";
   const textOverlay = node.type === "text" && node.layerRole === "editable-text";
   const textOverlayStyle = textOverlay ? editableTextLayerStyle(node) : undefined;
   const textEditorRef = useRef<HTMLTextAreaElement | null>(null);
   const selectionTitle = manualFrame ? "Frame" : shapeNode || booleanShapeGroup ? node.title.trim() || "Shape" : penStroke ? node.title.trim() || "Pen stroke" : node.title.trim() || (node.type === "image" ? "Image" : node.type);
-  const selectionSize = `${Math.round(node.width)} × ${Math.round(node.height)}`;
+  const visibleSelectionSize = imageGenerator && imageGeneratorTargetSize ? imageGeneratorTargetSize : { width: node.width, height: node.height };
+  const selectionSize = `${Math.round(visibleSelectionSize.width)} × ${Math.round(visibleSelectionSize.height)}`;
   const SelectionIcon = node.type === "frame" ? Frame : node.type === "text" ? Type : penStroke ? PenLine : ImageIcon;
 
   useEffect(() => {
@@ -4080,7 +4107,7 @@ function CanvasNodeView({
         {shapeNode || booleanShapeGroup ? (
           <ShapeNodePreview node={node} />
         ) : visual ? (
-          <ArtboardPreview node={node} viewportScale={viewportScale} />
+          <ArtboardPreview node={node} viewportScale={viewportScale} imageGeneratorTargetSize={imageGeneratorTargetSize} />
         ) : textOverlay ? (
           editing ? (
             <textarea
@@ -4128,7 +4155,7 @@ function CanvasNodeView({
           title={selectionTitle}
           size={selectionSize}
           Icon={SelectionIcon}
-          variant={manualFrame ? "frame" : penStroke ? "pen" : shapeNode || booleanShapeGroup ? "shape" : textOverlay ? "text" : undefined}
+          variant={manualFrame ? "frame" : imageGenerator ? "image-generator" : penStroke ? "pen" : shapeNode || booleanShapeGroup ? "shape" : textOverlay ? "text" : undefined}
           selectionScale={selectionScale}
           transform={transform}
           onResizePointerDown={onResizePointerDown}
@@ -5404,6 +5431,56 @@ function latestAgentThreadId(project: Project | null, hiddenThreadIds: ReadonlyS
     .sort((a, b) => b.updateTimestamp - a.updateTimestamp)[0]?.agentThreadId || "";
 }
 
+function preserveLocalDraftImageGenerators(nextProject: Project, currentNodes: CanvasNode[]) {
+  const nextNodeIds = new Set(nextProject.nodes.map((node) => node.id));
+  const localDraftGenerators = currentNodes.filter((node) => node.type === "image" && node.layerRole === "image-generator" && node.status === "draft" && !nextNodeIds.has(node.id));
+  if (localDraftGenerators.length === 0) return nextProject;
+  return {
+    ...nextProject,
+    nodes: [...nextProject.nodes, ...localDraftGenerators]
+  };
+}
+
+function nextImageGeneratorPosition(origin: { x: number; y: number }, size: { width: number; height: number }, nodes: CanvasNode[], viewportScale: number) {
+  const base = {
+    x: origin.x - size.width / 2,
+    y: origin.y - size.height / 2
+  };
+  const generators = nodes.filter((node) => node.type === "image" && node.layerRole === "image-generator");
+  const gap = 24 / Math.max(viewportScale, 0.01);
+  const step = {
+    x: size.width + gap,
+    y: size.height + gap
+  };
+  const overlapsAnyGenerator = (candidate: { x: number; y: number }) =>
+    generators.some((node) => rectanglesOverlap({ ...candidate, ...size }, node));
+
+  if (!overlapsAnyGenerator(base)) return base;
+
+  for (let ring = 1; ring <= 6; ring += 1) {
+    for (let row = -ring; row <= ring; row += 1) {
+      for (let column = -ring; column <= ring; column += 1) {
+        if (Math.max(Math.abs(row), Math.abs(column)) !== ring) continue;
+        const candidate = {
+          x: base.x + column * step.x,
+          y: base.y + row * step.y
+        };
+        if (!overlapsAnyGenerator(candidate)) return candidate;
+      }
+    }
+  }
+
+  const fallbackOffset = generators.length * gap;
+  return {
+    x: base.x + fallbackOffset,
+    y: base.y + fallbackOffset
+  };
+}
+
+function rectanglesOverlap(a: { x: number; y: number; width: number; height: number }, b: CanvasNode) {
+  return a.x < b.x + b.width && a.x + a.width > b.x && a.y < b.y + b.height && a.y + a.height > b.y;
+}
+
 function agentThreadTitleText(content: string) {
   return visiblePromptText(content);
 }

frontend/src/ui/styles.css

@@ -2365,6 +2365,14 @@ button:disabled {
   right: calc(10px / var(--selection-scale));
 }
 
+.image-generator-selection-frame {
+  border-color: transparent;
+}
+
+.image-generator-selection-frame .moteva-selection-meta {
+  display: none;
+}
+
 .pen-stroke-selection-frame .moteva-selection-meta {
   display: none;
 }