修复字段写错的bug

README.md

@@ -164,11 +164,11 @@ $$
 
 ## 📊 评测榜单 (Leaderboard)
 
-| 模型 (Model) | 加权准确率 (Weighted Acc) | 平均成功率 (Avg Success Ratio) | 备注 (Notes) |
-| :--- | :---: | :---: | :--- |
-| **Gemini-3-Pro-Preview** | **17.65%** | - | Retries: 3 |
-| **GLM-4.5V** | 16.18% | 21.25% | Retries: 3 |
-| **Qwen3-VL-32B-Instruct** | 13.24% | 23.75% | Retries: 3 |
+| 模型 (Model) | 加权准确率 (Weighted Acc) | 备注 (Notes) |
+| :--- | :---: | :--- |
+| **Gemini-3-Pro-Preview** | **17.65%** | Retries: 3 |
+| **GLM-4.5V** | 16.18% | Retries: 3 |
+| **Qwen3-VL-32B-Instruct** | 13.24% | Retries: 3 |
 
 *注：数据更新于 2026-01-31，基于 v1.0 数据集 (20题).*
 

README_EN.md

@@ -143,11 +143,11 @@ $$
 
 ## 📊 Leaderboard
 
-| Model | Weighted Accuracy | Avg Success Ratio | Notes |
-| :--- | :---: | :---: | :--- |
-| **Gemini-3-Pro-Preview** | **17.65%** | - | Retries: 3 |
-| **GLM-4.5V** | 16.18% | 21.25% | Retries: 3 |
-| **Qwen3-VL-32B-Instruct** | 13.24% | 23.75% | Retries: 3 |
+| Model | Weighted Accuracy | Notes |
+| :--- | :---: | :--- |
+| **Gemini-3-Pro-Preview** | **17.65%** | Retries: 3 |
+| **GLM-4.5V** | 16.18% | Retries: 3 |
+| **Qwen3-VL-32B-Instruct** | 13.24% | Retries: 3 |
 
 *Note: Data updated on 2026-01-31, based on v1.0 dataset (20 tasks).*
 

run_eval.py

@@ -110,7 +110,7 @@ def apply_standard_load(model):
             "wStart": 10,
             "wEnd": 10,
             "angleDeg": 270, # 向下
-            "angleMode": "global"
+            "angleMode": "world"
         })
     return model
 
@@ -409,4 +409,4 @@ def main():
     print(f"Results saved to {output_filename}")
 
 if __name__ == "__main__":
-    main()
+    main()

src/prompts.py

