@things-factory/figure-service 10.1.171 → 10.1.172

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-service",
-  "version": "10.1.171",
+  "version": "10.1.172",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -38,5 +38,5 @@
     "jszip": "^3.10.1",
     "koa-router": "^7.4.0"
   },
-  "gitHead": "e88536db0bc3cbb759fe58f9efeef66a67fef2c3"
+  "gitHead": "6c653ce8573f7a0d64c7f7f930605f816c35d69f"
 }

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

@@ -177,7 +177,7 @@ describe('figure-format — 판을 알아보는 문', () => {
     it('넘은 부품은 이름 · 축 · 넘은 양을 화면 말투로 말하고, 왜와 어떻게를 함께 낸다', () => {
       const finding = inspectSource(outside(), null, translatorOf(KO)).findings.find(f => f.code === 'part-outside-occupancy')!
 
-      expect(finding.message).toMatch(/^'arm' 부품이 공간 선언을 X 로 [\d.]+mm 넘습니다\.$/)
+      expect(finding.message).toMatch(/^도형이 차지하는 공간을 'arm' 부품이 X 로 [\d.]+mm 넘습니다\.$/)
       expect(finding.why).toMatch(/니다\.$/)
       expect(finding.how).toContain('부품에 맞추기')
       expect(finding.how).toMatch(/세요\.$/)
@@ -202,10 +202,18 @@ describe('figure-format — 판을 알아보는 문', () => {
       expect(said.findings.some(f => f.code === 'extension-gone')).toBe(false)
     })
 
-    it('공간을 선언하지 않은 도형은 무엇을 누르면 되는지 말한다', () => {
+    /* 첫 15분 다시 재기(10-16 저녁): 판정 문구만 옛 말 「공간 선언」을 썼다. 화면 말은 ADR-0097 §9 Q2 A 의 표다. */
+    it('판정 문구는 화면 말을 쓴다 — 「차지하는 공간」, 「공간 선언」은 쓰지 않는다', () => {
+      const said = Object.entries(KO).filter(([key]) => key.startsWith('figure.gate.'))
+      expect(said.filter(([, text]) => /공간 선언|공간을[^.]*선언/.test(text)).map(([key]) => key)).toEqual([])
+      const finding = inspectSource(outside(), null, translatorOf(KO)).findings.find(f => f.code === 'part-outside-occupancy')!
+      expect(`${finding.message}${finding.why}${finding.how}`).toContain('차지하는 공간')
+    })
+
+    it('차지하는 공간을 정하지 않은 도형은 무엇을 누르면 되는지 말한다', () => {
       const finding = inspectSource(bare(), null, translatorOf(KO)).findings.find(f => f.code === 'occupancy-undeclared')!
 
-      expect(finding.message).toBe('이 도형은 차지하는 공간을 아직 선언하지 않았습니다.')
+      expect(finding.message).toBe('이 도형은 차지하는 공간을 아직 정하지 않았습니다.')
       expect(finding.how).toContain('부품에 맞추기')
     })
 
@@ -213,7 +221,7 @@ describe('figure-format — 판을 알아보는 문', () => {
       const empty = serializeFigureAsset(createFigureAsset('Empty'))
       const finding = inspectSource(empty, null, translatorOf(KO)).findings.find(f => f.code === 'occupancy-undeclared')!
 
-      expect(finding.how).toBe('먼저 도형을 추가한 뒤, 「부품에 맞추기」로 공간을 선언하세요.')
+      expect(finding.how).toBe('먼저 도형을 추가한 뒤, 「부품에 맞추기」로 차지하는 공간을 정하세요.')
       expect(inspectSource(empty).findings.find(f => f.code === 'occupancy-undeclared')!.how).toMatch(/^Add a shape first/)
     })
 
@@ -289,7 +297,7 @@ describe('figure-format — 판을 알아보는 문', () => {
     it('번역이 없으면 영어로 답한다 — 키를 찍지 않는다', () => {
       const finding = inspectSource(outside()).findings.find(f => f.code === 'part-outside-occupancy')!
 
-      expect(finding.message).toMatch(/^'arm' goes [\d.]+ mm past the declared space on X\.$/)
+      expect(finding.message).toMatch(/^'arm' goes [\d.]+ mm past the space the figure takes on X\.$/)
       expect(finding.message).not.toContain('figure.gate.')
     })
 

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

@@ -119,8 +119,8 @@ export type Translate = (key: string, options?: Record<string, unknown>) => stri
  * refusal. The English line is the fallback when a key is missing, so a missing translation reads as English
  * rather than as the key printed raw.
  *
- * The words are the modeller's: 「공간 선언」 for the volume a figure takes up and 「장착면」 for the face it stands on
- * (`figure.text.mounting-face-explained`). A fact, then the way out.
+ * The words are the modeller's (ADR-0097 §9 Q2 A): 「차지하는 공간」 for the volume a figure takes up, 「부품에 맞추기」 for
+ * setting it from the parts, and 「장착면」 for the face it stands on (`figure.text.mounting-face-explained`). A fact, then the way out.
  */
 function figureWording(violation: FigureViolation, say: Say, hasParts: boolean): Pick<GateFinding, 'message' | 'why' | 'how'> {
   const part = violation.part ?? ''
@@ -132,28 +132,28 @@ function figureWording(violation: FigureViolation, say: Say, hasParts: boolean):
   switch (violation.code) {
     case 'PART_OUTSIDE_OCCUPANCY':
       return {
-        message: say(key('message'), { part, axis, mm }, `'${part}' goes ${mm} mm past the declared space on ${axis}.`),
-        why: say(key('why'), {}, 'The declared space sets the scale a figure is placed at. What lies past it is left out of that scale, so on a board this part lands outside the place given to the figure.'),
-        how: say(key('how'), { part, axis, mm }, `Use "fit to parts" to declare the space from the parts again, or move '${part}' ${mm} mm inward on ${axis}.`)
+        message: say(key('message'), { part, axis, mm }, `'${part}' goes ${mm} mm past the space the figure takes on ${axis}.`),
+        why: say(key('why'), {}, 'The space the figure takes sets the scale it is placed at. What lies past it is left out of that scale, so on a board this part lands outside the place given to the figure.'),
+        how: say(key('how'), { part, axis, mm }, `Use "fit to parts" to fit the space the figure takes to the parts again, or move '${part}' ${mm} mm inward on ${axis}.`)
       }
     case 'OCCUPANCY_UNDECLARED':
       return violation.axis
         ? {
-            message: say(`figure.gate.occupancy-empty-axis.message`, { axis }, `The declared space is empty on ${axis}.`),
-            why: say(key('why'), {}, 'Without a declared space the scale a figure is placed at cannot be set.'),
-            how: say(key('how'), {}, 'Use "fit to parts" to declare the space from the parts as they are now.')
+            message: say(`figure.gate.occupancy-empty-axis.message`, { axis }, `The space the figure takes is empty on ${axis}.`),
+            why: say(key('why'), {}, 'The space a figure takes sets the scale it is placed at on a board.'),
+            how: say(key('how'), {}, 'Use "fit to parts" to set the space the figure takes from the parts as they are now.')
           }
         : {
-            message: say(key('message'), {}, 'This figure has not declared the space it takes up.'),
-            why: say(key('why'), {}, 'Without a declared space the scale a figure is placed at cannot be set.'),
+            message: say(key('message'), {}, 'The space this figure takes is not set yet.'),
+            why: say(key('why'), {}, 'The space a figure takes sets the scale it is placed at on a board.'),
             /*
               A new figure is refused this way before it has a part, and 「fit to parts」 has nothing to measure then —
               the screen does not offer it. Telling the author to press it sent them looking for a button that was not
               there (:3300, 2026-09-24).
             */
             how: hasParts
-              ? say(key('how'), {}, 'Use "fit to parts" to declare the space from the parts as they are now.')
-              : say(key('how-no-parts'), {}, 'Add a shape first, then use "fit to parts" to declare the space from it.')
+              ? say(key('how'), {}, 'Use "fit to parts" to set the space the figure takes from the parts as they are now.')
+              : say(key('how-no-parts'), {}, 'Add a shape first, then use "fit to parts" to set the space the figure takes from it.')
           }
     case 'PARTS_OFF_PLACEMENT_FACE':
       return {
@@ -269,7 +269,7 @@ export function inspectSource(
       code: 'state-range-sampled',
       /* Sizes as well as motion: the instance size range is swept for every figure (figure-model, designer 2026-09-27). */
       message: say('figure.gate.state-range-sampled.message', { states }, `The whole range of sizes and motion could not be proven, so ${states} combinations of size and pose were checked.`),
-      why: say('figure.gate.state-range-sampled.why', {}, 'Between the combinations that were checked, a part may still go past the declared space.'),
+      why: say('figure.gate.state-range-sampled.why', {}, 'Between the combinations that were checked, a part may still go past the space the figure takes.'),
       how: say('figure.gate.state-range-sampled.how', {}, 'To cover the whole range, re-author what could not be proven.'),
       /*
         Which motions stopped the proof, by the name a person gave them: the kernel reports each operation it could

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

@@ -249,6 +249,21 @@ describe('규율이 도구와 함께 나간다', () => {
     expect(category.guidance).toMatch(/breaks the bindings/)
   })
 
+  /*
+    :3300, 2026-10-16, a real model: asked for "폭 600mm, 높이 800mm", the conversation's model passed the step writer
+    "폭 Y=600mm, 높이 Z=800mm" -- told to name sizes by axis, it guessed which was up, and the writer's Y is up. The
+    person's words go to the writer as they are; the writer knows the figure's axes.
+  */
+  it('넘기는 요청은 사람의 말 그대로 — 축을 붙여 옮기지 않는다', () => {
+    const category = getToolCategories().find((one: any) => one.name === 'figure-authoring')!
+    const prompt = category.specs.find((spec: any) => spec.name === 'proposeFigureCandidate').schema.properties.prompt.description
+
+    expect(category.guidance).toMatch(/pass the person's words as they are/)
+    expect(category.guidance).toMatch(/Y is up/)
+    expect(category.guidance).not.toMatch(/Name coordinates and sizes by their X\/Y\/Z axes/)
+    expect(prompt).toMatch(/do not turn sizes into axes/)
+  })
+
   it('타입 이름을 지어내지 말라고 말한다 — 저장되는 식별자다', () => {
     const category = getToolCategories().find((one: any) => one.name === 'figure-authoring')!
 

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

@@ -432,7 +432,7 @@ function figureToolSpecs(): ToolSpec[] {
         properties: {
           prompt: {
             type: 'string',
-            description: 'What to make or change, in the words the author used.'
+            description: 'What to make or change, in the words the author used, with the sizes as they said them: do not turn sizes into axes.'
           },
           figureId: {
             type: 'string',
@@ -596,7 +596,7 @@ export function registerFigureToolCategories(): void {
       '  A proposal is a list of modeller commands. The modeller applies it as one step only when the person runs it from the dock card, and one undo takes it all back. Do not say the figure has changed before that.',
       '  A revision can be proposed only for the figure open in the modeller. Say what the result\'s `steps` do as they are; do not invent changes the commands do not make.',
       '- Never save the source yourself. Propose; the author decides on the screen whether to take it.',
-      '- Name coordinates and sizes by their X/Y/Z axes. Do not attach width, depth or height meanings that have not been confirmed.',
+      '- In the prompt to `proposeFigureCandidate`, pass the person\'s words as they are: their sizes, counts and names. Do not turn them into axes; the writer knows the figure\'s axes. When you name an axis to the person, the figure\'s Y is up.',
       '- **For a request to change a figure, call `getFigureSource` first.** Revising without reading proposes against a guess, and a renamed part breaks the bindings of the boards it is already placed on.',
       '- On the catalog nothing is open. To read an existing figure, find the id of the name or type the person said with `listFigures`; ask which figure only when it is ambiguous. To revise an existing figure, tell the person to open it in the modeller and ask there. For a new figure, do not read existing sources: call `proposeFigureCandidate` with create: true.',
       '- Do not invent type names; check them with `listFigures`. **A type name is a stored identifier**, and boards find the figure by it. A new figure\'s type is set by a person at its first save.',

package/translations/en.json

@@ -1,14 +1,14 @@
 {
   "error.figure-proposal-failed": "The figure could not be made.",
   "error.figure-release-does-not-compile": "the released source of {type} (version {version}) does not compile. open it in the modeller, fix it and release it again before it draws on a board.",
-  "figure.gate.occupancy-empty-axis.message": "The declared space is empty on {axis}.",
-  "figure.gate.occupancy-undeclared.how": "Use \"fit to parts\" to declare the space from the parts as they are now.",
-  "figure.gate.occupancy-undeclared.how-no-parts": "Add a shape first, then use \"fit to parts\" to declare the space from it.",
-  "figure.gate.occupancy-undeclared.message": "This figure has not declared the space it takes up.",
-  "figure.gate.occupancy-undeclared.why": "Without a declared space the scale a figure is placed at cannot be set.",
-  "figure.gate.part-outside-occupancy.how": "Use \"fit to parts\" to declare the space from the parts again, or move '{part}' {mm} mm inward on {axis}.",
-  "figure.gate.part-outside-occupancy.message": "'{part}' goes {mm} mm past the declared space on {axis}.",
-  "figure.gate.part-outside-occupancy.why": "The declared space sets the scale a figure is placed at. What lies past it is left out of that scale, so on a board this part lands outside the place given to the figure.",
+  "figure.gate.occupancy-empty-axis.message": "The space the figure takes is empty on {axis}.",
+  "figure.gate.occupancy-undeclared.how": "Use \"fit to parts\" to set the space the figure takes from the parts as they are now.",
+  "figure.gate.occupancy-undeclared.how-no-parts": "Add a shape first, then use \"fit to parts\" to set the space the figure takes from it.",
+  "figure.gate.occupancy-undeclared.message": "The space this figure takes is not set yet.",
+  "figure.gate.occupancy-undeclared.why": "The space a figure takes sets the scale it is placed at on a board.",
+  "figure.gate.part-outside-occupancy.how": "Use \"fit to parts\" to fit the space the figure takes to the parts again, or move '{part}' {mm} mm inward on {axis}.",
+  "figure.gate.part-outside-occupancy.message": "'{part}' goes {mm} mm past the space the figure takes on {axis}.",
+  "figure.gate.part-outside-occupancy.why": "The space the figure takes sets the scale it is placed at. What lies past it is left out of that scale, so on a board this part lands outside the place given to the figure.",
   "figure.gate.parts-off-placement-face.how": "Move '{part}' {mm} mm on Y so the face meets the plane, or choose a different mounting face.",
   "figure.gate.parts-off-placement-face.message": "The mounting face of '{part}' is {mm} mm off the plane the figure stands on.",
   "figure.gate.parts-off-placement-face.why": "The figure is declared to stand on that face. If the face does not reach the plane, the figure floats on the board by that much, and whatever is placed on it floats too.",
@@ -23,7 +23,7 @@
   "figure.gate.placement-face-tilted.why": "A tilted face cannot lie on the plane, so how the figure stands is not settled.",
   "figure.gate.state-range-sampled.how": "To cover the whole range, re-author what could not be proven.",
   "figure.gate.state-range-sampled.message": "The whole range of sizes and motion could not be proven, so {states} combinations of size and pose were checked.",
-  "figure.gate.state-range-sampled.why": "Between the combinations that were checked, a part may still go past the declared space.",
+  "figure.gate.state-range-sampled.why": "Between the combinations that were checked, a part may still go past the space the figure takes.",
   "figure.gate.type-is-placeholder.how": "Set the type in the type field, then publish.",
   "figure.gate.type-is-placeholder.message": "'{type}' is a temporary type given when the figure was first saved.",
   "figure.gate.type-is-placeholder.why": "Boards call a figure by its type, and it cannot change once the figure is published.",

package/translations/ko.json

@@ -1,14 +1,14 @@
 {
   "error.figure-proposal-failed": "도형을 만들지 못했습니다.",
   "error.figure-release-does-not-compile": "{type} 의 발행판({version})이 지금 컴파일되지 않습니다. 저작 화면에서 열어 수정한 후 다시 발행해야 보드에 나옵니다.",
-  "figure.gate.occupancy-empty-axis.message": "공간 선언의 {axis} 가 비어 있습니다.",
-  "figure.gate.occupancy-undeclared.how": "「부품에 맞추기」를 누르면 지금 부품으로 공간을 선언합니다.",
-  "figure.gate.occupancy-undeclared.how-no-parts": "먼저 도형을 추가한 뒤, 「부품에 맞추기」로 공간을 선언하세요.",
-  "figure.gate.occupancy-undeclared.message": "이 도형은 차지하는 공간을 아직 선언하지 않았습니다.",
-  "figure.gate.occupancy-undeclared.why": "공간 선언이 없으면 도면에 놓일 때의 배율을 정할 수 없습니다.",
-  "figure.gate.part-outside-occupancy.how": "「부품에 맞추기」로 공간을 부품에서 다시 선언하거나, '{part}' 부품을 {axis} 로 {mm}mm 안으로 옮기세요.",
-  "figure.gate.part-outside-occupancy.message": "'{part}' 부품이 공간 선언을 {axis} 로 {mm}mm 넘습니다.",
-  "figure.gate.part-outside-occupancy.why": "공간 선언이 도면에 놓일 때의 배율을 정합니다. 넘은 만큼은 그 배율에 들어가지 않아서, 도면에서 이 부품이 도형에 주어진 자리 밖으로 나갑니다.",
+  "figure.gate.occupancy-empty-axis.message": "차지하는 공간의 {axis} 가 비어 있습니다.",
+  "figure.gate.occupancy-undeclared.how": "「부품에 맞추기」를 누르면 지금 부품으로 차지하는 공간을 정합니다.",
+  "figure.gate.occupancy-undeclared.how-no-parts": "먼저 도형을 추가한 뒤, 「부품에 맞추기」로 차지하는 공간을 정하세요.",
+  "figure.gate.occupancy-undeclared.message": "이 도형은 차지하는 공간을 아직 정하지 않았습니다.",
+  "figure.gate.occupancy-undeclared.why": "도면에 놓일 때의 배율은 차지하는 공간으로 정합니다.",
+  "figure.gate.part-outside-occupancy.how": "「부품에 맞추기」로 차지하는 공간을 지금 부품에 다시 맞추거나, '{part}' 부품을 {axis} 로 {mm}mm 안으로 옮기세요.",
+  "figure.gate.part-outside-occupancy.message": "도형이 차지하는 공간을 '{part}' 부품이 {axis} 로 {mm}mm 넘습니다.",
+  "figure.gate.part-outside-occupancy.why": "도면에 놓일 때의 배율은 차지하는 공간으로 정합니다. 넘은 만큼은 그 배율에 들어가지 않아서, 도면에서 이 부품이 도형에 주어진 자리 밖으로 나갑니다.",
   "figure.gate.parts-off-placement-face.how": "'{part}' 부품을 Y 로 {mm}mm 옮겨 그 면을 평면에 맞추거나, 장착면을 다른 면으로 다시 정하세요.",
   "figure.gate.parts-off-placement-face.message": "장착면으로 정한 '{part}' 부품의 면이 놓이는 평면에서 {mm}mm 떨어져 있습니다.",
   "figure.gate.parts-off-placement-face.why": "도형은 그 면으로 놓인다고 선언돼 있습니다. 닿지 않으면 도면에서 그만큼 떠 보이고, 자리에 놓인 물건도 함께 뜹니다.",
@@ -23,7 +23,7 @@
   "figure.gate.placement-face-tilted.why": "기운 면은 평면에 닿을 수 없어서, 도형이 어떤 자세로 놓이는지 정해지지 않습니다.",
   "figure.gate.state-range-sampled.how": "범위 전체를 보장하려면 증명하지 못한 항목을 다시 저작하세요.",
   "figure.gate.state-range-sampled.message": "크기와 움직임의 범위 전체를 증명하지 못해 크기·자세 조합 {states}개만 검사했습니다.",
-  "figure.gate.state-range-sampled.why": "검사한 조합 사이에서 부품이 공간 선언을 넘을 수 있습니다.",
+  "figure.gate.state-range-sampled.why": "검사한 조합 사이에서 부품이 도형이 차지하는 공간 밖으로 나갈 수 있습니다.",
   "figure.gate.type-is-placeholder.how": "타입 항목에 도형 타입을 지정한 후 발행해 주세요.",
   "figure.gate.type-is-placeholder.message": "'{type}' 타입은 처음 저장할 때 붙은 임시 타입입니다.",
   "figure.gate.type-is-placeholder.why": "보드는 이 타입으로 도형을 부르고, 발행한 뒤에는 바꿀 수 없습니다.",