@faicad/faijs 0.13.1 → 0.14.1

package/dist/fcstd/cli.js

@@ -0,0 +1,37 @@
+#!/usr/bin/env node
+/**
+ * fcstd CLI — batch driver entry: .FCStd → .fai.zip with a machine contract.
+ *
+ * Exit codes (plan §5.2):
+ *   0 = converted; mapping final check passed (only translated /
+ *       python-baked / preserved-only dispositions)
+ *   2 = translation gaps (non-Python baked) — NO zip written
+ *   1 = internal error (read/unpack/parse/codegen/container failure)
+ *
+ * stdout: exactly one JSON line (the summary). Human chatter is forbidden on
+ * stdout; diagnostics go to stderr (which must stay empty on success).
+ *
+ * Run (published):  faijs-fcstd-convert <in.FCStd> [out.fai.zip]
+ * Run (in-repo):    npm run fcstd:convert -w @faicad/faijs -- <in.FCStd> [out.fai.zip]
+ * With no <out>, acts as a dry audit (no file written).
+ */
+import { writeFileSync } from 'node:fs';
+import { convertFcstdFile } from './convert.js';
+const [input, output] = process.argv.slice(2);
+if (!input) {
+    console.error('usage: faijs-fcstd-convert <in.FCStd> [out.fai.zip]');
+    process.exit(1);
+}
+const summary = await convertFcstdFile(input);
+if (summary.ok && output && summary.zip) {
+    writeFileSync(output, summary.zip);
+}
+// stdout contract: ONE json line, no binary payload — zip bytes are stripped
+// before serialization (they are written to <out> above, never printed).
+const { zip: _zip, ...report } = summary;
+void _zip;
+console.log(JSON.stringify(report));
+if (!summary.ok) {
+    process.exit(summary.gaps.length > 0 ? 2 : 1);
+}
+//# sourceMappingURL=cli.js.map

package/dist/fcstd/cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/fcstd/cli.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;IACX,OAAO,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;AAC9C,IAAI,OAAO,CAAC,EAAE,IAAI,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACxC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC;AACD,6EAA6E;AAC7E,yEAAyE;AACzE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;AACzC,KAAK,IAAI,CAAC;AACV,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;AAEpC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;IAChB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC","sourcesContent":["#!/usr/bin/env node\n/**\n * fcstd CLI — batch driver entry: .FCStd → .fai.zip with a machine contract.\n *\n * Exit codes (plan §5.2):\n *   0 = converted; mapping final check passed (only translated /\n *       python-baked / preserved-only dispositions)\n *   2 = translation gaps (non-Python baked) — NO zip written\n *   1 = internal error (read/unpack/parse/codegen/container failure)\n *\n * stdout: exactly one JSON line (the summary). Human chatter is forbidden on\n * stdout; diagnostics go to stderr (which must stay empty on success).\n *\n * Run (published):  faijs-fcstd-convert <in.FCStd> [out.fai.zip]\n * Run (in-repo):    npm run fcstd:convert -w @faicad/faijs -- <in.FCStd> [out.fai.zip]\n * With no <out>, acts as a dry audit (no file written).\n */\nimport { writeFileSync } from 'node:fs';\nimport { convertFcstdFile } from './convert.js';\n\nconst [input, output] = process.argv.slice(2);\nif (!input) {\n  console.error('usage: faijs-fcstd-convert <in.FCStd> [out.fai.zip]');\n  process.exit(1);\n}\n\nconst summary = await convertFcstdFile(input);\nif (summary.ok && output && summary.zip) {\n  writeFileSync(output, summary.zip);\n}\n// stdout contract: ONE json line, no binary payload — zip bytes are stripped\n// before serialization (they are written to <out> above, never printed).\nconst { zip: _zip, ...report } = summary;\nvoid _zip;\nconsole.log(JSON.stringify(report));\n\nif (!summary.ok) {\n  process.exit(summary.gaps.length > 0 ? 2 : 1);\n}\n"]}

package/dist/fcstd/codegen.d.ts

@@ -6,13 +6,21 @@
  * heuristics — explicit downgrade per plan §12).
  * M5.2 lowering: params → JS constants; calls → `const partN = await cad.x(...)`;
  * statement ids sN. Sketch contours enter as blueprint literals.