@@ -4,23 +4,44 @@
 # 1. 标准模式 (Standard)
 # ==============================================================================
 PROMPT_STANDARD = """
-You are a structural engineering expert. 
-Convert the 2D image into FEA JSON. 
+You are a structural engineering expert (结构工程专家). 
+Convert the 2D image into FEA JSON (有限元分析JSON). 
 
 ### JSON Output Schema
 <json>
 {
-  "points": [{"id": "P1", "x": 0, "y": 0}, ...],
+  "points": [
+    {"id": "P1", "x": 0, "y": 0},
+    {"id": "P2", "x": 6, "y": 0},
+    {"id": "P3", "x": 3, "y": 4}
+  ],
   "links": [
     {
-      "id": "L1", "a": "P1", "b": "P2", "endA": "rigid", "endB": "rigid",
+      "id": "L1", "a": "P1", "b": "P2",
+      "endA": "rigid", "endB": "rigid",
+      "E": 80918000, "A": 0.00785398, "Iz": 0.00000491, "density": 7850
+    },
+    {
+      "id": "L2", "a": "P2", "b": "P3",
       "E": 80918000, "A": 0.00785398, "Iz": 0.00000491, "density": 7850
     }
   ],
-  "supports": [{"id": "S1", "at": {"type": "point", "id": "P1"}, "kind": "pin", "angleDeg": 0}, ...],
+  "supports": [
+    {"id": "S1", "at": {"type": "point", "id": "P1"}, "kind": "pin", "angleDeg": 0},
+    {"id": "S2", "at": {"type": "point", "id": "P3"}, "kind": "roller", "angleDeg": 0}
+  ],
   "loads": [
     {
       "id": "LD1",
+      "kind": "pointLoad",
+      "at": {"type": "point", "id": "P2"},
+      "value": 20,
+      "angleMode": "world",
+      "angleDeg": 270,
+      "flip": 1
+    },
+    {
+      "id": "LD2",
       "kind": "distributedLoad",
       "at": {"type": "link", "id": "L1"},
       "wStart": 10,
@@ -30,126 +51,132 @@ Convert the 2D image into FEA JSON.
       "angleMode": "world",
       "angleDeg": 270,
       "flip": 1
+    },
+    {
+      "id": "LD3",
+      "kind": "pointLoad",
+      "at": {"type": "link", "id": "L1"},
+      "value": 8,
+      "angleMode": "relative",
+      "angleDeg": 270,
+      "flip": 1,
+      "refEnd": "A",
+      "offsetMode": "percent",
+      "offsetPercent": 50,
+      "offset": 3
+    },
+    {
+      "id": "LD4",
+      "kind": "bendingMoment",
+      "at": {"type": "link", "id": "L2"},
+      "value": 12,
+      "flip": -1,
+      "refEnd": "A",
+      "offsetMode": "m",
+      "offset": 1.5
     }
   ]
 }
 </json>
 
 ### Rules
-1. **CONNECTIVITY IS MANDATORY:** 
-    - Every Point MUST be connected to at least one Link. 
+1. **CONNECTIVITY IS MANDATORY (连通性为强制要求):** - Every Point (节点) MUST be connected to at least one Link (杆件). 
     - No "floating" or "orphan" nodes allowed (e.g., do not define P3 if it is not part of any Link).
     - Ensure the entire structure forms a single connected graph.
-2. **LINK ENDS:**
-    - **Default:** `rigid-rigid` (even for Trusses).
-    - **Hinge Circles:** If a link ends at a hinge circle, set that end to `hinge`.
-    - **Allowed Combinations:** `rigid-rigid`, `rigid-hinge`, `hinge-rigid`.
-    - **FORBIDDEN:** `hinge-hinge` is NOT allowed.
-3. **JOINT LOGIC:** If N links meet at a hinge circle, set `hinge` for N-1 links (keep 1 rigid to stabilize).
-    - **Split Rule:** If a hinge exists along a member with a distributed load, **SPLIT** the member into two Links and **SPLIT** the load into two separate `distributedLoad` entries.
-4. **NO HINGES AT SUPPORTS:** Link ends at supports MUST be `rigid`.
-5. **SUPPORTS:** Allowed `kind` values are:
-    - `"pin"`: Pinned support (UX, UY restricted).
-    - `"roller"`: Roller support (UY restricted if angle is 0).
-    - `"fixed"`: Fixed/Cantilever support (UX, UY, RZ restricted).
-    - `"slider"`: Slider support (UX, RZ restricted).
-    - **Note:** Do NOT use `"hinge"` as a support `kind`. Use `"pin"` instead.
-6. **LOADS:** 
-    - **MUST use `kind` (NOT `type`).** IDs must start with "LD" (e.g., "LD1").
+2. **LINK ENDS & TRUSS OVERRIDE (杆件端点约束与桁架覆盖规则 - 关键):**
+    - **TRUSS OVERRIDE (纯桁架覆盖):** If the image is a pure truss (桁架 - a triangulated framework with loads only at joints / 仅在节点受力的三角框架), IGNORE all visual hinge circles (忽略图中所有铰接圆圈). **Prefer omitting `"endA"`/`"endB"` for all links; if you keep them, both must be `"rigid"` (优先省略 endA/endB；若保留，必须两端均为 rigid).**
+    - **Default (Non-Truss / 非桁架默认):** `rigid-rigid` (刚接-刚接). You CAN OMIT the `"endA"` and `"endB"` fields if both ends are rigid (如果两端均为刚接，允许完全省略这两个字段).
+    - **Hinge Circles (铰接圆圈):** If a link ends at a hinge circle (在框架/梁中的铰接点), set that end to `hinge` (铰接).
+    - **Allowed Combinations (允许的组合):** `rigid-rigid` (刚接), `rigid-hinge` (刚接-铰接), `hinge-rigid` (铰接-刚接).
+    - **FORBIDDEN (严禁):** `hinge-hinge` (两端均为铰接) is NOT allowed.
+3. **IGNORE ANNOTATIONS (忽略文字标注):** Ignore text labels, letters (e.g., "X", "A", "B"), or cut-lines indicating textbook questions ("solve for internal force of member X" / 求解某杆件内力等截断线). Do NOT model them as structural links (不要将标注建模为结构杆件).
+4. **JOINT LOGIC (节点逻辑):** If N links meet at a hinge circle (N根杆交于一铰接点), set `hinge` for N-1 links (keep 1 rigid to stabilize / 保持1根刚接以维持稳定).
+    - **Split Rule (拆分规则):** If a hinge exists along a member with a distributed load (如果在带有均布荷载的杆件中间出现铰接), **SPLIT** the member into two Links (将杆件拆分为两根) and **SPLIT** the load into two separate `distributedLoad` entries (将荷载拆分为两段).
+5. **NO HINGES AT SUPPORTS (支座处无铰接):** Link ends at supports MUST be `rigid` (连接到支座的杆件端点必须为刚接).
+6. **SUPPORTS (支座):** Allowed `kind` values are:
+    - `"pin"`: Pinned support (固定铰支座, UX, UY restricted / 限制水平和竖向位移).
+    - `"roller"`: Roller support (滚动支座/可动铰支座, UY restricted if angle is 0. For vertical wall, use 90 or 270).
+    - `"fixed"`: Fixed/Cantilever support (固定端支座/悬臂端, UX, UY, RZ restricted / 限制所有位移和转角).
+    - `"slider"`: Slider support (滑动导向支座/定向支座, UX, RZ restricted).
+    - **Note:** Do NOT use `"hinge"` as a support `kind`. Use `"pin"` instead (严禁用 "hinge" 作为支座类型，请使用 "pin").
+7. **LOADS (荷载):** - **MUST use `kind` (NOT `type`).** IDs must start with "LD" (e.g., "LD1"). Do NOT add random fields. Optional `angleWorldDeg` is allowed when `angleMode` is `"world"`.
     - **Target (`at`):** Can be `{"type": "point", "id": "P1"}` or `{"type": "link", "id": "L1"}`.
-    - `kind: "pointLoad"`: Use `value`, `angleDeg`, `angleMode`, `flip`.
-    - `kind: "distributedLoad"`: Use `wStart`, `wEnd`, `fromStart`, `fromEnd`, `angleDeg`, `angleMode`, `flip`.
-    - `kind: "bendingMoment"`: Use `value`, `flip` (**-1: Clockwise, 1: Counter-Clockwise**). (NO angle fields).
-    - **Link-Specific:** If `at` is a `link`, `pointLoad` and `bendingMoment` MUST include:
-        - `offset` (meters)
-        - `offsetMode` ("length" or "percent")
+    - `kind: "pointLoad"` (集中力/集中荷载): Use `value`, `angleDeg`, `angleMode` ("relative" or "world"), `flip`. (Downward point loads MUST be `angleDeg: 270` if using "world" / 若使用world坐标系，竖直向下必须为 270).
+    - `kind: "distributedLoad"` (均布荷载): Use `wStart`, `wEnd`, `fromStart`, `fromEnd`, `angleDeg`, `angleMode` ("relative" or "world"), `flip`.
+    - `kind: "bendingMoment"` (弯矩/集中偶矩): Use `value`, `flip` (**-1: Clockwise / 顺时针, 1: Counter-Clockwise / 逆时针**). (NO angle fields).
+    - **Link-Specific (作用于杆件上的荷载):** If `at` is a `link`, `pointLoad` and `bendingMoment` MUST include:
+        - `offset` (偏移量, meters)
+        - `offsetMode` ("m" or "percent")
         - `offsetPercent` (required if `offsetMode` is "percent")
         - `refEnd` ("A" or "B")
-    - **AngleMode:** Use "world". 
     - **Flip:** Must be 1 or -1.
-6. **UNITS:** 
-    - Forces: **kN** (e.g., 10, not 10000).
-    - Distributed Loads: **kN/m**.
-    - Moments: **kN·m**.
-7. **Properties:** E: 80918000, A: 0.00785398, Iz: 0.00000491, density: 7850.
-8. **NO COMMENTS:** Do NOT include comments (e.g., // or /* */) inside the JSON. Standard JSON only.
+8. **UNITS (单位):** - Forces (力): **kN** (e.g., 10, not 10000).
+    - Distributed Loads (均布荷载): **kN/m**.
+    - Moments (弯矩): **kN·m**.
+9. **Properties & Multipliers (截面属性与刚度倍数):** Base values: "E": 80918000, "A": 0.00785398, "Iz": 0.00000491, "density": 7850.
+    - **CRITICAL:** If a link explicitly shows a stiffness multiplier in the image (e.g., "2EI", "3EA"), you MUST multiply the base property by that factor (e.g., For "2EI", output `"E": 161836000`). (如果图中杆件标有 2EI、3EA 等刚度倍数，必须将基准值乘以对应倍数).
+10. **STRICT JSON VALUES (严格JSON值):** Do NOT include comments (e.g., // or /* */) inside the JSON. ALL values must be final computed numbers (e.g., `8.66`). Do NOT output math formulas, fractions, or trigonometric functions (like `10*cos(30)`, `sin`, `sqrt`) inside the JSON (JSON内严禁出现推导过程、数学公式或sin/cos等三角函数，必须直接输出最终计算得出的纯数字). Standard JSON only.
 """
 
 # ==============================================================================
 # 2. 推理/高阶模式 (Reasoning/CoT)
 # ==============================================================================
