@things-factory/board-import 10.1.154 → 10.1.156

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-import",
-  "version": "10.1.154",
+  "version": "10.1.156",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "heartyoh",
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@operato/graphql": "^10.0.0",
-    "@things-factory/ai-client-base": "^10.1.149",
-    "@things-factory/attachment-base": "^10.1.154",
-    "@things-factory/auth-base": "^10.1.154",
-    "@things-factory/board-service": "^10.1.154",
+    "@things-factory/ai-client-base": "^10.1.155",
+    "@things-factory/attachment-base": "^10.1.156",
+    "@things-factory/auth-base": "^10.1.155",
+    "@things-factory/board-service": "^10.1.156",
     "@things-factory/env": "^10.1.149",
-    "@things-factory/shell": "^10.1.154",
+    "@things-factory/shell": "^10.1.155",
     "dxf-parser": "^1.1.2"
   },
-  "gitHead": "f28579aa7131cbb282eb8813f8b285d9d29bb525"
+  "gitHead": "641146444c8ac4e510854c40824457ffad5cf3f1"
 }

package/server/service/adapters/image-adapter.ts

@@ -7,7 +7,7 @@
  *
  * zero-to-twin 메인 트랙 (조감도/사진 업로드 → 보드) 의 첫 어댑터.
  */
