@chestnutlabs/gcode-dialects 0.16.0 → 0.17.0

package/dist/annotate.d.ts

@@ -19,24 +19,38 @@ 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 {
+/** One end of a housekeeping bracket (DD-016/DD-026 D3): source byte + whether it OPENED the bracket. */
+export interface BracketMark {
     srcByte: number;
     open: boolean;
 }
+/** One end of a wipe bracket (DD-016, #182). Structurally a {@link BracketMark}; kept for compatibility. */
+export type WipeMark = BracketMark;
 /**
  * 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;
+/**
+ * Classify a comment as a bare `<NAME>_START` / `<NAME>_END` bracket marker (semicolon already stripped
+ * before onComment; case/space tolerant). Used for wipe (DD-016) and the DD-026 D3 housekeeping brackets
+ * (`FLUSH_START/END`, `WIPE_TOWER_START/END`). Returns null for any other comment.
+ */
+export declare function matchBracketComment(comment: string, name: 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.
+ * (DD-016 §4.2). Segments emitted between a START and its END are the wipe moves. Returns ranges applied.
  */
 export declare function applyWipeRanges(ir: ToolpathIR, marks: WipeMark[], sink: AnnotationSink): number;
+/**
+ * Resolve a housekeeping bracket (DD-026 D3) — e.g. Bambu `FLUSH_START/END` → `FeatureRole.Purge`,
+ * `WIPE_TOWER_START/END` → `FeatureRole.WipeTower` — to segment ranges and set `role` on the enclosed
+ * segments. Apply this AFTER the `;TYPE:`/`; FEATURE:` markers so the explicit bracket wins over the
+ * surrounding role (the classifier then excludes the whole bracket from `modelBounds`). Returns ranges
+ * applied.
+ */
+export declare function applyFeatureBracketRanges(ir: ToolpathIR, marks: BracketMark[], role: number, 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,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"}
+{"version":3,"file":"annotate.d.ts","sourceRoot":"","sources":["../src/annotate.ts"],"names":[],"mappings":"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"}

package/dist/annotate.js

@@ -45,20 +45,29 @@ export function applyMarkerRanges(ir, markers, write) {
  * leading space and casing. Returns null for any other comment.
  */
 export function matchWipeComment(comment) {
+    return matchBracketComment(comment, 'WIPE');
+}
+/**
+ * Classify a comment as a bare `<NAME>_START` / `<NAME>_END` bracket marker (semicolon already stripped
+ * before onComment; case/space tolerant). Used for wipe (DD-016) and the DD-026 D3 housekeeping brackets
+ * (`FLUSH_START/END`, `WIPE_TOWER_START/END`). Returns null for any other comment.
+ */
+export function matchBracketComment(comment, name) {
     const t = comment.trim().toUpperCase();
-    if (t === 'WIPE_START')
+    const n = name.toUpperCase();
+    if (t === `${n}_START`)
         return 'start';
-    if (t === 'WIPE_END')
+    if (t === `${n}_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.
+ * Resolve balanced open/close bracket marks to inclusive segment ranges and hand each to `emit`. Shared
+ * by the wipe (MoveKind) and DD-026 housekeeping-role (FeatureRole) brackets. Unbalanced or nested
+ * markers degrade safely: a stray END is ignored, a second START before an END folds into the open
+ * bracket, and a START left open at end-of-file closes at the last segment. Returns ranges emitted.
  */
-export function applyWipeRanges(ir, marks, sink) {
+function forEachBracketRange(ir, marks, emit) {
     let applied = 0;
     let openByte = -1;
     for (const mark of marks) {
@@ -68,9 +77,9 @@ export function applyWipeRanges(ir, marks, sink) {
         }
         else if (openByte >= 0) {
             const start = segAtOrAfterByte(ir, openByte);
-            const end = segAtOrAfterByte(ir, mark.srcByte); // first segment AFTER the wipe block
+            const end = segAtOrAfterByte(ir, mark.srcByte); // first segment AFTER the block
             if (end - 1 >= start) {
-                sink.addMoveKind(start, end - 1, MoveKind.Wipe);
+                emit(start, end - 1);
                 applied++;
             }
             openByte = -1;
@@ -79,12 +88,29 @@ export function applyWipeRanges(ir, marks, sink) {
     if (openByte >= 0) {
         const start = segAtOrAfterByte(ir, openByte);
         if (ir.segments.count - 1 >= start) {
-            sink.addMoveKind(start, ir.segments.count - 1, MoveKind.Wipe);
+            emit(start, ir.segments.count - 1);
             applied++;
         }
     }
     return applied;
 }
+/**
+ * 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. Returns ranges applied.
+ */
+export function applyWipeRanges(ir, marks, sink) {
+    return forEachBracketRange(ir, marks, (start, end) => sink.addMoveKind(start, end, MoveKind.Wipe));
+}
+/**
+ * Resolve a housekeeping bracket (DD-026 D3) — e.g. Bambu `FLUSH_START/END` → `FeatureRole.Purge`,
+ * `WIPE_TOWER_START/END` → `FeatureRole.WipeTower` — to segment ranges and set `role` on the enclosed
+ * segments. Apply this AFTER the `;TYPE:`/`; FEATURE:` markers so the explicit bracket wins over the
+ * surrounding role (the classifier then excludes the whole bracket from `modelBounds`). Returns ranges
+ * applied.
+ */
+export function applyFeatureBracketRanges(ir, marks, role, sink) {
+    return forEachBracketRange(ir, marks, (start, end) => sink.setFeature(start, end, role));
+}
 /**
  * Apply SEGMENT-indexed markers (CommandEvent.segIndex — exact, no byte
  * resolution needed) as contiguous ranges; value 0 terminates (DD-005 phase 5).

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

@@ -1 +1 @@
-{"version":3,"file":"orca-bambu.d.ts","sourceRoot":"","sources":["../src/orca-bambu.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAoErE,wBAAgB,SAAS,IAAI,cAAc,CA2G1C"}
+{"version":3,"file":"orca-bambu.d.ts","sourceRoot":"","sources":["../src/orca-bambu.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,gBAAgB,CAAC;AA8ErE,wBAAgB,SAAS,IAAI,cAAc,CA0H1C"}

package/dist/orca-bambu.js

@@ -14,7 +14,7 @@
 import { FeatureRole } from '@chestnutlabs/toolpath-core';
 import { parseFilamentTotals, parseHmsToSeconds } from './prusaslicer.js';
 import { PrintingObjectTracker } from './object-markers.js';
-import { ThumbnailCollector, applyMarkerRanges, applyWipeRanges, bedFromPoints, matchWipeComment, parseAreaPoints, parseKeyValue } from './annotate.js';
+import { ThumbnailCollector, applyFeatureBracketRanges, applyMarkerRanges, applyWipeRanges, bedFromPoints, matchBracketComment, matchWipeComment, parseAreaPoints, parseKeyValue } from './annotate.js';
 /** Orca/Bambu `; FEATURE:` names → DD-001 FeatureRole. */
 const FEATURE_MAP = {
     'inner wall': FeatureRole.Perimeter,
@@ -44,6 +44,8 @@ function stateFor(sink) {
         s = {
             features: [],
             wipes: [],
+            flushes: [],
+            wipeTowers: [],
             objectTracker: new PrintingObjectTracker(),
             bedPoints: null,
             thumbs: new ThumbnailCollector()
@@ -95,6 +97,17 @@ export function orcaBambu() {
                 s.wipes.push({ srcByte, open: wipe === 'start' });
                 return;
             }
+            // DD-026 D3 housekeeping brackets (checked after WIPE — WIPE_TOWER is a distinct token).
+            const flush = matchBracketComment(comment, 'FLUSH');
+            if (flush !== null) {
+                s.flushes.push({ srcByte, open: flush === 'start' });
+                return;
+            }
+            const wipeTower = matchBracketComment(comment, 'WIPE_TOWER');
+            if (wipeTower !== null) {
+                s.wipeTowers.push({ srcByte, open: wipeTower === 'start' });
+                return;
+            }
             if (s.thumbs.isActive || trimmed.toLowerCase().startsWith('thumbnail')) {
                 s.thumbs.feed(comment, sink);
                 return;
@@ -138,7 +151,11 @@ export function orcaBambu() {
         finalize(ir, sink) {
             const s = stateFor(sink);
             const features = applyMarkerRanges(ir, s.features, (a, b, v) => sink.setFeature(a, b, v));
-            if (features > 0)
+            // Housekeeping brackets (DD-026 D3) override the surrounding ;TYPE: role — apply them AFTER the
+            // feature markers so the bracket range wins (setFeature fills, last write per segment holds).
+            const flush = applyFeatureBracketRanges(ir, s.flushes, FeatureRole.Purge, sink);
+            const wipeTower = applyFeatureBracketRanges(ir, s.wipeTowers, FeatureRole.WipeTower, sink);
+            if (features + flush + wipeTower > 0)
                 sink.upgradeCapability('featureRoles', 'known');
             s.objectTracker.apply(ir, sink);
             if (applyWipeRanges(ir, s.wipes, sink) > 0)

package/dist/registry.d.ts

@@ -1,16 +1,3 @@
-/**
- * Dialect registry & run composition (DD-005 §4.1/§4.5, as amended).
- *
- * Explicit, tree-shakeable: `createDialectRunner(adapters)` — no global
- * side-effect registry. The returned factory matches the parser's structural
- * `DialectRunnerFactory` shape (the parser never imports this package;
- * worker entries compose the two).
- *
- * Composition (amendment 1): detection picks at most ONE adapter per `kind`
- * (highest confidence wins; ties select none for that kind — never a guess),
- * and all selected adapters run together. Adapter exceptions are contained:
- * a throwing adapter is disabled for the run with an `adapter-failed` warning.
- */
 import type { DialectDetection, DialectMetadata, ToolpathIR, Warning } from '@chestnutlabs/toolpath-core';
 import type { CommandEvent, DialectAdapter } from './contracts.js';
 export interface DialectRunInput {

package/dist/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC1G,OAAO,KAAK,EAAE,YAAY,EAAe,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKhF,MAAM,WAAW,eAAe;IAC9B,oFAAoF;IACpF,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnD,SAAS,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IACzC,QAAQ,CAAC,EAAE,EAAE,UAAU,GAAG,gBAAgB,CAAC;CAC5C;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU,GAAG,IAAI,CAAC;CACtD;AAUD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,oBAAoB,CAsFpF"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC1G,OAAO,KAAK,EAAE,YAAY,EAAe,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKhF,MAAM,WAAW,eAAe;IAC9B,oFAAoF;IACpF,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnD,SAAS,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;IACzC,QAAQ,CAAC,EAAE,EAAE,UAAU,GAAG,gBAAgB,CAAC;CAC5C;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU,GAAG,IAAI,CAAC;CACtD;AAUD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,oBAAoB,CA4FpF"}

package/dist/registry.js

@@ -1,3 +1,17 @@
+/**
+ * Dialect registry & run composition (DD-005 §4.1/§4.5, as amended).
+ *
+ * Explicit, tree-shakeable: `createDialectRunner(adapters)` — no global
+ * side-effect registry. The returned factory matches the parser's structural
+ * `DialectRunnerFactory` shape (the parser never imports this package;
+ * worker entries compose the two).
+ *
+ * Composition (amendment 1): detection picks at most ONE adapter per `kind`
+ * (highest confidence wins; ties select none for that kind — never a guess),
+ * and all selected adapters run together. Adapter exceptions are contained:
+ * a throwing adapter is disabled for the run with an `adapter-failed` warning.
+ */
+import { classifyModelBounds } from '@chestnutlabs/toolpath-core';
 import { BufferedAnnotationSink } from './sink.js';
 const CONFIDENCE_RANK = { known: 3, inferred: 2, approximated: 1, unavailable: 0 };
 export function createDialectRunner(adapters) {
@@ -76,6 +90,12 @@ export function createDialectRunner(adapters) {
                         contain(a, () => a.adapter.finalize?.(ir, a.sink, a.config));
                         a.sink.apply(ir, metadata, (code, message) => conflicts.push({ code, message, severity: 'warn', count: 1 }));
                     }
+                    // Now that every adapter has settled the object/feature channels, refresh the non-model
+                    // classification authoritatively (DD-026 D4/D5/D7, lifecycle §5). Parse time saw empty
+                    // channels; this is where membership/roles actually exist.
+                    const { modelBounds, classification } = classifyModelBounds(ir.segments, ir.header.originOffset);
+                    ir.modelBounds = modelBounds;
+                    ir.header.capabilities.nonModelClassification = classification;
                     for (const w of conflicts)
                         ir.header.warnings.push(w);
                     ir.header.dialects.push(...active.map((a) => ({ id: a.detection.dialectId, confidence: a.detection.confidence })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chestnutlabs/gcode-dialects",
-  "version": "0.16.0",
+  "version": "0.17.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.16.0"
+    "@chestnutlabs/toolpath-core": "0.17.0"
   }
 }