-PROMPT_REASONING = """You are a "Structural Image → JSON" converter.
+PROMPT_REASONING = """You are a "Structural Image → JSON" converter (结构图纸到JSON的转换专家).
 
-# CORE STRATEGY: CONNECTIVITY & TOPOLOGY
+# CORE STRATEGY: CONNECTIVITY & TOPOLOGY (核心策略：连通性与拓扑)
 
-1.  **NO ORPHAN NODES:**
-    *   **Rule:** Every Point ID defined in `"points"` MUST appear as either `a` or `b` in the `"links"` array.
-    *   **Check:** Do not create intermediate points (like P2, P3) if they are just floating in space. They must connect members.
-    *   **Structure:** The final result must be a single coherent structure, not disjoint parts.
+1.  **NO ORPHAN NODES (禁止孤立节点):**
+    * **Rule:** Every Point ID defined in `"points"` MUST appear as either `a` or `b` in the `"links"` array.
+    * **Check:** Do not create intermediate points (like P2, P3) if they are just floating in space. They must connect members (节点必须用于连接杆件).
+    * **Structure:** The final result must be a single coherent structure, not disjoint parts.
 
-2. **DEFAULT: RIGID-RIGID**
-    -   Use `rigid-rigid` generally (including Trusses).
-    -   **Explicit Hinges:** Use `rigid-hinge` or `hinge-rigid`.
-    -   **Constraint:** `hinge-hinge` is **FORBIDDEN**.
-    -   **Support Ends:** ALWAYS Rigid.
+2. **LINK ENDS & TRUSS OVERRIDE (杆件端点与桁架覆盖):**
+    -   **Pure Truss Override (纯桁架覆盖):** For trusses (桁架), IGNORE ALL visual hinges. **Prefer omitting `"endA"` and `"endB"`; if present, both must be `"rigid"`** (优先省略；若保留，两端必须 rigid).
+    -   **General Default (一般默认):** `rigid-rigid` (刚接-刚接). You CAN OMIT `"endA"` and `"endB"` if both ends are rigid.
+    -   **Explicit Hinges (明确的铰接点):** Use `rigid-hinge` or `hinge-rigid`.
+    -   **Constraint (限制):** `hinge-hinge` (两端全铰接) is **FORBIDDEN**.
+    -   **Support Ends (支座连接端):** ALWAYS Rigid (必须为刚接).
 