-import { getAIClient } from '../ai/types'
+import { getAIClient, type BoardImportAI } from '../ai/types'
 import type {
   AdapterCapabilities,
   AdapterInput,
@@ -21,6 +21,11 @@ import type {
 const IMAGE_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.webp', '.gif', '.bmp']
 
 export interface ImageParseOptions extends ParseOptions {
+  /**
+   * The AI of the domain the import runs for - asked only when an image is parsed, so a drawing that needs no AI
+   * imports in a domain with no AI agent.
+   */
+  resolveAI?: () => Promise<BoardImportAI>
   /** 자연어 컨텍스트 — VLM 에 함께 전달. 예: "factory floor plan with AGV paths and stockers" */
   context?: string
   /** 후보 카테고리 — VLM 이 그 안에서 라벨링하도록 가이드 */
@@ -62,9 +67,9 @@ export class ImageAdapter implements FormatAdapter {
   }
 
   async parse(file: AdapterInput, options: ImageParseOptions = {}): Promise<ParseResult> {
-    const ai = getAIClient()
+    const ai = getAIClient() ?? (await options.resolveAI?.())
     if (!ai) {
-      throw new Error('Image import requires a registered BoardImportAI (call setAIClient first).')
+      throw new Error('Image import needs the AI of the domain it runs for (resolveAI) or a registered BoardImportAI.')
     }
     if (!ai.parseFromImage) {
       throw new Error('Registered BoardImportAI does not implement parseFromImage (no VLM support).')

package/server/service/ai/types.ts

@@ -7,17 +7,17 @@
  *
  * 사용 예:
  * ```ts
- * import { createAIClient } from '@things-factory/ai-client-base'
+ * import { aiClientFor } from '@things-factory/ai-client-base'
  * import { setAIClient, DefaultBoardImportAI } from '@things-factory/board-import'
  *
- * const base = createAIClient({ provider: 'anthropic', apiKey: '...' })
+ * const base = await aiClientFor({ domain, user }) // the domain's AI agent
  * setAIClient(new DefaultBoardImportAI(base))
  * ```
  *
  * Phase 1-2 결정적 파이프라인은 AI 미사용. 위 등록은 Phase 3+ 메서드 활성화용.
  */
 import {
-  getDefaultAIClient,
+  aiClientFor,
   parseJSONResponse,
   type AIClient as BaseAIClient
 } from '@things-factory/ai-client-base'
@@ -590,29 +590,22 @@ function hydrateRuleRegexes<T extends { match?: any }>(rule: T): T {
 // ── Provider 등록 ──────────────────────────────────────────────────
 
 let currentClient: BoardImportAI | undefined
-let defaultBackedClient: BoardImportAI | undefined
-let defaultBackedFor: BaseAIClient | undefined
 
+/** A BoardImportAI that answers every import, whatever the domain - for tests and for a host that brings its own. */
 export function setAIClient(client: BoardImportAI | undefined): void {
   currentClient = client
 }
 
+export function getAIClient(): BoardImportAI | undefined {
+  return currentClient
+}
+
 /**
- * 등록된 BoardImportAI 가 있으면 그걸 반환.
- * 없으면 ai-client-base 의 default AIClient (config.aiClient) 를 `DefaultBoardImportAI` 로
- * 감싸서 반환 — board-ai 와 동일한 1회 설정만으로 image import 도 동작하게 한다.
- *
- * default base 가 바뀌면 (테스트 등) 캐시를 무효화하고 다시 감싼다.
+ * The BoardImportAI of a domain's AI agent (design/ai/agent-settings.md). An import runs in the background, after the
+ * request is gone, so the job asks with the domain and the person it stored.
  */
-export function getAIClient(): BoardImportAI | undefined {
-  if (currentClient) return currentClient
-  const base = getDefaultAIClient()
-  if (!base) return undefined
-  if (defaultBackedFor !== base) {
-    defaultBackedFor = base
-    defaultBackedClient = new DefaultBoardImportAI(base)
-  }
-  return defaultBackedClient
+export async function boardImportAIFor(request: { domain: { id: string }; user?: { id: string } | null }): Promise<BoardImportAI> {
+  return currentClient ?? new DefaultBoardImportAI(await aiClientFor(request as any))
 }
 
 /** Deprecated alias — 기존 코드 호환용. 새로 작성 시 BoardImportAI 사용. */

package/server/service/extraction/contracts.ts

@@ -71,6 +71,8 @@ export interface ExtractionContext {
    * 스케일바). ScaleCalibrator 가 최우선 사용. unitsPerPixel = units / pixels.
    */
   scaleReference?: { pixels: number; units: number; unit?: string }
+  /** The AI client of the domain the extraction runs for (aiClientFor). A recognizer that asks a model needs it. */
+  aiClient?: import('@things-factory/ai-client-base').AIClient
   [k: string]: any
 }
 

package/server/service/extraction/extraction.test.ts

@@ -253,8 +253,14 @@ describe('VlmRecognizer', () => {
     expect(out.confidence).toBeLessThanOrEqual(0.3)
   })
 
-  it('AIClient 없으면 명확히 throw', async () => {
-    await expect(new VlmRecognizer().recognize(prim())).rejects.toThrow(/AIClient/)
+  it('AI client 없으면 명확히 throw — 실행하는 쪽이 그 사업장 에이전트의 client 를 넘긴다', async () => {
+    await expect(new VlmRecognizer().recognize(prim())).rejects.toThrow(/needs the AI client of the domain/)
+  })
+
+  it('실행하는 쪽이 넘긴 ctx.aiClient 로 판정한다', async () => {
+    const client: any = { generateJSON: async () => ({ componentType: 'rack', confidence: 0.9 }) }
+    const r = await new VlmRecognizer().recognize(prim(), { aiClient: client })
+    expect(r.componentType).toBe('rack')
   })
 
   it('프롬프트에 region 신호(라벨·크기) + 카탈로그 포함', async () => {

package/server/service/extraction/vlm-recognizer.ts

@@ -5,9 +5,10 @@
  * *의미 인식* 만: 주어진 신호(라벨·모양·크기·레이어) + 카탈로그 → componentType.
  * 카탈로그(ctx.catalog) 가 있으면 그 안의 값만 허용(그라운딩).
  *
- * provider 는 ai-client-base 의 AIClient. 생성자 주입 가능(테스트), 미주입 시 기본 클라이언트.
+ * provider 는 ai-client-base 의 AIClient. 생성자로 주입하거나(테스트), 실행하는 쪽이 그 사업장 에이전트의 client 를
+ * ctx.aiClient 로 넘긴다.
  */
-import { getDefaultAIClient, type AIClient } from '@things-factory/ai-client-base'
+import type { AIClient } from '@things-factory/ai-client-base'
 import type { Recognizer, RecognitionResult, GeometricPrimitive, ExtractionContext } from './contracts'
 
 interface RawRecognition {
@@ -27,9 +28,9 @@ export class VlmRecognizer implements Recognizer {
   constructor(private readonly client?: AIClient) {}
 
   async recognize(region: GeometricPrimitive, ctx?: ExtractionContext): Promise<RecognitionResult> {
-    const client = this.client ?? getDefaultAIClient()
+    const client = this.client ?? ctx?.aiClient
     if (!client) {
-      throw new Error('[board-import/extraction] VlmRecognizer 는 AIClient 가 필요합니다 (setDefaultAIClient / config.aiClient).')
+      throw new Error('[board-import/extraction] VlmRecognizer needs the AI client of the domain it runs for (ctx.aiClient).')
     }
     const raw = await client.generateJSON<RawRecognition>(buildPrompt(region, ctx), {
       systemPrompt: SYSTEM,

package/server/service/import-session/import-session.ts

@@ -127,6 +127,9 @@ export class ImportSession {
   @Field(type => User, { nullable: true })
   creator?: User
 
+  @RelationId((session: ImportSession) => session.creator)
+  creatorId?: string
+
   @CreateDateColumn()
   @Field({ nullable: true })
   createdAt?: Date

package/server/service/import-session/import-worker.ts

@@ -16,6 +16,7 @@ import { Attachment } from '@things-factory/attachment-base'
 import { STORAGE } from '@things-factory/attachment-base'
 
 import { importBoardVariants } from '../pipeline/index'
+import { boardImportAIFor } from '../ai/types'
 import { ImportSession } from './import-session'
 
 export async function runImportJob(sessionId: string): Promise<void> {
@@ -50,7 +51,9 @@ export async function runImportJob(sessionId: string): Promise<void> {
     // 다른 adapter (DXF) 에는 무해 (몰라도 무시).
     const mergedParseOptions = {
       ...(opts.parseOptions || {}),
-      ...(opts.userPrompt ? { userPrompt: opts.userPrompt } : {})
+      ...(opts.userPrompt ? { userPrompt: opts.userPrompt } : {}),
+      /* The domain's AI agent, asked only if the drawing needs it (design/ai/agent-settings.md). */
+      resolveAI: () => boardImportAIFor({ domain: { id: session.domainId! }, user: session.creatorId ? { id: session.creatorId } : null })
     }
     // AI 가 같은 도면을 다른 관점으로 해석한 multi-variant. parse 한 번, 시안별 mapping + assemble.
     // DXF 등 single-variant adapter 는 1 boardModel 만.