@things-factory/figure-service 10.1.157 → 10.1.159

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-service",
-  "version": "10.1.157",
+  "version": "10.1.159",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -27,16 +27,16 @@
   "dependencies": {
     "@hatiolab/figure-model": "^0.6.5",
     "@operato/typeorm-history": "^10.0.0",
-    "@things-factory/ai-client-base": "^10.1.157",
-    "@things-factory/attachment-base": "^10.1.157",
-    "@things-factory/auth-base": "^10.1.157",
+    "@things-factory/ai-client-base": "^10.1.159",
+    "@things-factory/attachment-base": "^10.1.159",
+    "@things-factory/auth-base": "^10.1.159",
     "@things-factory/env": "^10.1.149",
-    "@things-factory/setting-base": "^10.1.157",
+    "@things-factory/setting-base": "^10.1.159",
     "@things-factory/shell": "^10.1.157",
     "graphql-scalars": "^1.22.4",
     "graphql-upload": "^15.0.2",
     "jszip": "^3.10.1",
     "koa-router": "^7.4.0"
   },
-  "gitHead": "bde810f804966549a7041457ad7ede40fcb78488"
+  "gitHead": "fc15cdcb18e562ca1e723a1e1bf042f9582cbbfb"
 }

package/server/index.ts

@@ -9,6 +9,8 @@ import './routes.js'
  */
 import { registerFigureToolCategories } from './service/figure/figure-tools.js'
 registerFigureToolCategories()