-3. **SUPPORTS:** Allowed `kind` values are:
-    - `"pin"`, `"roller"`, `"fixed"`, `"slider"`.
+3. **JOINT LOGIC (节点铰接逻辑，非桁架):**
+    - If N links meet at one hinge circle, set `hinge` on N-1 links and keep 1 link `rigid` for stability (N根杆汇交于同一铰点时，N-1 根设为 hinge，保留 1 根 rigid 以维持稳定).
+
+4. **IGNORE ANNOTATIONS (忽略图纸标注):** -   Letters (like "X", "A", "B"), text, or cut-lines (截断线) are textbook markers. DO NOT model them as physical links (切勿建模为物理杆件).
+
+5. **GEOMETRY DEDUCTION (几何推导):**
+    -   In `<think>`, mathematically deduce node coordinates (推导节点坐标). Use dimensions (e.g., total length 8m) and angles (e.g., 45° implies width = height) to calculate exact (x,y) values.
+
+6. **SUPPORTS (支座类型):** Allowed `kind` values are:
+    - `"pin"` (固定铰支座), `"roller"` (滚动支座/可动铰支座), `"fixed"` (固定端支座), `"slider"` (滑动导向支座/定向支座).
     - **Do NOT use `"hinge"` as a support kind.**
 
-4.  **LOAD SCHEMA (Strict):**
-    *   **MUST use `kind` (NOT `type`).** IDs must start with "LD" (e.g., "LD1").
-    *   `kind: "pointLoad"`: Fields `id`, `kind`, `at`, `value`, `angleMode` ("world"), `angleDeg`, `flip` (1/-1).
-    *   `kind: "distributedLoad"`: Fields `id`, `kind`, `at`, `wStart`, `wEnd`, `fromStart`, `fromEnd`, `angleMode` ("world"), `angleDeg`, `flip` (1/-1).
-    *   `kind: "bendingMoment"`: Fields `id`, `kind`, `at`, `value`, `flip` (-1: CW, 1: CCW).
-    *   Link Loads: Add `refEnd`, `offset`, `fromStart`, `fromEnd` as needed.
+7.  **LOAD SCHEMA (荷载规范 - 严格):**
+    * **MUST use `kind` (NOT `type`).** IDs must start with "LD" (e.g., "LD1"). Do NOT add random fields. Optional `angleWorldDeg` is allowed when `angleMode` is `"world"`.
+    * `kind: "pointLoad"` (集中力): Fields `id`, `kind`, `at`, `value`, `angleMode` ("relative" or "world"), `angleDeg` (Downward/向下 = 270 if "world"), `flip` (1/-1).
+    * `kind: "distributedLoad"` (均布荷载): Fields `id`, `kind`, `at`, `wStart`, `wEnd`, `fromStart`, `fromEnd`, `angleMode` ("relative" or "world"), `angleDeg`, `flip` (1/-1).
+    * `kind: "bendingMoment"` (弯矩): Fields `id`, `kind`, `at`, `value`, `flip` (-1: CW / 顺时针, 1: CCW / 逆时针).
+    * Link-target `pointLoad` / `bendingMoment` (杆件受集中力/弯矩): add `refEnd`, `offset`, `offsetMode` (`"m"` or `"percent"`), and `offsetPercent` when `offsetMode` is `"percent"`.
+    * `fromStart` / `fromEnd` are for `distributedLoad` only.
 
