@chestnutlabs/gcode-dialects 0.2.0 → 0.4.0

package/README.md

@@ -7,7 +7,7 @@ enforces it).
 
 Supported dialects: **PrusaSlicer, OrcaSlicer/Bambu Studio, Cura, Klipper, Marlin,
 RepRap-flavor** — see the evidence-dated
-[compatibility matrix](../../docs/compatibility/dialects-and-containers.md).
+[compatibility matrix](https://github.com/ChestnutLabs/gcode-preview/blob/dev/docs/compatibility/dialects-and-containers.md).
 
 Every annotation is capability-tagged (`known | inferred | approximated | unavailable`); consumers
 render what is known and disclose what is not.

package/dist/annotate.d.ts

@@ -5,7 +5,7 @@
  * IR's byte-ordered sourceIndex resolves them to segment ranges in `finalize`
  * (DD-005 §4.3: "annotation ranges are [segAtEvent, segBeforeNextEvent]").
  */
-import type { MachineGeometry, Point2, ToolpathIR } from '@chestnutlabs/toolpath-core';
+import { type MachineGeometry, type Point2, type ToolpathIR } from '@chestnutlabs/toolpath-core';
 import type { AnnotationSink } from './contracts.js';
 /** First segment whose producing command starts at or after `byte`. */
 export declare function segAtOrAfterByte(ir: ToolpathIR, byte: number): number;
@@ -19,6 +19,24 @@ export interface RangeMarker {
  * value of 0 acts as a range terminator (back to unknown/none).
  */
 export declare function applyMarkerRanges(ir: ToolpathIR, markers: RangeMarker[], write: (segStart: number, segEnd: number, value: number) => void): number;
+/** One end of a wipe bracket (DD-016, #182): the source byte and whether it OPENED the bracket. */
+export interface WipeMark {
+    srcByte: number;
+    open: boolean;
+}
+/**
+ * Classify a comment as a PrusaSlicer/OrcaSlicer wipe-bracket marker. The convention is bare
+ * `;WIPE_START` / `;WIPE_END` (the semicolon is already stripped before onComment); tolerant of a
+ * leading space and casing. Returns null for any other comment.
+ */
+export declare function matchWipeComment(comment: string): 'start' | 'end' | null;
+/**
+ * Resolve WIPE_START/END byte marks to segment ranges and add `MoveKind.Wipe` additively via the sink
+ * (DD-016 §4.2). Segments emitted between a START and its END are the wipe moves. Unbalanced or nested
+ * markers degrade safely: a stray END is ignored, a second START before an END is folded into the open
+ * bracket, and a START left open at end-of-file closes at the last segment. Returns ranges applied.
+ */
+export declare function applyWipeRanges(ir: ToolpathIR, marks: WipeMark[], sink: AnnotationSink): number;
 export interface SegMarker {
     segIndex: number;
     value: number;

package/dist/annotate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotate.d.ts","sourceRoot":"","sources":["../src/annotate.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,uEAAuE;AACvE,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAUrE;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,WAAW,EAAE,EACtB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/D,MAAM,CAYR;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,SAAS,EAAE,EACpB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/D,MAAM,CAYR;AAED,uGAAuG;AACvG,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAGpF;AAED,sEAAsE;AACtE,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAU9D;AAED,mFAAmF;AACnF,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,eAAe,CAejB;AASD,yFAAyF;AACzF,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAkB5D;AAED,mGAAmG;AACnG,qBAAa,kBAAkB;IAEjB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IADjD,OAAO,CAAC,MAAM,CAAgF;gBACjE,oBAAoB,SAAa;IAE9D,uFAAuF;IACvF,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,mFAAmF;IACnF,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI;CA8BlD"}
+{"version":3,"file":"annotate.d.ts","sourceRoot":"","sources":["../src/annotate.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAY,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC3G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,uEAAuE;AACvE,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAUrE;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,WAAW,EAAE,EACtB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/D,MAAM,CAYR;AAED,mGAAmG;AACnG,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;CACf;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,IAAI,CAKxE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,cAAc,GAAG,MAAM,CAwB/F;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,SAAS,EAAE,EACpB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GAC/D,MAAM,CAYR;AAED,uGAAuG;AACvG,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAGpF;AAED,sEAAsE;AACtE,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAU9D;AAED,mFAAmF;AACnF,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,eAAe,CAejB;AASD,yFAAyF;AACzF,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAkB5D;AAED,mGAAmG;AACnG,qBAAa,kBAAkB;IAEjB,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IADjD,OAAO,CAAC,MAAM,CAAgF;gBACjE,oBAAoB,SAAa;IAE9D,uFAAuF;IACvF,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,mFAAmF;IACnF,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,GAAG,IAAI;CA8BlD"}

package/dist/annotate.js

@@ -1,3 +1,11 @@
+/**
+ * Shared annotation helpers for slicer adapters (DD-005 phase 3, issue #75).
+ *
+ * Comment markers arrive with a source-byte position but no segment index; the
+ * IR's byte-ordered sourceIndex resolves them to segment ranges in `finalize`
+ * (DD-005 §4.3: "annotation ranges are [segAtEvent, segBeforeNextEvent]").
+ */
+import { MoveKind } from '@chestnutlabs/toolpath-core';
 /** First segment whose producing command starts at or after `byte`. */
 export function segAtOrAfterByte(ir, byte) {
     const offsets = ir.sourceIndex.byteOffsets;
@@ -31,6 +39,52 @@ export function applyMarkerRanges(ir, markers, write) {
     }
     return applied;
 }
+/**
+ * Classify a comment as a PrusaSlicer/OrcaSlicer wipe-bracket marker. The convention is bare
+ * `;WIPE_START` / `;WIPE_END` (the semicolon is already stripped before onComment); tolerant of a
+ * leading space and casing. Returns null for any other comment.
+ */
+export function matchWipeComment(comment) {
+    const t = comment.trim().toUpperCase();
+    if (t === 'WIPE_START')
+        return 'start';
+    if (t === 'WIPE_END')
+        return 'end';
+    return null;
+}
+/**
+ * Resolve WIPE_START/END byte marks to segment ranges and add `MoveKind.Wipe` additively via the sink
+ * (DD-016 §4.2). Segments emitted between a START and its END are the wipe moves. Unbalanced or nested
+ * markers degrade safely: a stray END is ignored, a second START before an END is folded into the open
+ * bracket, and a START left open at end-of-file closes at the last segment. Returns ranges applied.
+ */
+export function applyWipeRanges(ir, marks, sink) {
+    let applied = 0;
+    let openByte = -1;
+    for (const mark of marks) {
+        if (mark.open) {
+            if (openByte < 0)
+                openByte = mark.srcByte;
+        }
+        else if (openByte >= 0) {
+            const start = segAtOrAfterByte(ir, openByte);
+            const end = segAtOrAfterByte(ir, mark.srcByte); // first segment AFTER the wipe block
+            if (end - 1 >= start) {
+                sink.addMoveKind(start, end - 1, MoveKind.Wipe);
+                applied++;
+            }
+            openByte = -1;
+        }
+    }
+    if (openByte >= 0) {
+        const start = segAtOrAfterByte(ir, openByte);
+        if (ir.segments.count - 1 >= start) {
+            sink.addMoveKind(start, ir.segments.count - 1, MoveKind.Wipe);
+            applied++;
+        }
+    }
+    return applied;
+}
 /**
  * Apply SEGMENT-indexed markers (CommandEvent.segIndex — exact, no byte
  * resolution needed) as contiguous ranges; value 0 terminates (DD-005 phase 5).

package/dist/cnc.d.ts

@@ -0,0 +1,10 @@
+import type { DialectAdapter } from './contracts.js';
+export type ValidationTier = 'validated' | 'experimental';
+export type MachineClass = 'laser' | 'mill' | 'plotter';
+/** GRBL diode/CO₂ laser (LightBurn and GRBL-laser post-processors). */
+export declare function grblLaser(): DialectAdapter;
+/** GRBL CNC milling (constant-power spindle). */
+export declare function grblMill(): DialectAdapter;
+/** LinuxCNC / EMC milling. */
+export declare function linuxCnc(): DialectAdapter;
+//# sourceMappingURL=cnc.d.ts.map

package/dist/cnc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cnc.d.ts","sourceRoot":"","sources":["../src/cnc.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAA+B,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAElF,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,cAAc,CAAC;AAC1D,MAAM,MAAM,YAAY,GAAG,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;AAoGxD,uEAAuE;AACvE,wBAAgB,SAAS,IAAI,cAAc,CAyB1C;AAED,iDAAiD;AACjD,wBAAgB,QAAQ,IAAI,cAAc,CAoBzC;AAED,8BAA8B;AAC9B,wBAAgB,QAAQ,IAAI,cAAc,CAsBzC"}

package/dist/cnc.js

@@ -0,0 +1,142 @@
+/** Non-extrusion capability claims whose confidence the validation tier governs (DD-012 D6). */
+const NON_EXTRUSION_CAPS = ['cutMoves', 'toolPower', 'cannedCycles'];
+function scoreEvidence(head) {
+    // Strip line comments (';…' and LinuxCNC/RS274 '(…)') so words inside them never score as markers.
+    const code = head
+        .split('\n')
+        .map((l) => l.split(';')[0].replace(/\([^)]*\)/g, ''))
+        .join('\n');
+    const has = (re) => re.test(code);
+    // G-code words run together without spaces (`G1M3`, `g1z-.1`), so a LEADING word-boundary fails.
+    // Match the command by its number + a trailing NON-digit lookahead: `M0*3(?!\d)` matches `M3`/`M03`
+    // (incl. mid-line `s3400 m3` and concatenated `G1M3`) but not `M30`/`M300`.
+    return {
+        // Extrusion = an `E` value on a G0–G3 MOTION line — NOT bare `E` (LinuxCNC laser uses `M67 E0 Q…`
+        // for analog power, which must not be mistaken for FDM extrusion).
+        extrusion: has(/G0*[0-3](?!\d)[^\n;]*E-?[.\d]/i) || has(/M8[23](?!\d)/i),
+        m3: has(/M0*3(?!\d)/i),
+        m4: has(/M0*4(?!\d)/i),
+        power: has(/S\d/i),
+        plunge: has(/Z\s*-\s*[.\d]/i), // negative Z incl. leading-dot decimals (`Z-.1`)
+        lightBurn: /LightBurn/i.test(head), // header-only marker; keep the raw head (comments allowed)
+        laserMode: /\$32\s*=\s*1/.test(code),
+        linuxCnc: /\b(?:LinuxCNC|EMC2?)\b/i.test(head),
+        grblBanner: /\bGrbl\s*[0-9]/i.test(head),
+        oWord: has(/[oO][\s<]*\w*\s*(?:sub|call|if|while|do|repeat|return|endsub)\b/im)
+    };
+}
+function makeCncDialect(spec) {
+    return {
+        id: spec.id,
+        displayName: spec.displayName,
+        kind: 'firmware',
+        detect(input) {
+            const hit = spec.detect(input);
+            return hit === null
+                ? null
+                : { dialectId: spec.id, kind: 'firmware', confidence: hit.confidence, evidence: hit.evidence };
+        },
+        finalize(ir, sink) {
+            sink.setRaw('cnc.controller', spec.id);
+            sink.setRaw('cnc.machineClass', spec.machineClass);
+            sink.setRaw('cnc.validationTier', spec.tier);
+            sink.setRaw('cnc.toolPowerLabel', spec.toolPowerLabel);
+            // Validation tier (DD-012 D6): until hardware-validated, non-extrusion claims are `inferred`,
+            // never `known`. Only downgrade claims the file actually made (present as 'known') — never
+            // fabricate a claim for a feature the file did not use.
+            if (spec.tier === 'experimental') {
+                let downgraded = false;
+                for (const cap of NON_EXTRUSION_CAPS) {
+                    if (ir.header.capabilities[cap] === 'known') {
+                        sink.upgradeCapability(cap, 'inferred');
+                        downgraded = true;
+                    }
+                }
+                if (downgraded) {
+                    sink.warn('cnc-dialect-experimental', `${spec.displayName} support is EXPERIMENTAL (spec-derived, not yet hardware-validated); ` +
+                        `non-extrusion classification is reported as 'inferred'.`);
+                }
+            }
+        }
+    };
+}
+/** GRBL diode/CO₂ laser (LightBurn and GRBL-laser post-processors). */
+export function grblLaser() {
+    return makeCncDialect({
+        id: 'grbl-laser',
+        displayName: 'GRBL laser (LightBurn)',
+        machineClass: 'laser',
+        toolPowerLabel: 'laser power (S)',
+        // Hardware-validated 2026-07-29 (DD-012 D8; see docs/design/DD-012-hardware-validation-log.md):
+        // a real GRBL/LightBurn laser run — 6161 moves incl. fill + offset-fill, full 0–1000 S power ramp —
+        // confirmed machine-class detection, Cut-vs-rapid classification, and the toolPower channel against
+        // the physical cut. Claims report `known`, not `inferred`. (Mill/LinuxCNC remain experimental.)
+        tier: 'validated',
+        detect(input) {
+            const e = scoreEvidence(input.headText);
+            if (e.extrusion || e.linuxCnc)
+                return null;
+            if (e.lightBurn)
+                return { evidence: 'LightBurn header', confidence: 'known' };
+            if (e.laserMode)
+                return { evidence: 'GRBL $32=1 (laser mode)', confidence: 'inferred' };
+            // No-header GRBL laser (the common LaserGRBL case): a tool-on command with power, and NO Z
+            // plunging — lasers are planar; a mill would cut down into Z. Works whether the file uses M3
+            // (constant power) or M4 (dynamic).
+            if ((e.m3 || e.m4) && e.power && !e.plunge) {
+                return { evidence: `${e.m4 ? 'M4 dynamic' : 'M3'} + S power, planar (no Z plunge)`, confidence: 'inferred' };
+            }
+            return null;
+        }
+    });
+}
+/** GRBL CNC milling (constant-power spindle). */
+export function grblMill() {
+    return makeCncDialect({
+        id: 'grbl-mill',
+        displayName: 'GRBL mill',
+        machineClass: 'mill',
+        toolPowerLabel: 'spindle RPM (S)',
+        tier: 'experimental', // → 'validated' after a real GRBL-mill run (DD-012 §8)
+        detect(input) {
+            const e = scoreEvidence(input.headText);
+            if (e.extrusion || e.lightBurn || e.laserMode || e.linuxCnc)
+                return null;
+            // A spindle (M3) that plunges into the material (negative Z) with no extrusion — a milling
+            // fingerprint that distinguishes it from a planar laser. GRBL/family-level, so a banner is a
+            // stronger signal but not required (most CAM output has no banner).
+            if (e.m3 && e.plunge) {
+                const ev = e.grblBanner ? 'Grbl banner + M3 + Z-plunge' : 'M3 spindle + Z-plunge, no extrusion';
+                return { evidence: ev, confidence: 'inferred' };
+            }
+            return null;
+        }
+    });
+}
+/** LinuxCNC / EMC milling. */
+export function linuxCnc() {
+    return makeCncDialect({
+        id: 'linuxcnc',
+        displayName: 'LinuxCNC mill',
+        machineClass: 'mill',
+        toolPowerLabel: 'spindle RPM (S)',
+        tier: 'experimental', // → 'validated' after a real LinuxCNC run (DD-012 §8)
+        detect(input) {
+            const e = scoreEvidence(input.headText);
+            if (e.extrusion)
+                return null;
+            if (e.linuxCnc)
+                return { evidence: 'LinuxCNC/EMC header', confidence: 'known' };
+            // RS274NGC O-word subroutines / flow control (`O100 sub`, `o<name> call`) are the LinuxCNC
+            // family's distinguishing dialect feature — GRBL/TinyG do not have them.
+            if (e.oWord)
+                return { evidence: 'RS274NGC O-word subroutine/flow', confidence: 'inferred' };
+            // A `%` program envelope with a spindle and no extrusion (also common in Fanuc-style output;
+            // reported family-level, not as a specific controller).
+            if (/^\s*%/m.test(input.headText) && e.m3) {
+                return { evidence: '%-program envelope + M3 spindle, no extrusion', confidence: 'inferred' };
+            }
+            return null;
+        }
+    });
+}

package/dist/contracts.d.ts

@@ -9,7 +9,7 @@
  * Data contracts (MachineGeometry, DialectMetadata, DialectDetection) live in
  * @chestnutlabs/toolpath-core (see its metadata.ts for the rationale).
  */
-import type { Confidence, DialectDetection, MachineGeometry, FilamentInfo, ThumbnailData, ToolpathIR } from '@chestnutlabs/toolpath-core';
+import type { Confidence, DialectDetection, MachineGeometry, FilamentInfo, FilamentUsage, PrintEstimate, ThumbnailData, ToolpathIR } from '@chestnutlabs/toolpath-core';
 /** Read-only normalized command event — mirror of the parser's hook payload. */
 export interface CommandEvent {
     gcode: string;
@@ -29,11 +29,22 @@ export interface DetectInput {
 export interface AnnotationSink {
     /** Write a FeatureRole index for segments [segStart, segEnd] (bounds validated at apply). */
     setFeature(segStart: number, segEnd: number, role: number): void;
+    /**
+     * Additively OR an annotation move-kind bit onto segments [segStart, segEnd] (DD-016 §4.2).
+     * Allow-listed to `MoveKind.Wipe | MoveKind.Seam` — the ONLY exception to the sink's kind
+     * immutability, and additive-only: it never clears an existing Extrude/Travel bit and never
+     * reclassifies a move. Non-allow-listed bits are dropped with a warning (bounded failure).
+     */
+    addMoveKind(segStart: number, segEnd: number, kindBits: number): void;
     /** `objectValue` is the 1-based object-channel value (DD-001: v indexes ir.objects[v-1]). */
     setObject(segStart: number, segEnd: number, objectValue: number): void;
     defineObject(objectValue: number, name: string): void;
     setMachine(machine: MachineGeometry): void;
     setFilament(info: FilamentInfo): void;
+    /** Slicer-reported total filament consumption (#183). Later calls merge non-undefined fields. */
+    setFilamentUsage(usage: FilamentUsage): void;
+    /** The slicer's own print-time estimate (#183). Prefer the 'normal'/default mode when several. */
+    setPrintEstimate(estimate: PrintEstimate): void;
     /** Enrich a tool's identity (material, '#RRGGBB' color) — merged into ir.tools (DD-005 phase 5). */
     setToolInfo(tool: number, info: {
         material?: string;

package/dist/contracts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../src/contracts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,aAAa,EACb,UAAU,EACX,MAAM,6BAA6B,CAAC;AAErC,gFAAgF;AAChF,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,sCAAsC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,wFAAwF;IACxF,QAAQ,EAAE,MAAM,CAAC;IACjB,iFAAiF;IACjF,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,cAAc;IAC7B,6FAA6F;IAC7F,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACjE,6FAA6F;IAC7F,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACvE,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACtD,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CAAC;IAC3C,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IACtC,oGAAoG;IACpG,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChF,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IACzC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IAC7D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7D;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,mFAAmF;IACnF,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;IACxC,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAAC;IACpD,gFAAgF;IAChF,SAAS,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3F,SAAS,CAAC,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC9E,QAAQ,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACzE"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../src/contracts.ts"],"names":[],"mappings":"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"}

package/dist/cura.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cura.d.ts","sourceRoot":"","sources":["../src/cura.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAiCrE,wBAAgB,IAAI,IAAI,cAAc,CAkCrC"}
+{"version":3,"file":"cura.d.ts","sourceRoot":"","sources":["../src/cura.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAiCrE,wBAAgB,IAAI,IAAI,cAAc,CAqDrC"}

package/dist/cura.js

@@ -54,6 +54,25 @@ export function cura() {
                 s.printerName = trimmed.slice('TARGET_MACHINE.NAME:'.length).trim();
                 return;
             }
+            // Cura print-time comment: `;TIME:<seconds>` (total; per-layer `;TIME_ELAPSED:` is ignored).
+            if (trimmed.startsWith('TIME:')) {
+                const sec = Number(trimmed.slice('TIME:'.length).trim());
+                if (Number.isFinite(sec) && sec > 0) {
+                    sink.setPrintEstimate({ seconds: sec, source: { adapterId: 'cura', evidence: ';TIME:', srcByte } });
+                }
+                return;
+            }
+            // Cura filament comment: `;Filament used: 2.22m` (metres; multi-material → first value).
+            if (trimmed.toLowerCase().startsWith('filament used:')) {
+                const metres = parseFloat(trimmed.slice('filament used:'.length).trim());
+                if (Number.isFinite(metres)) {
+                    sink.setFilamentUsage({
+                        lengthMm: metres * 1000,
+                        source: { adapterId: 'cura', evidence: ';Filament used:', srcByte }
+                    });
+                }
+                return;
+            }
             const kv = parseKeyValue(comment);
             if (kv !== null && kv.key === 'target_machine')
                 s.printerName = kv.value;

package/dist/index.d.ts

@@ -15,6 +15,8 @@ export { prusaSlicer } from './prusaslicer.js';
 export { orcaBambu } from './orca-bambu.js';
 export { cura } from './cura.js';
 export { klipper, marlin, repRap } from './firmware.js';
+export { grblLaser, grblMill, linuxCnc } from './cnc.js';
+export type { ValidationTier, MachineClass } from './cnc.js';
 export { segAtOrAfterByte, applyMarkerRanges, parseKeyValue, parseAreaPoints, bedFromPoints, decodeBase64, ThumbnailCollector } from './annotate.js';
 export type { RangeMarker } from './annotate.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,oBAAoB,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACzG,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,aAAa,EACb,YAAY,EACZ,kBAAkB,EACnB,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChG,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,oBAAoB,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACzG,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzD,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,eAAe,EACf,aAAa,EACb,YAAY,EACZ,kBAAkB,EACnB,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}

package/dist/index.js

@@ -4,4 +4,5 @@ export { prusaSlicer } from './prusaslicer.js';
 export { orcaBambu } from './orca-bambu.js';
 export { cura } from './cura.js';
 export { klipper, marlin, repRap } from './firmware.js';
+export { grblLaser, grblMill, linuxCnc } from './cnc.js';
 export { segAtOrAfterByte, applyMarkerRanges, parseKeyValue, parseAreaPoints, bedFromPoints, decodeBase64, ThumbnailCollector } from './annotate.js';

package/dist/orca-bambu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orca-bambu.d.ts","sourceRoot":"","sources":["../src/orca-bambu.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAuDrE,wBAAgB,SAAS,IAAI,cAAc,CA8F1C"}
+{"version":3,"file":"orca-bambu.d.ts","sourceRoot":"","sources":["../src/orca-bambu.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAmErE,wBAAgB,SAAS,IAAI,cAAc,CAiH1C"}

package/dist/orca-bambu.js

@@ -9,7 +9,8 @@
  * container metadata as evidence (DD-005 §4.1 DetectInput.containerMeta).
  */
 import { FeatureRole } from '@chestnutlabs/toolpath-core';
-import { ThumbnailCollector, applyMarkerRanges, bedFromPoints, parseAreaPoints, parseKeyValue } from './annotate.js';
+import { parseFilamentTotals, parseHmsToSeconds } from './prusaslicer.js';
+import { ThumbnailCollector, applyMarkerRanges, applyWipeRanges, bedFromPoints, matchWipeComment, parseAreaPoints, parseKeyValue } from './annotate.js';
 /** Orca/Bambu `; FEATURE:` names → DD-001 FeatureRole. */
 const FEATURE_MAP = {
     'inner wall': FeatureRole.Perimeter,
@@ -34,7 +35,14 @@ const state = new WeakMap();
 function stateFor(sink) {
     let s = state.get(sink);
     if (s === undefined) {
-        s = { features: [], objects: [], objectNames: new Map(), bedPoints: null, thumbs: new ThumbnailCollector() };
+        s = {
+            features: [],
+            objects: [],
+            wipes: [],
+            objectNames: new Map(),
+            bedPoints: null,
+            thumbs: new ThumbnailCollector()
+        };
         state.set(sink, s);
     }
     return s;
@@ -79,10 +87,29 @@ export function orcaBambu() {
                 s.objects.push({ srcByte, value: 0 }); // range terminator
                 return;
             }
+            const wipe = matchWipeComment(comment);
+            if (wipe !== null) {
+                s.wipes.push({ srcByte, open: wipe === 'start' });
+                return;
+            }
             if (s.thumbs.isActive || trimmed.toLowerCase().startsWith('thumbnail')) {
                 s.thumbs.feed(comment, sink);
                 return;
             }
+            // Orca/Bambu print-time comments are colon-separated (`; total estimated time: 1h 2m 3s`).
+            const timeMatch = /^(?:total estimated time|model printing time)\s*:\s*(.+)$/i.exec(trimmed);
+            if (timeMatch !== null) {
+                const sec = parseHmsToSeconds(timeMatch[1]);
+                if (sec !== null) {
+                    sink.setPrintEstimate({
+                        seconds: sec,
+                        source: { adapterId: 'orca-bambu', evidence: `; ${trimmed}`, srcByte }
+                    });
+                }
+                return;
+            }
+            if (parseFilamentTotals(comment, srcByte, 'orca-bambu', sink))
+                return;
             const kv = parseKeyValue(comment);
             if (kv === null)
                 return;
@@ -116,6 +143,8 @@ export function orcaBambu() {
                     sink.defineObject(value, name);
                 sink.upgradeCapability('objects', 'known');
             }
+            if (applyWipeRanges(ir, s.wipes, sink) > 0)
+                sink.upgradeCapability('wipeMoves', 'known');
             if (s.bedPoints !== null) {
                 const points = parseAreaPoints(s.bedPoints);
                 if (points !== null) {

package/dist/prusaslicer.d.ts

@@ -1,3 +1,11 @@
-import type { DialectAdapter } from './contracts.js';
+import type { AnnotationSink, DialectAdapter } from './contracts.js';
+/** Parse PrusaSlicer/Orca `<h>h <m>m <s>s` (any part optional) → seconds; null when zero/unparsed. */
+export declare function parseHmsToSeconds(text: string): number | null;
+/**
+ * Prusa-style filament totals (`; filament used [mm|cm3] = X`, `; total filament used [g] = X`) —
+ * shared by PrusaSlicer and the Prusa-derived Orca/Bambu adapter (#183). Multi-word bracketed keys
+ * that `parseKeyValue` can't tokenize. Returns true when the comment was a filament total.
+ */
+export declare function parseFilamentTotals(comment: string, srcByte: number, adapterId: string, sink: AnnotationSink): boolean;
 export declare function prusaSlicer(): DialectAdapter;
 //# sourceMappingURL=prusaslicer.d.ts.map

package/dist/prusaslicer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prusaslicer.d.ts","sourceRoot":"","sources":["../src/prusaslicer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAiDrE,wBAAgB,WAAW,IAAI,cAAc,CA+D5C"}
+{"version":3,"file":"prusaslicer.d.ts","sourceRoot":"","sources":["../src/prusaslicer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAgCrE,sGAAsG;AACtG,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK7D;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,cAAc,GACnB,OAAO,CAkBT;AAuBD,wBAAgB,WAAW,IAAI,cAAc,CAmF5C"}

package/dist/prusaslicer.js

@@ -7,7 +7,7 @@
  * `; thumbnail begin/end` PNG thumbnails. Geometry is untouchable by contract.
  */
 import { FeatureRole } from '@chestnutlabs/toolpath-core';
-import { ThumbnailCollector, applyMarkerRanges, bedFromPoints, parseAreaPoints, parseKeyValue } from './annotate.js';
+import { ThumbnailCollector, applyMarkerRanges, applyWipeRanges, bedFromPoints, matchWipeComment, parseAreaPoints, parseKeyValue } from './annotate.js';
 /** Prusa `;TYPE:` names → DD-001 FeatureRole (unknown names → Custom, honestly generic). */
 const TYPE_MAP = {
     perimeter: FeatureRole.Perimeter,
@@ -26,11 +26,43 @@ const TYPE_MAP = {
     'wipe tower': FeatureRole.Custom,
     custom: FeatureRole.Custom
 };
+/** Parse PrusaSlicer/Orca `<h>h <m>m <s>s` (any part optional) → seconds; null when zero/unparsed. */
+export function parseHmsToSeconds(text) {
+    const m = /^\s*(?:(\d+)\s*h)?\s*(?:(\d+)\s*m)?\s*(?:(\d+)\s*s)?\s*$/.exec(text);
+    if (m === null)
+        return null;
+    const total = Number(m[1] ?? 0) * 3600 + Number(m[2] ?? 0) * 60 + Number(m[3] ?? 0);
+    return total > 0 ? total : null;
+}
+/**
+ * Prusa-style filament totals (`; filament used [mm|cm3] = X`, `; total filament used [g] = X`) —
+ * shared by PrusaSlicer and the Prusa-derived Orca/Bambu adapter (#183). Multi-word bracketed keys
+ * that `parseKeyValue` can't tokenize. Returns true when the comment was a filament total.
+ */
+export function parseFilamentTotals(comment, srcByte, adapterId, sink) {
+    const source = { adapterId, evidence: '; filament used comments', srcByte };
+    let m = /^\s*filament used \[mm\]\s*=\s*([\d.]+)/i.exec(comment);
+    if (m !== null) {
+        sink.setFilamentUsage({ lengthMm: parseFloat(m[1]), source });
+        return true;
+    }
+    m = /^\s*filament used \[cm3\]\s*=\s*([\d.]+)/i.exec(comment);
+    if (m !== null) {
+        sink.setFilamentUsage({ volumeCm3: parseFloat(m[1]), source });
+        return true;
+    }
+    m = /^\s*total filament used \[g\]\s*=\s*([\d.]+)/i.exec(comment);
+    if (m !== null) {
+        sink.setFilamentUsage({ weightG: parseFloat(m[1]), source });
+        return true;
+    }
+    return false;
+}
 const state = new WeakMap();
 function stateFor(sink) {
     let s = state.get(sink);
     if (s === undefined) {
-        s = { markers: [], bedPoints: null, thumbs: new ThumbnailCollector() };
+        s = { markers: [], wipes: [], bedPoints: null, thumbs: new ThumbnailCollector() };
         state.set(sink, s);
     }
     return s;
@@ -58,10 +90,30 @@ export function prusaSlicer() {
                 s.markers.push({ srcByte, value: role ?? FeatureRole.Custom });
                 return;
             }
+            const wipe = matchWipeComment(comment);
+            if (wipe !== null) {
+                s.wipes.push({ srcByte, open: wipe === 'start' });
+                return;
+            }
             if (s.thumbs.isActive || comment.trimStart().toLowerCase().startsWith('thumbnail')) {
                 s.thumbs.feed(comment, sink);
                 return;
             }
+            // Filament totals + print time — multi-word keys `parseKeyValue` can't tokenize (#183).
+            if (parseFilamentTotals(comment, srcByte, 'prusaslicer', sink))
+                return;
+            const time = /^\s*estimated printing time \(normal mode\)\s*=\s*(.+)$/i.exec(comment);
+            if (time !== null) {
+                const sec = parseHmsToSeconds(time[1].trim());
+                if (sec !== null) {
+                    sink.setPrintEstimate({
+                        seconds: sec,
+                        mode: 'normal',
+                        source: { adapterId: 'prusaslicer', evidence: '; estimated printing time', srcByte }
+                    });
+                }
+                return;
+            }
             const kv = parseKeyValue(comment);
             if (kv === null)
                 return;
@@ -83,6 +135,8 @@ export function prusaSlicer() {
             const applied = applyMarkerRanges(ir, s.markers, (a, b, v) => sink.setFeature(a, b, v));
             if (applied > 0)
                 sink.upgradeCapability('featureRoles', 'known');
+            if (applyWipeRanges(ir, s.wipes, sink) > 0)
+                sink.upgradeCapability('wipeMoves', 'known');
             if (s.bedPoints !== null) {
                 const points = parseAreaPoints(s.bedPoints);
                 if (points !== null) {

package/dist/sink.d.ts

@@ -5,9 +5,11 @@
  * exist until `finish()`), then applied to the finished IR in one validated
  * pass. Bounds are clamped, budgets enforced, and the sink physically cannot
  * reach geometry — it only ever touches `feature`, `object`, header
- * capabilities/warnings, and the metadata object beside the IR.
+ * capabilities/warnings, the metadata object beside the IR, and (DD-016 §4.2)
+ * an ADDITIVE allow-listed move-kind bit (`Wipe`/`Seam`) that never clears or
+ * reclassifies a move.
  */
-import type { Confidence, DialectMetadata, FilamentInfo, MachineGeometry, ThumbnailData, ToolpathIR } from '@chestnutlabs/toolpath-core';
+import { type Confidence, type DialectMetadata, type FilamentInfo, type FilamentUsage, type MachineGeometry, type PrintEstimate, type ThumbnailData, type ToolpathIR } from '@chestnutlabs/toolpath-core';
 import type { AnnotationSink } from './contracts.js';
 export declare class BufferedAnnotationSink implements AnnotationSink {
     private readonly adapterId;
@@ -15,6 +17,8 @@ export declare class BufferedAnnotationSink implements AnnotationSink {
     private objects;
     private machine;
     private filaments;
+    private filamentUsage;
+    private printEstimate;
     private toolInfos;
     private thumbnails;
     private raw;
@@ -25,9 +29,12 @@ export declare class BufferedAnnotationSink implements AnnotationSink {
     private pushOp;
     setFeature(segStart: number, segEnd: number, role: number): void;
     setObject(segStart: number, segEnd: number, objectId: number): void;
+    addMoveKind(segStart: number, segEnd: number, kindBits: number): void;
     defineObject(id: number, name: string): void;
     setMachine(machine: MachineGeometry): void;
     setFilament(info: FilamentInfo): void;
+    setFilamentUsage(usage: FilamentUsage): void;
+    setPrintEstimate(estimate: PrintEstimate): void;
     setToolInfo(tool: number, info: {
         material?: string;
         colorHex?: string;

package/dist/sink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sink.d.ts","sourceRoot":"","sources":["../src/sink.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EACV,UAAU,EACV,eAAe,EACf,YAAY,EACZ,eAAe,EACf,aAAa,EACb,UAAU,EAEX,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAWrD,qBAAa,sBAAuB,YAAW,cAAc;IAY/C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAXtC,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,SAAS,CAA+D;IAChF,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,GAAG,CAA6B;IACxC,OAAO,CAAC,YAAY,CAAiC;IACrD,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,QAAQ,CAAS;gBAEI,SAAS,EAAE,MAAM;IAE9C,OAAO,CAAC,MAAM;IAYd,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAIhE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInE,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI5C,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAI1C,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAIrC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAI/E,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAIxC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAIxC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAI5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAS3D;;;;;OAKG;IACH,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;CAwD9G"}
+{"version":3,"file":"sink.d.ts","sourceRoot":"","sources":["../src/sink.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,UAAU,EAEhB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAcrD,qBAAa,sBAAuB,YAAW,cAAc;IAc/C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAbtC,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,SAAS,CAA+D;IAChF,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,GAAG,CAA6B;IACxC,OAAO,CAAC,YAAY,CAAiC;IACrD,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,QAAQ,CAAS;gBAEI,SAAS,EAAE,MAAM;IAE9C,OAAO,CAAC,MAAM;IAYd,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAIhE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInE,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAcrE,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI5C,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAI1C,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAIrC,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAW5C,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAK/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAI/E,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAIxC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAIxC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAI5D,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI;IAS3D;;;;;OAKG;IACH,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;CAoE9G"}

package/dist/sink.js

@@ -1,3 +1,17 @@
+/**
+ * AnnotationSink implementation (DD-005 §4.1).
+ *
+ * Writes are BUFFERED as ops during the parse (the IR's final channels don't
+ * exist until `finish()`), then applied to the finished IR in one validated
+ * pass. Bounds are clamped, budgets enforced, and the sink physically cannot
+ * reach geometry — it only ever touches `feature`, `object`, header
+ * capabilities/warnings, the metadata object beside the IR, and (DD-016 §4.2)
+ * an ADDITIVE allow-listed move-kind bit (`Wipe`/`Seam`) that never clears or
+ * reclassifies a move.
+ */
+import { MoveKind } from '@chestnutlabs/toolpath-core';
+/** The only move-kind bits an adapter may add (DD-016 §4.2/D6) — additive annotation kinds, never motion. */
+const ALLOWED_ANNOTATION_KINDS = MoveKind.Wipe | MoveKind.Seam;
 const MAX_RANGE_OPS = 1_000_000;
 const MAX_OBJECTS = 10_000;
 const MAX_RAW_ENTRIES = 512;
@@ -10,6 +24,8 @@ export class BufferedAnnotationSink {
     objects = new Map();
     machine = null;
     filaments = [];
+    filamentUsage = null;
+    printEstimate = null;
     toolInfos = new Map();
     thumbnails = [];
     raw = new Map();
@@ -37,6 +53,16 @@ export class BufferedAnnotationSink {
     setObject(segStart, segEnd, objectId) {
         this.pushOp({ channel: 'object', start: segStart, end: segEnd, value: objectId >>> 0 });
     }
+    addMoveKind(segStart, segEnd, kindBits) {
+        // Allow-list guard (DD-016 D6): only additive Wipe/Seam bits; anything else is a contract
+        // violation, dropped with a bounded warning rather than corrupting the kind channel.
+        const bits = kindBits & ALLOWED_ANNOTATION_KINDS;
+        if (bits === 0 || (kindBits & ~ALLOWED_ANNOTATION_KINDS) !== 0) {
+            this.warn('dialect-kind-not-allowlisted', `adapter '${this.adapterId}' tried to set non-allow-listed move-kind bits 0x${(kindBits >>> 0).toString(16)}`);
+            return;
+        }
+        this.pushOp({ channel: 'kind', start: segStart, end: segEnd, value: bits });
+    }
     defineObject(id, name) {
         if (this.objects.size < MAX_OBJECTS)
             this.objects.set(id, name.slice(0, 256));
@@ -48,6 +74,21 @@ export class BufferedAnnotationSink {
         if (this.filaments.length < 64)
             this.filaments.push(info);
     }
+    setFilamentUsage(usage) {
+        // Merge non-undefined fields (a slicer emits length/volume/weight on separate comment lines).
+        const prev = this.filamentUsage;
+        this.filamentUsage = {
+            lengthMm: usage.lengthMm ?? prev?.lengthMm,
+            volumeCm3: usage.volumeCm3 ?? prev?.volumeCm3,
+            weightG: usage.weightG ?? prev?.weightG,
+            source: prev?.source ?? usage.source
+        };
+    }
+    setPrintEstimate(estimate) {
+        // First estimate wins (adapters send the default/'normal' mode first; ignore later silent-mode).
+        if (this.printEstimate === null)
+            this.printEstimate = estimate;
+    }
     setToolInfo(tool, info) {
         if (this.toolInfos.size < 64)
             this.toolInfos.set(tool, info);
@@ -86,6 +127,13 @@ export class BufferedAnnotationSink {
             const end = Math.min(op.end + 1, count);
             if (end <= start)
                 continue;
+            if (op.channel === 'kind') {
+                // DD-016: additive OR — preserve the base Extrude/Travel classification, never overwrite it.
+                const kind = ir.segments.kind;
+                for (let i = start; i < end; i++)
+                    kind[i] |= op.value;
+                continue;
+            }
             ir.segments[op.channel].fill(op.value, start, end);
             touched[op.channel] = true;
         }
@@ -130,6 +178,12 @@ export class BufferedAnnotationSink {
         if (this.filaments.length > 0) {
             metadata.filaments = [...(metadata.filaments ?? []), ...this.filaments];
         }
+        if (this.filamentUsage !== null && metadata.filamentUsage === undefined) {
+            metadata.filamentUsage = this.filamentUsage;
+        }
+        if (this.printEstimate !== null && metadata.printEstimate === undefined) {
+            metadata.printEstimate = this.printEstimate;
+        }
         if (this.thumbnails.length > 0) {
             metadata.thumbnails = [...(metadata.thumbnails ?? []), ...this.thumbnails];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chestnutlabs/gcode-dialects",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Slicer/firmware dialect adapters for ToolpathIR annotation (DD-005). Adapters annotate metadata and optional channels — they can never alter geometry.",
   "keywords": [
     "gcode",
@@ -45,6 +45,6 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@chestnutlabs/toolpath-core": "0.2.0"
+    "@chestnutlabs/toolpath-core": "0.4.0"
   }
 }