+ *
+ * 本文件为 Placement 发射平台 `cad.place`（旋转四元数 + 平移，单点）、为产物聚合发射
+ * 平台 `cad.compound`（几何复合体，内核 `makeCompound`，持 OCCT 句柄）。这两个是 faijs
+ * 平台几何 op（H11，方案 §4），不再借用 `../3d_editor` 的 `cad.group` /
+ * `cad.translate` / `cad.rotate_euler`（编辑器交互 op，JSDoc 已 @deprecated）。
  */
 import type { FcstdDocument } from './document.js';
 import type { CadCall } from './feature-translate.js';
 import type { Contour } from './contour.js';
 import { type Placement } from './placement.js';
+/** Per-object codegen outcome: what was emitted for one FCStd object. */
 export interface GenObjectResult {
+    /** FCStd object name */
     name: string;
+    /** FCStd type id */
     type: string;
     /** variable name bound in generated code (partN) or undefined when baked */
     variable?: string;
@@ -26,6 +34,7 @@ export interface GenObjectResult {
         loopCount?: number;
     };
 }
+/** Full codegen output: lowered calls, per-object ledger and generated script(s). */
 export interface GenResult {
     /** ordered translated calls (dependency order) */
     calls: CadCall[];
@@ -46,6 +55,15 @@ export interface GenResult {
  * M5.1/M5.2 — translate every object in dependency order and lower to JS.
  * `sketchVerdict` supplies the M3 outcome per sketch object name; sketches
  * whose contour feeds a Pad/Pocket appear as inputs.
+ *
+ * @param doc parsed FCStd object graph to translate
+ * @param sketchVerdict per-sketch M3 verdict keyed by object name
+ * @param sketchContours solved contours per L0 sketch, keyed by object name
+ * @param baseName source base name used in generated file headers/labels
+ * @param placements per-object Placement used to re-orient placed geometry; missing → identity
+ * @param shapeCarriers objects whose Shape is a ZIP .brp member (pure-Shape carriers → shape-asset)
+ * @param brokenShapeAssets objects whose Shape `file` attribute points at a missing/empty member (explicit gap)
+ * @returns the lowered call plan, per-object dispositions and generated code
  */
 export declare function generateModel(doc: FcstdDocument, sketchVerdict: Map<string, {
     level: 'L0' | 'L1' | 'L2';
@@ -53,5 +71,9 @@ export declare function generateModel(doc: FcstdDocument, sketchVerdict: Map<str
     loopCount?: number;
 }>, sketchContours: Map<string, Contour[]>, baseName: string, 
 /** M8.3: per-object Placement (sketches + features); missing → identity */
-placements?: Map<string, Placement>): GenResult;
+placements?: Map<string, Placement>, 
+/** H7: objects whose Shape is a ZIP .brp member (pure-Shape carriers → shape-asset). */
+shapeCarriers?: ReadonlySet<string>, 
+/** E4: objects whose Shape `file` attribute points at a missing/empty member (explicit gap). */
+brokenShapeAssets?: ReadonlySet<string>): GenResult;
 //# sourceMappingURL=codegen.d.ts.map

package/dist/fcstd/codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../src/fcstd/codegen.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAoB,MAAM,wBAAwB,CAAC;AAExE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,KAAK,SAAS,EAA0C,MAAM,gBAAgB,CAAC;AAExF,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,WAAW,EAAE,YAAY,GAAG,OAAO,GAAG,gBAAgB,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7E;AAED,MAAM,WAAW,SAAS;IACxB,kDAAkD;IAClD,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,+EAA+E;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb;wFACoF;IACpF,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACtD,kFAAkF;IAClF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAqDD;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EAC9F,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EACtC,QAAQ,EAAE,MAAM;AAChB,2EAA2E;AAC3E,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAClC,SAAS,CA6UX"}
+{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../src/fcstd/codegen.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAoB,MAAM,wBAAwB,CAAC;AAExE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,KAAK,SAAS,EAA6C,MAAM,gBAAgB,CAAC;AAG3F,yEAAyE;AACzE,MAAM,WAAW,eAAe;IAC9B,wBAAwB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,WAAW,EAAE,YAAY,GAAG,OAAO,GAAG,gBAAgB,CAAC;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7E;AAED,qFAAqF;AACrF,MAAM,WAAW,SAAS;IACxB,kDAAkD;IAClD,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,+EAA+E;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb;wFACoF;IACpF,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACtD,kFAAkF;IAClF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAgED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE;IAAE,KAAK,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,EAC9F,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EACtC,QAAQ,EAAE,MAAM;AAChB,2EAA2E;AAC3E,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;AACnC,wFAAwF;AACxF,aAAa,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC;AACnC,gGAAgG;AAChG,iBAAiB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GACtC,SAAS,CAwZX"}

package/dist/fcstd/codegen.js

@@ -1,5 +1,6 @@
-import { translateObject, isJsExpr, jsExpr } from './feature-translate.js';
-import { isIdentityPlacement, quatToEulerXYZDeg } from './placement.js';
+import { translateObject, isJsExpr, jsExpr, BODY_CHAIN_BASE } from './feature-translate.js';
+import { isIdentityPlacement, invertApplyPlacement } from './placement.js';
+import { isNonModelingType } from './structural-types.js';
 /** Extract link dependencies relevant for ordering. */
 function depsOf(obj) {
     const out = [];
@@ -10,9 +11,21 @@ function depsOf(obj) {
         if (v)
             out.push(v);
     }
-    const shapes = obj.properties.get('Shapes')?.children[0];
-    if (shapes) {
-        for (const link of shapes.children) {
+    // GOTCHA (ArchDetail corpus, 2026-09-21): App::PropertyLinkList properties.
+    // `Shapes` is the multi-input geometry list (Part::MultiFuse / MultiCommon);
+    // `Links` is Part::Compound's member list. Neither is a single-value link
+    // property, so missing it here left the Compound with NO dependency on its
+    // members — Kahn then placed it at its document position, and ArchDetail's
+    // compounds sit at doc index 10-14 while every member sits at 269+ (Draft
+    // emits the wire first, the compound last, but the file order is sorted by
+    // name). inputVar() found nothing yet → `compound-missing-members` for all
+    // five compounds, for a pure ordering reason.
+    const linkLists = ['Shapes', 'Links'];
+    for (const p of linkLists) {
+        const el = obj.properties.get(p)?.children[0];
+        if (!el)
+            continue;
+        for (const link of el.children) {
             const v = link.attributes['value'];
             if (v)
                 out.push(v);
@@ -50,14 +63,45 @@ function bodyFeatureNames(obj) {
  * M5.1/M5.2 — translate every object in dependency order and lower to JS.
  * `sketchVerdict` supplies the M3 outcome per sketch object name; sketches
  * whose contour feeds a Pad/Pocket appear as inputs.
+ *
+ * @param doc parsed FCStd object graph to translate
+ * @param sketchVerdict per-sketch M3 verdict keyed by object name
+ * @param sketchContours solved contours per L0 sketch, keyed by object name
+ * @param baseName source base name used in generated file headers/labels
+ * @param placements per-object Placement used to re-orient placed geometry; missing → identity
+ * @param shapeCarriers objects whose Shape is a ZIP .brp member (pure-Shape carriers → shape-asset)
+ * @param brokenShapeAssets objects whose Shape `file` attribute points at a missing/empty member (explicit gap)
+ * @returns the lowered call plan, per-object dispositions and generated code
  */
 export function generateModel(doc, sketchVerdict, sketchContours, baseName, 
 /** M8.3: per-object Placement (sketches + features); missing → identity */
-placements) {
+placements, 
+/** H7: objects whose Shape is a ZIP .brp member (pure-Shape carriers → shape-asset). */
+shapeCarriers, 
+/** E4: objects whose Shape `file` attribute points at a missing/empty member (explicit gap). */
+brokenShapeAssets) {
     const byName = new Map(doc.objects.map((o) => [o.name, o]));
+    // GOTCHA (test_geomop corpus, 2026-09-20): a dependency on a Body
+    // CONTAINER (Part::Cut with Tool→Body) really waits for the Body's
+    // features to have built the chain — expand the dep to the member
+    // features so Kahn orders the consumer AFTER the chain exists (and
+    // chainVar.get(Body) resolves). Treating the container itself as
+    // satisfiable instead let the Cut run before the chain was built.
     const nodes = new Map();
     for (const obj of doc.objects) {
-        nodes.set(obj.name, { name: obj.name, obj, deps: new Set(depsOf(obj)) });
+        const deps = new Set();
+        for (const d of depsOf(obj)) {
+            const target = byName.get(d);
+            if (target?.type === 'PartDesign::Body') {
+                for (const m of bodyFeatureNames(target))
+                    if (byName.has(m))
+                        deps.add(m);
+            }
+            else {
+                deps.add(d);
+            }
+        }
+        nodes.set(obj.name, { name: obj.name, obj, deps });
     }
     // Kahn topological sort; objects with unbuilt deps fall back to insertion
     // order iteration until progress stalls (remaining are baked with reason).
@@ -86,7 +130,7 @@ placements) {
             const node = nodes.get(name);
             if (built.has(node.name))
                 continue;
-            if ([...node.deps].every((d) => built.has(d) || !byName.has(d))) {
+            if ([...node.deps].every((d) => built.has(d) || !byName.has(d) || byName.get(d).type === 'PartDesign::Body')) {
                 built.add(node.name);
                 order.push(node.name);
                 progress = true;
@@ -147,16 +191,28 @@ placements) {
             }
             continue;
         }
-        if (obj.type === 'App::Origin' || obj.type === 'App::Plane' || obj.type === 'App::Line') {
-            results.push({ name, type: obj.type, calls: [], disposition: 'preserved-only', reason: 'datum' });
+        // Non-modeling objects are preserved-only and MUST be short-circuited
+        // BEFORE translation. GOTCHA (PadTest, 2026-09-21): this used to list only
+        // `App::Origin/Plane/Line`, so a Body's `PartDesign::Plane` went through
+        // the translator, matched the shape-asset rule (datum planes store a
+        // `Shape` .brp — the plane face) and was folded into the Body's chain:
+        // `cad.union(pad, datumPlane)`. That both corrupts the solid and fails at
+        // run time (`cad.load` requires a solid; a plane face has none). The
+        // predicate is shared with the C4 audit (`structural-types.ts`) so codegen
+        // and the disposition ledger can never disagree about what is non-modeling.
+        if (isNonModelingType(obj.type)) {
+            results.push({ name, type: obj.type, calls: [], disposition: 'preserved-only', reason: 'structural' });
             continue;
         }
         // Sketches are now real face variables (see the Sketcher::SketchObject
         // branch above), so every dependency that resolves to one flows through.
         const verdict = translateObject(obj, (dep) => {
-            const v = variables.get(dep);
-            return v !== undefined ? v : undefined;
-        }, doc.objects);
+            // GOTCHA (test_geomop corpus, 2026-09-20): a dependency on a Body
+            // CONTAINER (Part::Cut with Tool→Body) resolves against the Body's
+            // accumulated chain head, not `variables` — the container name is
+            // never registered there (its result lives in chainVar).
+            return variables.get(dep) ?? chainVar.get(dep);
+        }, doc.objects, shapeCarriers, brokenShapeAssets);
         node.verdict = verdict;
         if (verdict.kind === 'translated') {
             // rename output vars to partN sequence
@@ -165,6 +221,15 @@ placements) {
                 variables.set(call.out, v);
                 // remap inputs that were intermediate (Pocket_cut) or named outputs
                 call.inputs = call.inputs.map((i) => variables.get(i) ?? i);
+                // GOTCHA (ArchDetail s444, 2026-09-21): `cad.compound` passes its
+                // members as LEXICAL VARIABLE NAMES inside `params.members` — they
+                // must be remapped like `inputs`, otherwise renderArgs emits them as
+                // string literals and the op receives strings (no BREP handle) and
+                // throws "compound members are not all on the BREP chain".
+                const members = call.params?.members;
+                if (Array.isArray(members)) {
+                    call.params.members = members.map((m) => typeof m === 'string' ? (variables.get(m) ?? m) : m);
+                }
                 call.out = v;
                 calls.push(call);
             }
@@ -185,24 +250,17 @@ placements) {
             const sketchLink = obj.properties.get('Sketch')?.children[0]?.attributes['value'];
             const pl = (sketchLink ? placements?.get(sketchLink) : undefined) ?? placements?.get(name);
             if (lastVar && pl && !isIdentityPlacement(pl)) {
-                let cur = lastVar;
-                const euler = quatToEulerXYZDeg(pl.q);
-                const isRotation = Math.abs(euler[0]) > 1e-9 || Math.abs(euler[1]) > 1e-9 || Math.abs(euler[2]) > 1e-9;
-                if (isRotation) {
-                    const rv = newVar();
-                    variables.set(cur, rv); // map old name → rotated var for consumers
-                    calls.push({ out: rv, op: 'cad.rotate_euler', source: name, inputs: [cur], params: { anglesDeg: euler } });
-                    cur = rv;
-                }
-                const needsTranslate = Math.abs(pl.p[0]) > 1e-9 || Math.abs(pl.p[1]) > 1e-9 || Math.abs(pl.p[2]) > 1e-9;
-                if (needsTranslate) {
-                    const tv = newVar();
-                    variables.set(cur, tv);
-                    calls.push({ out: tv, op: 'cad.translate', source: name, inputs: [cur], params: { offset: [...pl.p] } });
-                    cur = tv;
-                }
+                // 单个刚性放置：旋转（四元数，绕局部原点）+ 平移 = FreeCAD Placement(P,Q)。
+                // 直接发 cad.place，避免 euler 往返损失精度（方案 §4.7：两语句合一）。
+                const cur = lastVar;
+                const rv = newVar();
+                variables.set(cur, rv); // map old name → placed var for consumers
+                calls.push({
+                    out: rv, op: 'cad.place', source: name, inputs: [cur],
+                    params: { rotation: [...pl.q], position: [...pl.p] },
+                });
                 // the object's variable is now the fully placed result
-                variables.set(name, cur);
+                variables.set(name, rv);
             }
             // M9.4 (D-C): fold the feature into its Body's chain — AFTER the placement
             // step so the chain accumulates the PLACED feature shape. Pocket/Cut
@@ -225,6 +283,14 @@ placements) {
                 // (bbox already exact at delta 0).
                 if (prev) {
                     for (const c of verdict.calls) {
+                        // H7 (hole_puzzle corpus): the Pocket had NO BaseFeature property —
+                        // the translator emitted BODY_CHAIN_BASE as the subtract's base
+                        // input; retarget it at the chain head here (after the earlier
+                        // inputs remap, which leaves the marker untouched since it is not
+                        // a variable name).
+                        if (c.inputs) {
+                            c.inputs = c.inputs.map((i) => (i === BODY_CHAIN_BASE ? prev : i));
+                        }
                         if (c.op === 'cad.extrude' && c.params.baseFeature !== undefined) {
                             // GOTCHA (PadTest V6 residual): the up-to extrude builds its
                             // prism in the SKETCH-LOCAL frame, but the chain head (prev)
@@ -235,25 +301,24 @@ placements) {
                             // AddShape 48199 vs rebuilt deficit ~9108 mm^3 → 3.2% total).
                             const needsInverse = pl !== undefined && !isIdentityPlacement(pl);
                             if (needsInverse && pl) {
+                                // 逆向刚性放置（单点发射，方案 §4.7）：rotation 取共轭四元数、
+                                // position 取 invertApplyPlacement(pl, 0) = -(invQ·p)，合成为
+                                // 一个 cad.place，避免 euler 往返。语义 = invertApplyPlacement(pl, prev)。
                                 const invQ = [
                                     -pl.q[0], -pl.q[1], -pl.q[2], pl.q[3],
                                 ];
-                                const invEuler = quatToEulerXYZDeg(invQ);
-                                const tv = newVar();
-                                const tvCall = {
-                                    out: tv, op: 'cad.translate', source: name,
-                                    inputs: [prev], params: { offset: [-pl.p[0], -pl.p[1], -pl.p[2]] },
-                                };
+                                const invPos = invertApplyPlacement(pl, [0, 0, 0]);
                                 const rv = newVar();
                                 const rvCall = {
-                                    out: rv, op: 'cad.rotate_euler', source: name,
-                                    inputs: [tv], params: { anglesDeg: invEuler },
+                                    out: rv, op: 'cad.place', source: name,
+                                    inputs: [prev],
+                                    params: { rotation: invQ, position: invPos },
                                 };
                                 // insert BEFORE the extrude call: faijs is a statement
                                 // language — `baseFeature: partN` referencing a later
                                 // statement is E_REFERENCE (parser rejects forward refs).
                                 const at = calls.indexOf(c);
-                                calls.splice(at < 0 ? calls.length : at, 0, tvCall, rvCall);
+                                calls.splice(at < 0 ? calls.length : at, 0, rvCall);
                                 c.params.baseFeature = jsExpr(rv);
                             }
                             else {
@@ -283,6 +348,14 @@ placements) {
                     chainVar.set(body, nv);
                 }
             }
+            // H7 guard (motor_mount_inch corpus): a feature outside a Body (or with
+            // no chain head yet) never gets its BODY_CHAIN_BASE retargeted — the
+            // marker would leak into the generated JS as an illegal identifier
+            // (parser kills the whole file). Downgrade to an explicit gap instead.
+            if (verdict.calls.some((c) => c.inputs?.includes(BODY_CHAIN_BASE))) {
+                results.push({ name, type: obj.type, calls: [], disposition: 'baked', reason: 'pocket-missing-dependency' });
+                continue;
+            }
             results.push({ name, type: obj.type, variable: verdict.calls.at(-1)?.out, calls: verdict.calls, disposition: 'translated', reason: verdict.reason });
         }
         else if (verdict.kind === 'baked') {
@@ -302,7 +375,7 @@ placements) {
     // (including the chain union/subtract calls emitted for it) go to
     // model/<BodyName>.fai.js; everything else (loose Part features) stays in
     // main.fai.js. When no Body has geometry, everything lands in main (the
-    // single-file shape). Aggregate entry groups per-file roots via cad.group.
+    // single-file shape). Aggregate entry compounds per-file roots via cad.compound.
     const callBody = new Map();
     for (const r of results) {
         const b = memberToBody.get(r.name);
@@ -330,20 +403,49 @@ placements) {
         // further down (`let` TDZ ReferenceError at run time: `part8` used `part6`).
         // Filtering `calls` in place preserves the topological order.
         const assigned = new Map(); // call.out → Body file name
+        // chain-head var → terminal alias (and owning Body) — needed DURING
+        // routing: a foreign chain head is never in `assigned` (it is a Body's
+        // accumulated var, not a call output), so input-body checks must consult
+        // this map to detect cross-Body references.
+        const headToTerminal = new Map();
+        const headToBody = new Map();
+        for (const b of bodiesWithGeo) {
+            headToTerminal.set(chainVar.get(b), `${b}_out`);
+            headToBody.set(chainVar.get(b), b);
+        }
+        const mainPending = [];
+        const mainOuts = new Set();
         for (const c of calls) {
             const own = callBody.get(c.out);
-            const viaInput = c.inputs.map((inp) => assigned.get(inp)).find((b) => b !== undefined);
+            const inputBodies = c.inputs.map((inp) => assigned.get(inp) ?? headToBody.get(inp)).filter((b) => b !== undefined);
+            const viaInput = inputBodies[0];
             const b = own !== undefined && bodiesWithGeo.has(own) ? own : viaInput;
-            if (b !== undefined && bodiesWithGeo.has(b)) {
+            // GOTCHA (test_geomop corpus, 2026-09-20): a call whose own Body
+            // differs from an input's Body (Part::Cut with Base in another Body's
+            // chain) must NOT be emitted into its own Body file — the input
+            // variable lives in ANOTHER module and is not declared there
+            // (SEC_FREE_IDENT at check time). Same for inputs that will live in
+            // MAIN (loose Part boxes): routing is a forward pass over the
+            // topologically sorted calls, so main outputs are already known.
+            // NOTE: Body-chain fold calls (union/subtract emitted during folding)
+            // are NOT in `results`, so `own` is undefined for them — the main-input
+            // check must not depend on `own`.
+            const mixed = inputBodies.some((ib) => ib !== b) || (own !== undefined && viaInput !== undefined && viaInput !== own);
+            const touchesMain = c.inputs.some((i) => mainOuts.has(i));
+            if (b !== undefined && bodiesWithGeo.has(b) && !mixed && !touchesMain && (own === undefined || own === b)) {
                 if (!perBody.has(b))
                     perBody.set(b, []);
                 perBody.get(b).push(c);
                 assigned.set(c.out, b);
             }
             else {
-                mainCalls.push(c);
+                mainPending.push(c);
+                mainOuts.add(c.out);
             }
         }
+        for (const c of mainPending) {
+            mainCalls.push({ ...c, inputs: c.inputs.map((i) => headToTerminal.get(i) ?? i) });
+        }
         for (const b of bodiesWithGeo) {
             const bodyCalls = perBody.get(b) ?? [];
             // terminal: alias the chain head to <Body>_out so the aggregate entry
@@ -355,7 +457,7 @@ placements) {
             ];
             files.push({ path: `model/${b}.fai.js`, code: lowerBody(withTerminal, `${baseName}/${b}`, b), body: b });
         }
-        // main.fai.js: aggregate the per-Body terminals via cad.group. M10c:
+        // main.fai.js: aggregate the per-Body terminals via cad.compound. M10c:
         // cross-file references close through the standard relative-import
         // contract (module-registry D6) — each Body module's terminal alias
         // `<Body>_out` is its live shape, so a named import binds it.
@@ -364,7 +466,7 @@ placements) {
         lines.push(`// Units: mm (faijs contract; FCStd internal units are mm)`);
         const members = [...bodiesWithGeo].map((b) => `${b}_out`);
         // Always import the per-Body terminals: the aggregate entry references
-        // `<Body>_out` in BOTH the cad.group (multi-Body) and the single-Body alias
+        // `<Body>_out` in BOTH the cad.compound (multi-Body) and the single-Body alias
         // path, so a missing import is a SEC_FREE_IDENT parse error (GOTCHA: the
         // single-Body branch previously emitted `let part_out = <Body>_out;` with
         // no import). `mainCalls` may still be empty here.
@@ -379,7 +481,7 @@ placements) {
         }
         if (members.length > 1) {
             rootVar = 'part_out';
-            lines.push(`let part_out = cad.group({ members: [${members.join(', ')}] });`);
+            lines.push(`let part_out = cad.compound({ members: [${members.join(', ')}] });`);
         }
         else if (members.length === 1) {
             // single Body: the imported terminal IS the result — alias keeps a
@@ -428,7 +530,7 @@ function lower(calls, baseName) {
     const consumed = new Set(calls.flatMap((c) => c.inputs));
     const roots = calls.filter((c) => !consumed.has(c.out)).map((c) => c.out);
     if (roots.length > 1) {
-        lines.push(`let part_out = cad.group({ members: [${roots.join(', ')}] });`);
+        lines.push(`let part_out = cad.compound({ members: [${roots.join(', ')}] });`);
     }
     else if (roots.length === 0) {
         lines.push(`// no translated geometry (all baked)`);
@@ -469,13 +571,22 @@ function containsJsExpr(v) {
 }
 function renderArgs(call) {
     const positional = [
-        ...call.inputs.map((i) => i),
+        ...(call.noPositionalArgs ? [] : call.inputs.map((i) => i)),
         ...(call.literals ?? []).map((l) => renderValue(l)),
     ].filter((s) => s.length > 0); // M7.1: drop empty entries so we never emit `(, `
     const named = [];
     for (const [k, v] of Object.entries(call.params ?? {})) {
         if (v === undefined)
             continue;
+        // GOTCHA (ArchDetail s444, 2026-09-21): `cad.compound`'s `members` are
+        // LEXICAL VARIABLE NAMES, not data strings — render them bare, like
+        // positional inputs. renderValue would quote them and the op would
+        // receive strings with no BREP handle
+        // ("compound members are not all on the BREP chain").
+        if (k === 'members' && Array.isArray(v)) {
+            named.push(`members: [${v.join(', ')}]`);
+            continue;
+        }
         named.push(`${k}: ${renderValue(v)}`);
     }
     const namedBlock = named.length ? `{ ${named.join(', ')} }` : '';