-4.  **SPLIT AT HINGES:**
-    *   If a hinge is located in the middle of a beam:
-    *   **Split the Link:** Create two links meeting at the hinge point.
-    *   **Split the Load:** Create two `distributedLoad` entries (one for each link).
+8.  **SPLIT AT HINGES (在中间铰接处拆分):**
+    * If a hinge is located in the middle of a beam (若梁中间出现铰接):
+    * **Split the Link (拆分杆件):** Create two links meeting at the hinge point.
+    * **Split the Load (拆分荷载):** Create two `distributedLoad` entries (one for each link).
 
-# DATA DEFINITIONS
-- **Units:** Forces in **kN**, Distributed loads in **kN/m**, Moments in **kN·m**. Use small values (e.g., 10, not 10000).
-- **Links:** Must include E: 80918000, A: 0.00785398, Iz: 0.00000491, density: 7850.
-- **No Comments:** JSON must be strict. No // comments.
+# DATA DEFINITIONS (数据定义)
+- **Units (单位):** Forces in **kN** (力), Distributed loads in **kN/m** (均布荷载), Moments in **kN·m** (弯矩). Use small values (e.g., 10, not 10000).
+- **Properties & Multipliers (截���属性与刚度倍数):** Base values: E: 80918000, A: 0.00785398, Iz: 0.00000491, density: 7850. **Multiply base values if the image shows multipliers like "2EI" (e.g., E becomes 161836000)**.
+- **Strict JSON Values (严格JSON值):** JSON must be strict. No // comments. ALL values must be final computed numbers. NO math expressions (e.g., `10*cos(30)`, `sin`) inside the JSON (JSON内严禁出现推导过程、公式或sin/cos，仅允许填写最终计算出来的纯数字).
 
 # OUTPUT FORMAT
 <think>
-1. **Nodes:** List coordinates. Verify every node is part of a link.
-2. **Links:** Define connections. Ensure P_start to P_end connectivity.
-3. **Supports/Loads:** Add boundary conditions.
+1. **Geometry:** Deduce coordinates mathematically (计算坐标).
+2. **Nodes:** List coordinates. Verify every node is part of a link.
+3. **Ignore Labels:** Exclude textbook cut-lines or "X" marks.
+4. **Links:** Define connections. For pure truss, prefer omitting end fields; if kept, use rigid-rigid only. Ensure P_start to P_end connectivity. Multiply EI/EA if needed.
+5. **Supports/Loads:** Add boundary conditions (添加边界条件与荷载).
 </think>
 <json> ... </json>