+/* The figure the modeller has open, said to the AI each turn (design/ai/screen-pattern.md §2-1). */
+import './service/figure/figure-subject.js'
 
 /*
  * The recipe templates are read once at start (ADR-0095, amended): what was served, and any file whose form is wrong,

package/server/service/figure/figure-namespace-db.test.ts

@@ -90,15 +90,25 @@ describe('the namespace a figure is created under', () => {
     expect(figure.type).toBe('conveyor')
   })
 
-  it('is refused by name when the domain has none, or an invalid one', async () => {
-    for (const value of [null, 'Hatiolab.COM']) {
-      const { context } = await domainWith(value)
-      await expect(
-        new FigureMutation().saveFigure(releasable(), context, undefined, undefined, creationId(), undefined, 'conveyor')
-      ).rejects.toMatchObject({ code: 'figure-namespace-missing' })
+  it('with no setting, or an empty one, is the subdomain', async () => {
+    for (const value of [null, '', '  ']) {
+      const { domain, context } = await domainWith(value)
+      const figure = await new FigureMutation().saveFigure(releasable(), context, undefined, undefined, creationId(), undefined, 'conveyor')
+      expect(figure.namespace).toBe(domain.subdomain)
     }
   })
 
+  it('is refused by name when the setting is not a namespace, or there is none and the subdomain is not one either', async () => {
+    const { context } = await domainWith('Hatiolab.COM')
+    await expect(
+      new FigureMutation().saveFigure(releasable(), context, undefined, undefined, creationId(), undefined, 'conveyor')
+    ).rejects.toMatchObject({ code: 'figure-namespace-missing' })
+    const odd = await dataSource!.getRepository(shell.Domain).save({ name: `odd-${++seq}`, subdomain: 'Odd_Sub' })
+    await expect(
+      new FigureMutation().saveFigure(releasable(), { state: { domain: odd, user: undefined, tx: dataSource!.manager } }, undefined, undefined, creationId(), undefined, 'conveyor')
+    ).rejects.toMatchObject({ code: 'figure-namespace-missing' })
+  })
+
   it('cannot change: a new figure or a release is refused while the setting disagrees with the figures already made', async () => {
     const { domain, context } = await domainWith('hatiolab.com')
     const draft = await new FigureMutation().saveFigure(releasable(), context, undefined, undefined, creationId(), undefined, 'conveyor')

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

@@ -13,14 +13,17 @@ export const FIGURE_NAMESPACE_SETTING = 'figure-namespace'
  * The namespace a new figure is created under.
  *
  * It is read from the domain setting and copied onto the figure, so the full name `{namespace}/{type}` a board stores
- * never moves. The setting is set once: a value that differs from the namespace this domain's figures already carry
- * is refused, so editing it on the settings screen cannot rename anything.
+ * never moves. A domain with no setting, or an empty one, takes its subdomain (user, 2026-10-13: 「기본적으로는
+ * subdomain 명을 사용하면 되는데」) -- refused only when the subdomain is not a namespace either. A value written in
+ * the setting is used as it is, and refused when it is not a namespace. Either way it is set once: a value that differs
+ * from the namespace this domain's figures already carry is refused, so editing the setting cannot rename anything.
  */
 export async function namespaceForNewFigure(tx: EntityManager, domain: Domain): Promise<string> {
   const setting = await tx.getRepository(Setting).findOne({
     where: { domain: { id: domain.id }, name: FIGURE_NAMESPACE_SETTING }
   })
-  const namespace = setting?.value?.trim() ?? ''
+  const written = setting?.value?.trim() ?? ''
+  const namespace = written || (domain.subdomain ?? '').trim()
   if (!isFigureNamespace(namespace)) {
     throw new Refusal(
       'figure-namespace-missing',

package/server/service/figure/figure-subject.test.ts

@@ -0,0 +1,41 @@
+/*
+ * The modeller's open figure, named for the AI (operato-application design/ai/screen-pattern.md §2-1).
+ */
+const mockFigures: any[] = [
+  { id: 'f1', domain: 'plant-a', name: '선풍기', type: 'system/fan' },
+  { id: 'f2', domain: 'plant-a', name: '', type: 'system/agv-lift' },
+  { id: 'f3', domain: 'plant-b', name: '남의 도형', type: 'other/one' }
+]
+const mockRegistered: any[] = []
+
+jest.mock('@things-factory/shell', () => ({
+  getRepository: (name: string) => {
+    if (name !== 'Figure') throw new Error(`unexpected repository ${name}`)
+    return {
+      findOne: async ({ where }: any) => mockFigures.find(one => one.id === where.id && one.domain === where.domain.id) ?? null
+    }
+  }
+}))
+jest.mock('@things-factory/ai-client-base', () => ({ registerAssistantSubject: (one: any) => mockRegistered.push(one) }))
+
+/* Required after the mocks hold their lists - an import would load it before them. */
+const { figureSubject } = require('./figure-subject')
+
+describe('the figure the modeller has open', () => {
+  it('★ is registered for the figure anchor when the package loads', () => {
+    expect(mockRegistered).toEqual([figureSubject])
+    expect(figureSubject.anchorType).toBe('figure')
+  })
+
+  it('★ is named by its name, in this domain', async () => {
+    expect(await figureSubject.describe({ anchorId: 'f1', domain: { id: 'plant-a' } })).toEqual({ noun: 'figure', name: '선풍기' })
+  })
+
+  it('a figure with no name yet is called by its type', async () => {
+    expect(await figureSubject.describe({ anchorId: 'f2', domain: { id: 'plant-a' } })).toEqual({ noun: 'figure', name: 'system/agv-lift' })
+  })
+
+  it('★ another domain\'s figure is not named', async () => {
+    expect(await figureSubject.describe({ anchorId: 'f3', domain: { id: 'plant-a' } })).toBeUndefined()
+  })
+})

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

@@ -0,0 +1,21 @@
+/**
+ * The figure the modeller has open, named for the AI (operato-application design/ai/screen-pattern.md §2-1).
+ *
+ * A conversation in the modeller is anchored to the open figure. Each turn the door reads this to say which figure
+ * that is, so the model starts from "the figure 선풍기 is open" and passes its id to the tools. A figure of another
+ * domain, or one that is gone, is not named.
+ */
+import { registerAssistantSubject } from '@things-factory/ai-client-base'
+import { getRepository } from '@things-factory/shell'
+
+/* By entity name - the entity's decorators stay out of what a test of this has to load. */
+export const figureSubject = {
+  anchorType: 'figure',
+  async describe({ anchorId, domain }: { anchorId: string; domain: { id: string } }) {
+    const figure: any = await getRepository('Figure').findOne({ where: { id: anchorId, domain: { id: domain.id } } })
+    if (!figure) return undefined
+    return { noun: 'figure', name: figure.name || figure.type }
+  }
+}
+
+registerAssistantSubject(figureSubject)