@things-factory/figure-service 10.1.13 → 10.1.16

package/server/service/figure/figure-tools.ts

@@ -93,6 +93,48 @@ async function figureInDomain(figureId: string, domainId: string): Promise<any>
   return found
 }
 
+/**
+ * figureId 또는 hostContext로부터 대상 Figure row(또는 미저장 초안 가상 row)를 해소한다.
+ */
+async function resolveFigureTarget(figureId: string | undefined, domainId: string, host: any): Promise<any> {
+  if (
+    host?.editorMode === 'new' &&
+    host?.draftSource &&
+    (!figureId || figureId === host.draftSource.type || figureId.startsWith('FIGURE'))
+  ) {
+    return unsavedFigure(host)
+  }
+
+  if (figureId) {
+    const { getRepository, Figure } = getDeps()
+    let found = await getRepository(Figure).findOne({
+      where: { id: figureId, domain: { id: domainId } }
+    })
+    if (!found) {
+      found = await getRepository(Figure).findOne({
+        where: { type: figureId, domain: { id: domainId } }
+      })
+    }
+    if (!found) {
+      if (
+        host?.editorMode === 'new' ||
+        (host?.draftSource &&
+          (host.draftSource.type === figureId ||
+            figureId.startsWith('FIGURE') ||
+            !host.figureId ||
+            host.figureId === figureId))
+      ) {
+        const unsaved = unsavedFigure(host)
+        if (unsaved) return unsaved
+      }
+      throw new Error(`figure not found in this tenant: ${figureId}`)
+    }
+    return found
+  }
+
+  return unsavedFigure(host)
+}
+
 /**
  * 모델러가 아직 저장하지 않은 source를 도구가 읽는 유일한 길.
  *
@@ -101,7 +143,8 @@ async function figureInDomain(figureId: string, domainId: string): Promise<any>
  * 프롬프트로 옮기면 비용만 태우고, DB에 있던 Figure와 다른 것을 고친다고 잘못 말할 수 있다.
  */
 function sourceForTool(row: any, host: any): { source: any; draft: boolean } {
-  const draft = host?.figureId === row.id ? host?.draftSource : undefined
+  const isMatch = host?.figureId === row.id || (!row.id && host?.editorMode === 'new') || (!row.id && !host?.figureId)
+  const draft = isMatch ? host?.draftSource : undefined
   if (!draft) {
     return { source: row.source ? JSON.parse(row.source) : null, draft: false }
   }
@@ -120,11 +163,20 @@ function sourceForTool(row: any, host: any): { source: any; draft: boolean } {
   if (checked.errors.length > 0) {
     throw new Error(`the unsaved draft is invalid: ${checked.errors.map((one: any) => one.message).join(' · ')}`)
   }
+
+  let normalizedDraft = draft
   if (draft.type !== row.type) {
-    throw new Error(`the unsaved draft type '${draft.type}' does not match Figure '${row.type}'`)
+    // 템플릿 기본값 'FIGURE', 임시 draftType('FIGURE_...'), 또는 빈 값인 경우
+    // 현재 열려 있는 Figure의 실제 type으로 보정/정규화한다.
+    const isGenericOrTempType = !draft.type || draft.type === 'FIGURE' || draft.type.startsWith('FIGURE_')
+    if (isGenericOrTempType && row.type) {
+      normalizedDraft = { ...draft, type: row.type }
+    } else {
+      throw new Error(`the unsaved draft type '${draft.type}' does not match Figure '${row.type}'`)
+    }
   }
 
-  return { source: draft, draft: true }
+  return { source: normalizedDraft, draft: true }
 }
 
 /**
@@ -134,8 +186,14 @@ function sourceForTool(row: any, host: any): { source: any; draft: boolean } {
  * 도메인에서 Figure를 찾은 뒤, `proposeFigure`가 다시 길이·형식을 정리할 참고 데이터만 건넨다.
  */
 function feedbackForTool(host: any, figureId?: string): unknown[] | undefined {
-  if (!figureId || host?.figureId !== figureId || !Array.isArray(host?.proposalFeedback)) return undefined
-  return host.proposalFeedback.slice(-5)
+  if (!Array.isArray(host?.proposalFeedback)) return undefined
+  if (figureId && host?.figureId === figureId) {
+    return host.proposalFeedback.slice(-5)
+  }
+  if (host?.editorMode === 'new' || !host?.figureId) {
+    return host.proposalFeedback.slice(-5)
+  }
+  return undefined
 }
 
 /**
@@ -163,8 +221,8 @@ function missingFigureTarget() {
 }
 
 function unsavedFigure(host: any): any | undefined {
-  if (host?.editorMode !== 'new' || host?.figureId || !host?.draftSource) return undefined
-  const row = { id: host.figureId, type: host.draftSource.type, name: '', state: 'draft' }
+  if (host?.editorMode !== 'new' || !host?.draftSource) return undefined
+  const row = { id: host.figureId, type: host.draftSource.type || 'FIGURE', name: '', state: 'draft' }
   // Reuse size, shape and vocabulary validation before trusting browser content.
   const current = sourceForTool(row, host)
   return { ...row, source: JSON.stringify(current.source) }
@@ -223,7 +281,7 @@ function figureToolSpecs(): ToolSpec[] {
       builder: async (args: any, ctx: any) => {
         const domainId = requireDomainId(ctx?.state)
         const figureId = figureIdFrom(args, ctx?.host)
-        const row = figureId ? await figureInDomain(figureId, domainId) : unsavedFigure(ctx?.host)
+        const row = await resolveFigureTarget(figureId, domainId, ctx?.host)
         if (!row) return missingFigureTarget()
 
         const current = sourceForTool(row, ctx?.host)
@@ -258,7 +316,7 @@ function figureToolSpecs(): ToolSpec[] {
       builder: async (args: any, ctx: any) => {
         const domainId = requireDomainId(ctx?.state)
         const figureId = figureIdFrom(args, ctx?.host)
-        const row = figureId ? await figureInDomain(figureId, domainId) : unsavedFigure(ctx?.host)
+        const row = await resolveFigureTarget(figureId, domainId, ctx?.host)
         if (!row) return missingFigureTarget()
 
         const current = sourceForTool(row, ctx?.host)
@@ -308,12 +366,9 @@ function figureToolSpecs(): ToolSpec[] {
         let base: unknown
         if (!args?.create && args?.figureId !== null) {
           const open = typeof args?.figureId === 'string' ? args.figureId : ctx?.host?.figureId
-          if (typeof open === 'string' && open.trim()) {
-            const row = await figureInDomain(open.trim(), domainId)
+          const row = await resolveFigureTarget(open ? open.trim() : undefined, domainId, ctx?.host)
+          if (row) {
             base = sourceForTool(row, ctx?.host).source ?? undefined
-          } else {
-            const draft = unsavedFigure(ctx?.host)
-            if (draft) base = JSON.parse(draft.source)
           }
         }
 
@@ -328,13 +383,23 @@ function figureToolSpecs(): ToolSpec[] {
 
         const { proposeFigure } = getDeps()
         const feedback = feedbackForTool(ctx?.host, base ? figureIdFrom(args, ctx?.host) : undefined)
+
+        let hostImage: { data: Buffer; mediaType: any } | undefined
+        const rawImage = ctx?.host?.image || (Array.isArray(ctx?.host?.attachments) ? ctx.host.attachments.find((a: any) => a?.mediaType?.startsWith('image/')) : undefined)
+        if (rawImage?.data) {
+          const rawData = typeof rawImage.data === 'string' ? rawImage.data.replace(/^data:image\/[a-zA-Z]+;base64,/, '') : rawImage.data
+          const buf = typeof rawData === 'string' ? Buffer.from(rawData, 'base64') : Buffer.from(rawData)
+          hostImage = { data: buf, mediaType: rawImage.mediaType || 'image/png' }
+        }
+
         const result = await proposeFigure({
           prompt,
           palette,
           base,
           type: typeof args?.type === 'string' ? args.type : undefined,
           feedback,
-          refine: !!feedback?.length
+          refine: !!feedback?.length,
+          image: hostImage
         })
 
         /*
@@ -351,6 +416,13 @@ function figureToolSpecs(): ToolSpec[] {
           reason:
             `등급 ${result.score.grade} · 삼각형 ${result.cost.triangles} · ` +
             `한 도면 ${result.cost.at.drawCalls}회 · ${result.attempts}번에 만들었다`,
+          choices: [
+            { id: 'save', action: 'save', label: '초안 저장', icon: 'save', primary: true },
+            { id: 'repropose', action: 'prompt', label: '다른 콘셉트 재제안', icon: 'refresh', prompt: '현재 제안과 완전히 다른 스타일과 콘셉트로 새로 제안해줘' },
+            { id: 'slim', action: 'prompt', label: '비율 슬림 조정', icon: 'aspect_ratio', prompt: '전체적인 가로세로 비율을 좀 더 슬림하고 날렵하게 조정해줘' },
+            { id: 'palette', action: 'prompt', label: '색상 테마 변경', icon: 'palette', prompt: '다른 팔레트 색상 테마로 부품 색상을 변경해줘' },
+            { id: 'detail', action: 'prompt', label: '디테일 보강', icon: 'extension', prompt: '주요 디테일과 센서 부품을 좀 더 풍부하게 보강해줘' }
+          ],
           args: {
             baseSource: base ? JSON.stringify(base) : undefined,
             prompt, figureId: base ? figureIdFrom(args, ctx?.host) : undefined,