-
-<think>
-* Nodes: P1(0,0), P2(5,0), P3(10,0).
-* Connectivity Check:
-  - L1 connects P1-P2.
-  - L2 connects P2-P3.
-  - All nodes (P1, P2, P3) are used. Structure is continuous.
-* Joint P2: Rigid continuous connection.
-* Supports: P1(Pin), P3(Roller).
-</think>
-
-<json>
-{
-  "points": [
-    { "id": "P1", "x": 0, "y": 0 },
-    { "id": "P2", "x": 5, "y": 0 },
-    { "id": "P3", "x": 10, "y": 0 }
-  ],
-  "links": [
-    { "id": "L1", "a": "P1", "b": "P2", "endA": "rigid", "endB": "rigid", "E": 80918000, "A": 0.00785398, "Iz": 0.00000491, "density": 7850 },
-    { "id": "L2", "a": "P2", "b": "P3", "endA": "rigid", "endB": "rigid", "E": 80918000, "A": 0.00785398, "Iz": 0.00000491, "density": 7850 }
-  ],
-  "supports": [
-    { "id": "S1", "at": { "type": "point", "id": "P1" }, "kind": "pin", "angleDeg": 0 },
-    { "id": "S2", "at": { "type": "point", "id": "P3" }, "kind": "roller", "angleDeg": 0 }
-  ],
-  "loads": []
-}
-</json>"""
+"""
 
 # ==============================================================================
 # 3. 严格模式 (Strict)
@@ -158,26 +185,60 @@ PROMPT_STRICT = """
 Output structural JSON inside <json> tags.
 
 **STRICT RULES:**
-1. **CONNECTIVITY:** Every Point MUST connect to a Link. No orphan nodes.
-2. **LINKS:** Default `rigid-rigid`.
-3. **HINGES:** Use `rigid-hinge` or `hinge-rigid` for hinge circles. **NO `hinge-hinge`.** Split links/loads at internal hinges.
-4. **SUPPORTS:** Link ends at supports MUST be `rigid`. Allowed kinds: `pin`, `roller`, `fixed`, `slider`. **NO `hinge`.**
-5. **LOADS:** 
-    - **MUST use `kind` (NOT `type`).** IDs must start with "LD".
-    - `kind: "pointLoad"`: Use `value`, `angleDeg`, `angleMode` ("world"), `flip` (1 or -1).
-    - `kind: "distributedLoad"`: Use `wStart`, `wEnd`, `fromStart`, `fromEnd`, `angleDeg`, `angleMode` ("world"), `flip` (1 or -1).
-    - `kind: "bendingMoment"`: Use `value`, `flip` (-1: Clockwise, 1: Counter-Clockwise).
-    - **Link Loads:** If `at.type` is "link", `pointLoad`/`bendingMoment` MUST have `offset`, `offsetMode` ("length" or "percent"), `refEnd` ("A"/"B").
-6. **UNITS:** Forces: **kN**, Distributed: **kN/m**, Moments: **kN·m**.
-7. **PROPERTIES:** "E": 80918000, "A": 0.00785398, "Iz": 0.00000491, "density": 7850.
-8. **NO COMMENTS:** Standard JSON only. No // or /* */ allowed.
+1. **CONNECTIVITY (连通性):** Every Point MUST connect to a Link. No orphan nodes (禁止孤立节点).
+2. **TRUSS OVERRIDE (桁架覆盖):** For pure trusses (纯桁架), IGNORE visual hinges. **Prefer omitting `"endA"` and `"endB"`; if present, both must be `"rigid"`** (优先省略；若保留，两端必须 rigid).
+3. **LINKS (非桁架杆件):** Default `rigid-rigid` (刚接, **CAN OMIT `"endA"` and `"endB"`** if both are rigid). Use `rigid-hinge` or `hinge-rigid` for valid hinge circles (铰接点). **NO `hinge-hinge` (严禁两端铰接).**
+4. **JOINT LOGIC (节点铰接逻辑，非桁架):** If N links meet at one hinge circle, set `hinge` on N-1 links and keep 1 link `rigid` (N根杆交于同一铰点时，N-1 根设为 hinge，保留 1 根 rigid). Split links/loads at internal hinges (若梁中间有铰接必须将杆件和荷载拆分).
+5. **IGNORE LABELS (忽略标注):** Ignore "X" marks, letters, and cut-lines. They are not structural members.
+6. **SUPPORTS (支座):** Link ends at supports MUST be `rigid`. Allowed kinds: `pin` (固定铰支座), `roller` (滚动支座/可动铰支座), `fixed` (固定端支座), `slider` (滑动导向支座/定向支座). **NO `hinge` (严禁使用hinge作为支座).**
+7. **LOADS (荷载):** - **MUST use `kind` (NOT `type`).** IDs must start with "LD". Do NOT add random fields. Optional `angleWorldDeg` is allowed when `angleMode` is `"world"`.
+    - `kind: "pointLoad"` (集中力): Use `value`, `angleDeg`, `angleMode` ("relative" or "world"), `flip` (1 or -1). Downward (向下) = 270° if "world".
+    - `kind: "distributedLoad"` (均布荷载): Use `wStart`, `wEnd`, `fromStart`, `fromEnd`, `angleDeg`, `angleMode` ("relative" or "world"), `flip` (1 or -1).
+    - `kind: "bendingMoment"` (弯矩): Use `value`, `flip` (-1: Clockwise / 顺时针, 1: Counter-Clockwise / 逆时针).
+    - **Link Loads (杆上荷载):** If `at.type` is "link", `pointLoad`/`bendingMoment` MUST have `offset` (偏移量), `offsetMode` ("m" or "percent"), `refEnd` ("A"/"B"), and `offsetPercent` when `offsetMode` is "percent".
+8. **UNITS (单位):** Forces: **kN**, Distributed: **kN/m**, Moments: **kN·m**.
+9. **PROPERTIES & MULTIPLIERS:** Base "E": 80918000, "A": 0.00785398, "Iz": 0.00000491, "density": 7850. **Multiply base property if labeled (e.g., "2EI" -> E=161836000)**.
+10. **STRICT JSON VALUES (严格JSON值):** Standard JSON only. No // or /* */ allowed. Values MUST be final computed numbers. NO math formulas or expressions (e.g., `sin`, `cos`, `10*1.5`) inside the JSON (严禁在JSON内写推导过程或数学公式，必须是最终得出的纯数字).
 
 <json>
 {
-  "points": [{"id": "P1", "x": 0, "y": 0}, {"id": "P2", "x": 2, "y": 0}],
-  "links": [{"id": "L1", "a": "P1", "b": "P2", "endA": "rigid", "endB": "rigid", "E": 80918000, "A": 0.00785398, "Iz": 0.00000491, "density": 7850}],
-  "supports": [{"id": "S1", "at": {"type": "point", "id": "P1"}, "kind": "fixed", "angleDeg": 0}],
-  "loads": []
+  "points": [
+    {"id": "P1", "x": 0, "y": 0},
+    {"id": "P2", "x": 8, "y": 0}
+  ],
+  "links": [
+    {"id": "L1", "a": "P1", "b": "P2", "E": 80918000, "A": 0.00785398, "Iz": 0.00000491, "density": 7850}
+  ],
+  "supports": [
+    {"id": "S1", "at": {"type": "point", "id": "P1"}, "kind": "pin", "angleDeg": 0},
+    {"id": "S2", "at": {"type": "point", "id": "P2"}, "kind": "roller", "angleDeg": 0}
+  ],
+  "loads": [
+    {
+      "id": "LD1",
+      "kind": "distributedLoad",
+      "at": {"type": "link", "id": "L1"},
+      "wStart": 10,
+      "wEnd": 10,
+      "fromStart": 0,
+      "fromEnd": 0,
+      "angleMode": "world",
+      "angleDeg": 270,
+      "flip": 1
+    },
+    {
+      "id": "LD2",
+      "kind": "pointLoad",
+      "at": {"type": "link", "id": "L1"},
+      "value": 5,
+      "angleMode": "relative",
+      "angleDeg": 270,
+      "flip": 1,
+      "refEnd": "A",
+      "offsetMode": "m",
+      "offset": 3
+    }
+  ]
 }
 </json>
 """
@@ -190,4 +251,4 @@ PROMPT_REGISTRY = {
     "reasoning": PROMPT_REASONING,
     "cot": PROMPT_REASONING,
     "strict": PROMPT_STRICT
-}
+}