mcp-3d-printer-server 1.2.11 → 1.2.12

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 1.2.12 — 2026-10-13
+
+### Fixed
+
+- Correct fresh H2C (`31B`) and H2D Pro (`239`) returned-serial identity without trusting configured identity or suppressing conflicts. Accept a cloud print-job identifier in `model_id` only when another recognized observed model or returned serial identifies the printer; unknown actual model fields still reject. Port reports from Adam (@adamkaplan, [fork #47](https://github.com/DMontgomery40/bambu-printer-mcp/issues/47)) and JaviOFC ([fork #36](https://github.com/DMontgomery40/bambu-printer-mcp/issues/36)).
+- Accept Bambu Studio 02.08 P2S per-variant nozzle tables alongside the selected plate header, and the exact P2S `M145 P0/P1` airduct forms. Preserve selected extruder/variant conflicts and independent thermal checks. Port Izzy Mansurov's (@sapoepsilon) code and regressions from [fork #33](https://github.com/DMontgomery40/bambu-printer-mcp/pull/33), including the subsequent selection-validation corrections.
+- Accept the official H2C startup forms only inside its single bounded executable startup block, with independent base/derived nozzle and bed checks and declared filament positions. Keep configuration `layer_change_gcode` keys from ending startup; actual layer markers and extrusion still close it. Reject unchecked `G383 U` targets outside the allowance. Thanks to Adam for [fork #48](https://github.com/DMontgomery40/bambu-printer-mcp/issues/48) and the exact vendor template evidence.
+- Accept the official X2D bare material-switch `B` flag and exact `M620.22 I<declared filament> P1` runout-purge form while rejecting unsupported variants and preserving heater ceilings. Thanks to Travis Cashman (@travismcashan) for [fork #44](https://github.com/DMontgomery40/bambu-printer-mcp/issues/44). These are file-inspection changes; no native X2D helper is added to this server.
+
+### Dependencies
+
+- Update basic-ftp to 6.2.3 for [GHSA-r4jh-29pc-gfqr](https://github.com/patrickjuchli/basic-ftp/security/advisories/GHSA-r4jh-29pc-gfqr): rejected control-character passwords/resume paths no longer cause an uncaught exception or leave the client unusable, and rejected PASS errors omit the password. Keep bambu-node pinned and preserve the parent's direct MQTT wire-shape and rejection guard.
+
+Validation uses mocked transports, the pinned official H2C template, unsafe-file mutations, and clean package installations. No physical printer operation is performed or claimed.
+
 ## 1.2.11 — 2026-10-06
 
 This release also includes the safety, slicing, Blender, and documentation

package/CONTRIBUTORS.md

@@ -6,6 +6,9 @@ Thank you to everyone who builds, tests, reports problems, and shares real print
 
 | Contributor | Contribution |
 | --- | --- |
+| [Adam (@adamkaplan)](https://github.com/adamkaplan) | Supplies H2C serial/status evidence in [fork #47](https://github.com/DMontgomery40/bambu-printer-mcp/issues/47) and exact Bambu Studio 02.08 startup/template reproductions in [fork #48](https://github.com/DMontgomery40/bambu-printer-mcp/issues/48), ported here with fresh identity and bounded file-inspection regressions. No maintainer physical H2C print is claimed. |
+| [Izzy Mansurov (sapoepsilon)](https://github.com/sapoepsilon) | Implements P2S extruder-variant and airduct inspection in [fork #33](https://github.com/DMontgomery40/bambu-printer-mcp/pull/33). Original code authorship is retained in the port, alongside unsafe-file and selected-header regressions; hardware printing is not claimed. |
+| [JaviOFC](https://github.com/JaviOFC) | Provides X2D firmware/status evidence in [fork #36](https://github.com/DMontgomery40/bambu-printer-mcp/issues/36) demonstrating that a cloud job identifier in model_id is not a printer declaration. The observed-identity correction and conflict regressions are ported here. |
 | [Jack Manning (EastArctica)](https://github.com/EastArctica) | Sends `X-Api-Key` on every Klipper/Moonraker request, including uploads and remote-file downloads, in [#30](https://github.com/DMontgomery40/mcp-3D-printer-server/pull/30). Supplies Klipper 0.13.0 evidence of authenticated status succeeding after the previous 401 response. |
 | [nitpreet22](https://github.com/nitpreet22) | Adds A1/A1 mini `M109 H` wait compatibility and safety regressions in the Bambu fork's [#41](https://github.com/DMontgomery40/bambu-printer-mcp/pull/41), ported here with original code authorship. Shares Windows A1 slicing and file-inspection evidence; this is not physical-print verification. |
 | [Javier Cortejoso (jcortejoso)](https://github.com/jcortejoso) | Reads the FULU bridge command from server configuration by default, with an explicit opt-in for per-call bridge commands, in [#20](https://github.com/DMontgomery40/mcp-3D-printer-server/pull/20). [#21](https://github.com/DMontgomery40/mcp-3D-printer-server/pull/21) extends the same gate to every per-call executable selector. |
@@ -19,7 +22,7 @@ Thank you to everyone who builds, tests, reports problems, and shares real print
 | Contributor | Contribution |
 | --- | --- |
 | [Steavie](https://github.com/Steavie) | Reports reversed A1/A1 mini serial identity in the Bambu fork's [#39](https://github.com/DMontgomery40/bambu-printer-mcp/issues/39). This repository now uses the corrected prefixes for fresh safety identity, with mocked MQTT regressions. |
-| [Travis Cashman (travismcashan)](https://github.com/travismcashan) | Reports MCP stdout pollution from model parsing and slicing in the Bambu fork's [#44](https://github.com/DMontgomery40/bambu-printer-mcp/issues/44). The stderr correction and subprocess regressions are also applied here. |
+| [Travis Cashman (travismcashan)](https://github.com/travismcashan) | Reports MCP stdout pollution from model parsing and slicing in the Bambu fork's [#44](https://github.com/DMontgomery40/bambu-printer-mcp/issues/44). The stderr correction and subprocess regressions are also applied here. Their exact stock material-switch and runout-purge evidence informs the X2D file-inspection port; maintainer validation remains offline and mocked. |
 | [Lickitysplitted](https://github.com/Lickitysplitted) | Diagnoses Bambu FTPS "Premature close" upload failures on an X1C as missing TLS session reuse in [#22](https://github.com/DMontgomery40/mcp-3D-printer-server/issues/22). Release 1.2.9 addresses it; confirmation on that X1C firmware is still outstanding. |
 | [CrowSoda](https://github.com/CrowSoda) | Tries slicing and printing on a Creality K1 Max through Klipper and Moonraker, and reports invalid OrcaSlicer CLI flags, missing filament-profile support, and unregistered upload and start tools in [#16](https://github.com/DMontgomery40/mcp-3D-printer-server/issues/16). All three are fixed. |
 | [dongio20](https://github.com/dongio20) | Reports the PrusaLink 0.8.1 status 404, with firmware details and the working endpoint, in [#11](https://github.com/DMontgomery40/mcp-3D-printer-server/issues/11). Fixed in [#15](https://github.com/DMontgomery40/mcp-3D-printer-server/pull/15). |
@@ -44,6 +47,10 @@ Thank you to everyone who builds, tests, reports problems, and shares real print
 
 See the [full contribution history](https://github.com/DMontgomery40/mcp-3D-printer-server/graphs/contributors) for commit authorship. Credit here includes bug reports, printer evidence, and reviewed proposals as well as merged code.
 
+## Dependency maintenance
+
+Thanks to [Patrick Juchli](https://github.com/patrickjuchli) and the basic-ftp maintainers for [6.2.3](https://github.com/patrickjuchli/basic-ftp/releases/tag/v6.2.3), which fixes rejected-command crashes, client recovery, and password exposure in PASS errors. The compatible FTPS security update is validated in this release.
+
 ## Open-source community and interoperability
 
 Special thanks to the [FULU Foundation](https://www.fulu.org/), [Louis Rossmann](https://www.youtube.com/@rossmanngroup), and the [OrcaSlicer-bambulab contributors](https://github.com/FULU-Foundation/OrcaSlicer-bambulab) for their work supporting user control and interoperable tools. This is community recognition, separate from code authorship in this repository. The Bambu-only fork, [bambu-printer-mcp](https://github.com/DMontgomery40/bambu-printer-mcp), credits its own contributors in its [CONTRIBUTORS.md](https://github.com/DMontgomery40/bambu-printer-mcp/blob/main/CONTRIBUTORS.md).

package/dist/safety/print-file.js

@@ -80,7 +80,7 @@ function parameters(text, flags = '') {
     return result;
 }
 // Layer comments only close a startup exception; they can never enable one.
-const isLayerMarker = (line) => /^\s*;\s*(?:LAYER_CHANGE|CHANGE_LAYER|LAYER\s*:|layer num\/total_layer_count\s*:)/i.test(line);
+const isLayerMarker = (line) => /^\s*;\s*(?:(?:LAYER_CHANGE|CHANGE_LAYER)(?:\s|$)|LAYER\s*:|layer num\/total_layer_count\s*:)/i.test(line);
 function boundedX1ePurge(lines, index) {
     // Official X1E common flush: 50 mm at 200 mm/min, followed immediately by
     // lowering the target. No dwell, XY extrusion, repeated block or open-ended
@@ -206,12 +206,13 @@ export async function inspectPrintFile(filePath, options) {
     if (/[\x00-\x08\x0b\x0c\x0e-\x1f\ufffd]/.test(source))
         return fail('binary or malformed G-code is not supported');
     const lines = source.split(/\r\n|\n|\r/);
-    const metadata = [project];
+    const headers = [];
     for (const line of lines) {
         const match = line.match(/^\s*;\s*([a-z_][a-z0-9_]*(?:\s+used\s+\[(?:g|mm)\])?)\s*(?:=|:)\s*(.*?)\s*$/i);
         if (match)
-            metadata.push({ [match[1].toLowerCase()]: match[2] });
+            headers.push({ [match[1].toLowerCase()]: match[2] });
     }
+    const metadata = [project, ...headers];
     validateFffJob([...metadata, plate]);
     const declaredModel = consistent(metadataValues(metadata, ['printer_model']), normalizeModel, 'printer model');
     if (declaredModel !== model)
@@ -234,6 +235,20 @@ export async function inspectPrintFile(filePath, options) {
         const entries = list(value).map(entry => entry.toLowerCase().replace(/[\s_-]+/g, '_'));
         return entries.length && entries.every(Boolean) ? entries : undefined;
     };
+    // Bambu Studio writes printer_extruder_id/printer_extruder_variant to
+    // project_settings.config as the full per-variant table, but to the plate
+    // G-code header as the per-physical-extruder selection it sliced with (for
+    // example ["1","1","1"] vs "1" on a single-nozzle P2S). Preserve the source:
+    // a plate header can never substitute a full table for its selected values.
+    const variantTable = (key, rows, convert) => {
+        const field = key.replace(/_/g, ' ');
+        const tableValues = metadataValues([project], [key]);
+        const selectedValues = metadataValues(headers, [key]);
+        if (tableValues.some(value => list(value).length !== rows) || selectedValues.some(value => list(value).length !== nozzleDiameters.length))
+            return fail(`unknown or malformed ${field} metadata`);
+        const table = consistent(tableValues, convert, field);
+        return { table, selected: selectedValues.length ? consistent(selectedValues, convert, `selected ${field}`) : undefined };
+    };
     const nozzleMetadata = (keys, variantRows = false) => {
         const values = metadataValues(metadata, keys);
         return values.length ? consistent(values, value => {
@@ -247,24 +262,34 @@ export async function inspectPrintFile(filePath, options) {
             // Bambu GUI projects may store nozzle types per extruder variant, while
             // diameters and selected flow types are per physical extruder. Never truncate
             // that variant table or mistake its rows for filament/nozzle positions.
-            const ids = consistent(metadataValues(metadata, ['printer_extruder_id']), value => {
+            const { table: ids, selected: selectedIds } = variantTable('printer_extruder_id', entries.length, value => {
                 const ids = list(value);
-                return ids.length === entries.length && ids.every(id => /^[1-9]\d*$/.test(id) && Number(id) <= nozzleDiameters.length) ? ids.map(Number) : undefined;
-            }, 'printer extruder id');
+                return ids.length > 0 && ids.every(id => /^[1-9]\d*$/.test(id) && Number(id) <= nozzleDiameters.length) ? ids.map(Number) : undefined;
+            });
+            // The selected form names each physical extruder once, in order.
+            if (selectedIds && selectedIds.some((id, index) => id !== index + 1))
+                return undefined;
+            const variants = metadataValues(metadata, ['printer_extruder_variant']).length
+                ? variantTable('printer_extruder_variant', entries.length, normalizedEntries) : undefined;
+            const extruders = variants ? consistent(metadataValues(metadata, ['extruder_type']), normalizedEntries, 'extruder type') : undefined;
             const resolved = [];
             for (let index = 0; index < nozzleDiameters.length; index++) {
                 const rows = ids.flatMap((id, row) => id === index + 1 ? [row] : []);
                 if (!rows.length)
                     return undefined;
-                if (rows.every(row => entries[row] === entries[rows[0]])) {
+                if (!variants) {
+                    if (!rows.every(row => entries[row] === entries[rows[0]]))
+                        return undefined;
                     resolved.push(entries[rows[0]]);
                     continue;
                 }
-                const variants = consistent(metadataValues(metadata, ['printer_extruder_variant']), normalizedEntries, 'printer extruder variant');
-                const extruders = consistent(metadataValues(metadata, ['extruder_type']), normalizedEntries, 'extruder type');
-                if (variants.length !== entries.length || extruders.length !== nozzleDiameters.length || !nozzleFlows)
+                // Validate declared variants even when all rows use the same material.
+                if (!extruders || extruders.length !== nozzleDiameters.length || !nozzleFlows)
                     return undefined;
-                const selected = rows.filter(row => variants[row] === `${extruders[index]}_${nozzleFlows[index]}`);
+                const variant = `${extruders[index]}_${nozzleFlows[index]}`;
+                if (variants.selected && variants.selected[index] !== variant)
+                    return undefined;
+                const selected = rows.filter(row => variants.table[row] === variant);
                 if (selected.length !== 1)
                     return undefined;
                 resolved.push(entries[selected[0]]);
@@ -306,6 +331,10 @@ export async function inspectPrintFile(filePath, options) {
     let previous;
     let maxNozzleTemperature = 0, maxBedTemperature = 0, maxChamberTemperature = 0, commandCount = 0;
     let depositionStarted = false, commonFlushUsed = false;
+    // Bound the H2C vendor forms to its one explicit executable startup block.
+    const startupStarts = lines.flatMap((line, index) => /^\s*;\s*EXECUTABLE_BLOCK_START\s*$/i.test(line) ? [index] : []);
+    const startupEnds = lines.flatMap((line, index) => /^\s*;\s*MACHINE_START_GCODE_END\s*$/i.test(line) ? [index] : []);
+    const h2cStartup = (index) => model === 'h2c' && !depositionStarted && startupStarts.length === 1 && startupEnds.length === 1 && index > startupStarts[0] && index < startupEnds[0];
     const heat = (component, value, position, allMaterials = false, startupPurge = false) => {
         const affected = allMaterials || position === undefined ? materials.map((_, index) => index) : [requirePosition(position)];
         if (component === 'nozzle' && startupPurge)
@@ -331,11 +360,14 @@ export async function inspectPrintFile(filePath, options) {
     };
     for (let index = 0; index < lines.length; index++) {
         try {
-            if (isLayerMarker(lines[index]))
+            if (isLayerMarker(lines[index]) || /^\s*;\s*MACHINE_START_GCODE_END\s*$/i.test(lines[index]))
                 closeStartupWindow();
             let line = stripComments(lines[index]);
             if (!line || line === '%')
                 continue;
+            // The official H2C template emits this literal separator without a semicolon.
+            if (line === '========== record data ==========' && h2cStartup(index))
+                continue;
             line = line.replace(/^N\d+\s*/i, '').replace(/\*\d+\s*$/, '');
             if (/[{}\[\]#]/.test(line))
                 fail('unresolved dynamic command syntax');
@@ -380,6 +412,34 @@ export async function inspectPrintFile(filePath, options) {
             }
             if (['M104', 'M109', 'M140', 'M190', 'M141', 'M191'].includes(code)) {
                 const args = parameters(argumentsText, 'A');
+                // Official A1 and A1 mini start G-code waits with M109 S<target> H<limit>
+                // (S25 H140, S100 H170, S220 H300). H is not a heater target: S stays the
+                // checked target, so H is accepted only within those vendor bounds.
+                if (args.has('O')) {
+                    // H2C's exact all-hotend preheat offset is relative to the declared
+                    // first-layer targets. Check every base and derived target, never use
+                    // editable maxima or an unchecked offset as thermal evidence.
+                    if (code !== 'M104' || !h2cStartup(index) || args.size !== 2 || args.get('O') !== -80 || !Number.isNaN(args.get('A')))
+                        fail('unsupported H2C startup offset parameters');
+                    const targets = consistent(metadataValues(metadata, ['nozzle_temperature_initial_layer']), value => {
+                        const values = list(value);
+                        return values.length === materials.length && values.every(v => NUMBER.test(v) && Number.isFinite(Number(v))) ? values.map(Number) : undefined;
+                    }, 'first-layer nozzle temperature');
+                    for (let position = 0; position < targets.length; position++) {
+                        validateTemperature('nozzle', targets[position], model, [materials[position]]);
+                        const preheat = Math.max(0, targets[position] - 80);
+                        validateTemperature('nozzle', preheat, model, [materials[position]]);
+                        nozzleTarget = Math.max(nozzleTarget, preheat);
+                        maxNozzleTemperature = Math.max(maxNozzleTemperature, preheat);
+                    }
+                    continue;
+                }
+                if (args.has('D')) {
+                    if (!['M140', 'M190'].includes(code) || !h2cStartup(index) || args.size !== 1)
+                        fail('unsupported H2C startup bed parameters');
+                    heat('bed', args.get('D'), undefined, true);
+                    continue;
+                }
                 const vendorWait = code === 'M109' && ['a1', 'a1mini'].includes(model);
                 for (const key of args.keys())
                     if (!'SRTA'.includes(key) && !(key === 'H' && vendorWait))
@@ -402,7 +462,12 @@ export async function inspectPrintFile(filePath, options) {
                         heat(component, args.get(key), position, args.has('T') || args.has('A'), commonFlush);
             }
             else if (code === 'M620' || code === 'M621') {
-                const args = parameters(argumentsText, 'MA');
+                const args = parameters(argumentsText, model === 'x2d' ? 'MAB' : model === 'h2c' ? 'MAN' : 'MA');
+                if (args.has('N') && (code !== 'M620' || !h2cStartup(index) || args.size !== 1 || !Number.isNaN(args.get('N'))))
+                    fail('unsupported H2C startup hotend-remap flag');
+                // X2D templates use B as a bare material-switch flag, never a target.
+                if (args.has('B') && (model !== 'x2d' || !Number.isNaN(args.get('B'))))
+                    fail('unsupported material-switch B flag');
                 if (args.has('S')) {
                     const position = args.get('S');
                     if ([254, 255, 65279, 65535].includes(position)) {
@@ -426,6 +491,14 @@ export async function inspectPrintFile(filePath, options) {
                     }
                 }
             }
+            else if (code === 'M620.22') {
+                // Official X2D runout auto-purge enables the declared project filament.
+                // It supplies no heater target; all explicit heat still uses the shared gate.
+                const args = parameters(argumentsText);
+                if (model !== 'x2d' || args.size !== 2 || !args.has('I') || args.get('P') !== 1)
+                    fail('unsupported M620.22 runout purge parameters');
+                requirePosition(args.get('I'));
+            }
             else if (code === 'M620.1' || code === 'M620.10') {
                 const args = parameters(argumentsText, 'E');
                 const position = code === 'M620.10' && args.get('A') === 1 ? pending ?? active : code === 'M620.10' && args.get('A') === 0 ? active : undefined;
@@ -444,10 +517,27 @@ export async function inspectPrintFile(filePath, options) {
             else if (/^G150\./.test(code) && /T/i.test(argumentsText)) {
                 fail(`unsupported thermal-affecting wipe command ${code}`);
             }
+            else if (code === 'M620.14') {
+                const args = parameters(argumentsText);
+                // H2C tower coordinates include the rear wipe area outside object bounds.
+                if (!h2cStartup(index) || args.size !== 2 || !['X', 'Y'].every(key => args.has(key) && Number.isFinite(args.get(key)) && args.get(key) >= 0 && args.get(key) <= 350))
+                    fail('unsupported H2C startup tower parameters');
+            }
+            else if (model === 'h2c' && ['G383', 'G383.3', 'G383.7'].includes(code) && /U/i.test(argumentsText)) {
+                const args = parameters(argumentsText);
+                const expected = code === 'G383.7' ? 'UJ' : code === 'G383.3' ? 'UL' : 'OUL';
+                if (!h2cStartup(index) || args.size !== expected.length || [...args.keys()].some(key => !expected.includes(key)) || args.get('U') !== 140 ||
+                    (code === 'G383.7' && args.get('J') !== 0) || (code === 'G383' && args.get('O') !== 2))
+                    fail('unsupported H2C startup probing parameters');
+                const position = args.has('L') ? requirePosition(args.get('L')) : active;
+                heat('nozzle', args.get('U'), position);
+            }
             else if (code === 'G383' || code === 'G383.3') {
                 // Bambu probing routines carry nozzle temperature in T and optionally
                 // the project filament position in L (including the H2D G383.3 form).
                 const args = parameters(argumentsText);
+                if (args.has('U'))
+                    fail('unsupported G383 temperature parameter U outside H2C startup');
                 if (code === 'G383.3' && (!args.has('T') || [...args.keys()].some(key => !'TL'.includes(key))))
                     fail('unsupported G383.3 temperature parameters');
                 const position = args.has('L') ? requirePosition(args.get('L')) : active;
@@ -490,8 +580,11 @@ export async function inspectPrintFile(filePath, options) {
                 fail(`unsupported thermal-affecting filament command ${code}`);
             }
             else if (code === 'M145') {
+                // Airduct mode switch (P0 cooling, P1 heating) in the official H2-series,
+                // X2D and P2S start/end G-code; it sets no heater target. Other forms and
+                // models without a switchable airduct stay rejected.
                 const args = parameters(argumentsText);
-                if (args.size !== 1 || !args.has('P') || ![0, 1].includes(args.get('P')) || !['h2d', 'h2dpro', 'h2c', 'h2s', 'x2d'].includes(model))
+                if (args.size !== 1 || !args.has('P') || ![0, 1].includes(args.get('P')) || !['h2d', 'h2dpro', 'h2c', 'h2s', 'x2d', 'p2s'].includes(model))
                     fail('unsupported thermal-affecting M145 parameters');
             }
             else if (code === 'M142') {

package/dist/safety/printer-state.js

@@ -17,18 +17,24 @@ const MODEL_IDS = {
     N2S: "A1", A1M: "A1 Mini", C11: "P1P", C12: "P1S", C13: "X1E", "BL-P001": "X1C", "BL-P002": "X1",
 };
 const SERIAL_MODELS = {
-    "093": "H2S", "094": "H2D", "239": "H2C", "31B": "H2D Pro", "20P": "X2D",
+    "093": "H2S", "094": "H2D", "31B": "H2C", "239": "H2D Pro", "20P": "X2D",
     "00M": "X1C", "00W": "X1", "03W": "X1E", "01S": "P1P", "01P": "P1S", "22E": "P2S", "039": "A1", "030": "A1 Mini",
 };
 function object(value) {
     return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function observedIdentity(raw, configuredSerial) {
-    const declarations = [raw.model_id, raw.model, raw.printer_type, raw.device?.devModel, raw.device?.dev_model]
+    const recognizedModelFromModelId = typeof raw.model_id === "string" && raw.model_id.trim()
+        ? normalizeModel(MODEL_IDS[raw.model_id.trim().toUpperCase()] ?? raw.model_id)
+        : undefined;
+    const declarations = [raw.model, raw.printer_type, raw.device?.devModel, raw.device?.dev_model]
         .filter(value => typeof value === "string" && value.trim());
     const models = declarations.map(value => normalizeModel(MODEL_IDS[value.trim().toUpperCase()] ?? value));
     if (models.some(model => !model))
         throw new Error("Printer reported an unknown model identity; cannot verify this printer.");
+    if (recognizedModelFromModelId)
+        models.unshift(recognizedModelFromModelId);
+    const hasReportedModel = models.length > 0;
     const serials = [raw.serial, raw.serial_number, raw.sn, raw.device?.sn,
         ...(Array.isArray(raw.modules) ? raw.modules.filter((module) => module?.name === "ota").map((module) => module.sn) : [])]
         .filter(value => typeof value === "string" && value.trim()).map(value => value.trim());
@@ -43,7 +49,7 @@ function observedIdentity(raw, configuredSerial) {
     if (new Set(models).size > 1)
         throw new Error("Printer returned contradictory model identity information.");
     const model = models[0];
-    return { model, observedSerial: serials[0], identitySource: declarations.length ? "report" : "module-serial" };
+    return { model, observedSerial: serials[0], identitySource: hasReportedModel ? "report" : "module-serial" };
 }
 /** Only raw reports received after this request are evidence. Never read printer.data here. */
 export function readFreshPrinterStatus(printer, serial, timeoutMs = 5000) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "mcp-3d-printer-server",
     "mcpName": "io.github.DMontgomery40/mcp-3d-printer-server",
-    "version": "1.2.11",
+    "version": "1.2.12",
     "description": "MCP server for connecting Claude with 3D printer management systems",
     "main": "dist/index.js",
     "repository": "https://github.com/DMontgomery40/mcp-3D-printer-server",
@@ -82,7 +82,7 @@
         "@modelcontextprotocol/sdk": "^1.32.1",
         "axios": "^1.20.0",
         "bambu-node": "3.22.21",
-        "basic-ftp": "^6.2.2",
+        "basic-ftp": "^6.2.3",
         "dotenv": "^16.6.1",
         "form-data": "^4.0.6",
         "jszip": "^3.10.2",

package/server.json

@@ -7,22 +7,49 @@
     "url": "https://github.com/DMontgomery40/mcp-3D-printer-server",
     "source": "github"
   },
-  "version": "1.2.11",
+  "version": "1.2.12",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "mcp-3d-printer-server",
-      "version": "1.2.11",
+      "version": "1.2.12",
       "runtimeHint": "npx",
-      "transport": { "type": "stdio" },
+      "transport": {
+        "type": "stdio"
+      },
       "environmentVariables": [
-        { "name": "PRINTER_TYPE", "description": "Printer backend: octoprint, klipper, duet, repetier, bambu, prusa, or creality.", "isRequired": true },
-        { "name": "PRINTER_HOST", "description": "Printer IP address or hostname.", "isRequired": true },
-        { "name": "PRINTER_PORT", "description": "Optional backend-specific port." },
-        { "name": "API_KEY", "description": "API key for printer backends that require authentication.", "isSecret": true },
-        { "name": "BAMBU_SERIAL", "description": "Printer serial number; required for Bambu Lab." },
-        { "name": "BAMBU_TOKEN", "description": "LAN access code; required for Bambu Lab.", "isSecret": true },
-        { "name": "BAMBU_MODEL", "description": "Exact Bambu model; required for Bambu print operations." }
+        {
+          "name": "PRINTER_TYPE",
+          "description": "Printer backend: octoprint, klipper, duet, repetier, bambu, prusa, or creality.",
+          "isRequired": true
+        },
+        {
+          "name": "PRINTER_HOST",
+          "description": "Printer IP address or hostname.",
+          "isRequired": true
+        },
+        {
+          "name": "PRINTER_PORT",
+          "description": "Optional backend-specific port."
+        },
+        {
+          "name": "API_KEY",
+          "description": "API key for printer backends that require authentication.",
+          "isSecret": true
+        },
+        {
+          "name": "BAMBU_SERIAL",
+          "description": "Printer serial number; required for Bambu Lab."
+        },
+        {
+          "name": "BAMBU_TOKEN",
+          "description": "LAN access code; required for Bambu Lab.",
+          "isSecret": true
+        },
+        {
+          "name": "BAMBU_MODEL",
+          "description": "Exact Bambu model; required for Bambu print operations."
+        }
       ]
     }
   ]

package/src/safety/print-file.ts

@@ -70,7 +70,7 @@ function parameters(text: string, flags = ''): Map<string,number> {
   return result;
 }
 // Layer comments only close a startup exception; they can never enable one.
-const isLayerMarker=(line:string):boolean=>/^\s*;\s*(?:LAYER_CHANGE|CHANGE_LAYER|LAYER\s*:|layer num\/total_layer_count\s*:)/i.test(line);
+const isLayerMarker=(line:string):boolean=>/^\s*;\s*(?:(?:LAYER_CHANGE|CHANGE_LAYER)(?:\s|$)|LAYER\s*:|layer num\/total_layer_count\s*:)/i.test(line);
 function boundedX1ePurge(lines:string[],index:number):boolean {
   // Official X1E common flush: 50 mm at 200 mm/min, followed immediately by
   // lowering the target. No dwell, XY extrusion, repeated block or open-ended
@@ -154,11 +154,12 @@ export async function inspectPrintFile(filePath: string, options: {model:string;
     if(plateIndex!==0) return fail('raw G-code has only plate index 0');source=bytes.toString('utf8');
   } else return fail('unsupported printable artifact; use a sliced .3mf or textual .gcode file');
   if(/[\x00-\x08\x0b\x0c\x0e-\x1f\ufffd]/.test(source)) return fail('binary or malformed G-code is not supported');
-  const lines=source.split(/\r\n|\n|\r/);const metadata:Metadata[]=[project];
+  const lines=source.split(/\r\n|\n|\r/);const headers:Metadata[]=[];
   for(const line of lines) {
     const match=line.match(/^\s*;\s*([a-z_][a-z0-9_]*(?:\s+used\s+\[(?:g|mm)\])?)\s*(?:=|:)\s*(.*?)\s*$/i);
-    if(match) metadata.push({[match[1].toLowerCase()]:match[2]});
+    if(match) headers.push({[match[1].toLowerCase()]:match[2]});
   }
+  const metadata:Metadata[]=[project,...headers];
   validateFffJob([...metadata,plate]);
   const declaredModel=consistent(metadataValues(metadata,['printer_model']),normalizeModel,'printer model');
   if(declaredModel!==model) return fail(`file model ${declaredModel} contradicts requested model ${model}`);
@@ -178,6 +179,17 @@ export async function inspectPrintFile(filePath: string, options: {model:string;
     const entries=list(value).map(entry=>entry.toLowerCase().replace(/[\s_-]+/g,'_'));
     return entries.length && entries.every(Boolean)?entries:undefined;
   };
+  // Bambu Studio writes printer_extruder_id/printer_extruder_variant to
+  // project_settings.config as the full per-variant table, but to the plate
+  // G-code header as the per-physical-extruder selection it sliced with (for
+  // example ["1","1","1"] vs "1" on a single-nozzle P2S). Preserve the source:
+  // a plate header can never substitute a full table for its selected values.
+  const variantTable=<T>(key:string,rows:number,convert:(value:unknown)=>T[]|undefined):{table:T[];selected?:T[]}=>{
+    const field=key.replace(/_/g,' ');const tableValues=metadataValues([project],[key]);const selectedValues=metadataValues(headers,[key]);
+    if(tableValues.some(value=>list(value).length!==rows) || selectedValues.some(value=>list(value).length!==nozzleDiameters.length)) return fail(`unknown or malformed ${field} metadata`);
+    const table=consistent(tableValues,convert,field);
+    return {table,selected:selectedValues.length?consistent(selectedValues,convert,`selected ${field}`):undefined};
+  };
   const nozzleMetadata=(keys:string[],variantRows=false):string[]|undefined=>{
     const values=metadataValues(metadata,keys);
     return values.length ? consistent(values,value=>{
@@ -188,18 +200,27 @@ export async function inspectPrintFile(filePath: string, options: {model:string;
       // Bambu GUI projects may store nozzle types per extruder variant, while
       // diameters and selected flow types are per physical extruder. Never truncate
       // that variant table or mistake its rows for filament/nozzle positions.
-      const ids=consistent(metadataValues(metadata,['printer_extruder_id']),value=>{
-        const ids=list(value);return ids.length===entries.length && ids.every(id=>/^[1-9]\d*$/.test(id) && Number(id)<=nozzleDiameters.length)?ids.map(Number):undefined;
-      },'printer extruder id');
+      const {table:ids,selected:selectedIds}=variantTable('printer_extruder_id',entries.length,value=>{
+        const ids=list(value);return ids.length>0 && ids.every(id=>/^[1-9]\d*$/.test(id) && Number(id)<=nozzleDiameters.length)?ids.map(Number):undefined;
+      });
+      // The selected form names each physical extruder once, in order.
+      if(selectedIds && selectedIds.some((id,index)=>id!==index+1)) return undefined;
+      const variants=metadataValues(metadata,['printer_extruder_variant']).length
+        ? variantTable('printer_extruder_variant',entries.length,normalizedEntries):undefined;
+      const extruders=variants ? consistent(metadataValues(metadata,['extruder_type']),normalizedEntries,'extruder type'):undefined;
       const resolved:string[]=[];
       for(let index=0;index<nozzleDiameters.length;index++) {
         const rows=ids.flatMap((id,row)=>id===index+1?[row]:[]);
         if(!rows.length) return undefined;
-        if(rows.every(row=>entries[row]===entries[rows[0]])) {resolved.push(entries[rows[0]]);continue;}
-        const variants=consistent(metadataValues(metadata,['printer_extruder_variant']),normalizedEntries,'printer extruder variant');
-        const extruders=consistent(metadataValues(metadata,['extruder_type']),normalizedEntries,'extruder type');
-        if(variants.length!==entries.length || extruders.length!==nozzleDiameters.length || !nozzleFlows) return undefined;
-        const selected=rows.filter(row=>variants[row]===`${extruders[index]}_${nozzleFlows[index]}`);
+        if(!variants) {
+          if(!rows.every(row=>entries[row]===entries[rows[0]])) return undefined;
+          resolved.push(entries[rows[0]]);continue;
+        }
+        // Validate declared variants even when all rows use the same material.
+        if(!extruders || extruders.length!==nozzleDiameters.length || !nozzleFlows) return undefined;
+        const variant=`${extruders[index]}_${nozzleFlows[index]}`;
+        if(variants.selected && variants.selected[index]!==variant) return undefined;
+        const selected=rows.filter(row=>variants.table[row]===variant);
         if(selected.length!==1) return undefined;
         resolved.push(entries[selected[0]]);
       }
@@ -228,6 +249,10 @@ export async function inspectPrintFile(filePath: string, options: {model:string;
   let nozzleTarget=0;let selectsAms=false;let pending: number|undefined;let previous: number|undefined;
   let maxNozzleTemperature=0,maxBedTemperature=0,maxChamberTemperature=0,commandCount=0;
   let depositionStarted=false,commonFlushUsed=false;
+  // Bound the H2C vendor forms to its one explicit executable startup block.
+  const startupStarts=lines.flatMap((line,index)=>/^\s*;\s*EXECUTABLE_BLOCK_START\s*$/i.test(line)?[index]:[]);
+  const startupEnds=lines.flatMap((line,index)=>/^\s*;\s*MACHINE_START_GCODE_END\s*$/i.test(line)?[index]:[]);
+  const h2cStartup=(index:number)=>model==='h2c' && !depositionStarted && startupStarts.length===1 && startupEnds.length===1 && index>startupStarts[0] && index<startupEnds[0];
   const heat=(component:'nozzle'|'bed'|'chamber',value:number,position?:number,allMaterials=false,startupPurge=false)=>{
     const affected=allMaterials || position===undefined ? materials.map((_,index)=>index) : [requirePosition(position)];
     if(component==='nozzle' && startupPurge) validateStartupPurgeTemperature(value,model,affected.map(index=>materials[index]));
@@ -246,8 +271,10 @@ export async function inspectPrintFile(filePath: string, options: {model:string;
   };
   for(let index=0;index<lines.length;index++) {
     try {
-      if(isLayerMarker(lines[index])) closeStartupWindow();
+      if(isLayerMarker(lines[index]) || /^\s*;\s*MACHINE_START_GCODE_END\s*$/i.test(lines[index])) closeStartupWindow();
       let line=stripComments(lines[index]);if(!line||line==='%') continue;
+      // The official H2C template emits this literal separator without a semicolon.
+      if(line==='========== record data ==========' && h2cStartup(index)) continue;
       line=line.replace(/^N\d+\s*/i,'').replace(/\*\d+\s*$/,'');
       if(/[{}\[\]#]/.test(line)) fail('unresolved dynamic command syntax');
       if(/^SYNC(?=$|\s)/i.test(line)) {
@@ -275,6 +302,30 @@ export async function inspectPrintFile(filePath: string, options: {model:string;
       }
       if(['M104','M109','M140','M190','M141','M191'].includes(code)) {
         const args=parameters(argumentsText,'A');
+        // Official A1 and A1 mini start G-code waits with M109 S<target> H<limit>
+        // (S25 H140, S100 H170, S220 H300). H is not a heater target: S stays the
+        // checked target, so H is accepted only within those vendor bounds.
+        if(args.has('O')) {
+          // H2C's exact all-hotend preheat offset is relative to the declared
+          // first-layer targets. Check every base and derived target, never use
+          // editable maxima or an unchecked offset as thermal evidence.
+          if(code!=='M104' || !h2cStartup(index) || args.size!==2 || args.get('O')!==-80 || !Number.isNaN(args.get('A')!)) fail('unsupported H2C startup offset parameters');
+          const targets=consistent(metadataValues(metadata,['nozzle_temperature_initial_layer']),value=>{
+            const values=list(value);return values.length===materials.length && values.every(v=>NUMBER.test(v) && Number.isFinite(Number(v)))?values.map(Number):undefined;
+          },'first-layer nozzle temperature');
+          for(let position=0;position<targets.length;position++) {
+            validateTemperature('nozzle',targets[position],model,[materials[position]]);
+            const preheat=Math.max(0,targets[position]-80);
+            validateTemperature('nozzle',preheat,model,[materials[position]]);
+            nozzleTarget=Math.max(nozzleTarget,preheat);
+            maxNozzleTemperature=Math.max(maxNozzleTemperature,preheat);
+          }
+          continue;
+        }
+        if(args.has('D')) {
+          if(!['M140','M190'].includes(code) || !h2cStartup(index) || args.size!==1) fail('unsupported H2C startup bed parameters');
+          heat('bed',args.get('D')!,undefined,true);continue;
+        }
         const vendorWait=code==='M109' && ['a1','a1mini'].includes(model);
         for(const key of args.keys()) if(!'SRTA'.includes(key) && !(key==='H' && vendorWait)) fail(`unsupported ${code} temperature parameter ${key}`);
         if(args.has('H') && (!Number.isFinite(args.get('H')) || args.get('H')!<0 || args.get('H')!>300)) fail(`unsupported ${code} wait parameter H`);
@@ -288,12 +339,21 @@ export async function inspectPrintFile(filePath: string, options: {model:string;
         if(commonFlush) commonFlushUsed=true;
         for(const key of ['S','R']) if(args.has(key)) heat(component,args.get(key)!,position,args.has('T') || args.has('A'),commonFlush);
       } else if(code==='M620' || code==='M621') {
-        const args=parameters(argumentsText,'MA');
+        const args=parameters(argumentsText,model==='x2d'?'MAB':model==='h2c'?'MAN':'MA');
+        if(args.has('N') && (code!=='M620' || !h2cStartup(index) || args.size!==1 || !Number.isNaN(args.get('N')!))) fail('unsupported H2C startup hotend-remap flag');
+        // X2D templates use B as a bare material-switch flag, never a target.
+        if(args.has('B') && (model!=='x2d' || !Number.isNaN(args.get('B')!))) fail('unsupported material-switch B flag');
         if(args.has('S')) {
           const position=args.get('S')!;
           if([254,255,65279,65535].includes(position)) {if(code==='M621') {previous=active;active=undefined;}pending=undefined;}
           else {selectsAms=true;requirePosition(position);if(code==='M620') pending=position;else {validateTemperature('nozzle',nozzleTarget,model,[materials[position]]);previous=active;active=position;pending=undefined;}}
         }
+      } else if(code==='M620.22') {
+        // Official X2D runout auto-purge enables the declared project filament.
+        // It supplies no heater target; all explicit heat still uses the shared gate.
+        const args=parameters(argumentsText);
+        if(model!=='x2d' || args.size!==2 || !args.has('I') || args.get('P')!==1) fail('unsupported M620.22 runout purge parameters');
+        requirePosition(args.get('I')!);
       } else if(code==='M620.1' || code==='M620.10') {
         const args=parameters(argumentsText,'E');
         const position=code==='M620.10' && args.get('A')===1 ? pending ?? active : code==='M620.10' && args.get('A')===0 ? active : undefined;
@@ -306,10 +366,22 @@ export async function inspectPrintFile(filePath: string, options: {model:string;
         if(args.has('T')) heat('nozzle',args.get('T')!,active);
       } else if(/^G150\./.test(code) && /T/i.test(argumentsText)) {
         fail(`unsupported thermal-affecting wipe command ${code}`);
+      } else if(code==='M620.14') {
+        const args=parameters(argumentsText);
+        // H2C tower coordinates include the rear wipe area outside object bounds.
+        if(!h2cStartup(index) || args.size!==2 || !['X','Y'].every(key=>args.has(key) && Number.isFinite(args.get(key)) && args.get(key)!>=0 && args.get(key)!<=350)) fail('unsupported H2C startup tower parameters');
+      } else if(model==='h2c' && ['G383','G383.3','G383.7'].includes(code) && /U/i.test(argumentsText)) {
+        const args=parameters(argumentsText);
+        const expected=code==='G383.7'?'UJ':code==='G383.3'?'UL':'OUL';
+        if(!h2cStartup(index) || args.size!==expected.length || [...args.keys()].some(key=>!expected.includes(key)) || args.get('U')!==140 ||
+           (code==='G383.7' && args.get('J')!==0) || (code==='G383' && args.get('O')!==2)) fail('unsupported H2C startup probing parameters');
+        const position=args.has('L')?requirePosition(args.get('L')!):active;
+        heat('nozzle',args.get('U')!,position);
       } else if(code==='G383' || code==='G383.3') {
         // Bambu probing routines carry nozzle temperature in T and optionally
         // the project filament position in L (including the H2D G383.3 form).
         const args=parameters(argumentsText);
+        if(args.has('U')) fail('unsupported G383 temperature parameter U outside H2C startup');
         if(code==='G383.3' && (!args.has('T') || [...args.keys()].some(key=>!'TL'.includes(key)))) fail('unsupported G383.3 temperature parameters');
         const position=args.has('L')?requirePosition(args.get('L')!):active;
         if(args.has('T')) heat('nozzle',args.get('T')!,position);
@@ -338,8 +410,11 @@ export async function inspectPrintFile(filePath: string, options: {model:string;
       } else if((/^M620\./.test(code) && !['M620.3','M620.6','M620.11'].includes(code)) || /^M621\./.test(code)) {
         fail(`unsupported thermal-affecting filament command ${code}`);
       } else if(code==='M145') {
+        // Airduct mode switch (P0 cooling, P1 heating) in the official H2-series,
+        // X2D and P2S start/end G-code; it sets no heater target. Other forms and
+        // models without a switchable airduct stay rejected.
         const args=parameters(argumentsText);
-        if(args.size!==1 || !args.has('P') || ![0,1].includes(args.get('P')!) || !['h2d','h2dpro','h2c','h2s','x2d'].includes(model)) fail('unsupported thermal-affecting M145 parameters');
+        if(args.size!==1 || !args.has('P') || ![0,1].includes(args.get('P')!) || !['h2d','h2dpro','h2c','h2s','x2d','p2s'].includes(model)) fail('unsupported thermal-affecting M145 parameters');
       } else if(code==='M142') {
         // Bambu chamber fan regulation thresholds, not an active heater command.
         const args=parameters(argumentsText);for(const key of ['S','R']) if(args.has(key) && (!Number.isFinite(args.get(key)) || args.get(key)!<0 || args.get(key)!>65)) fail('unsupported chamber fan temperature threshold');

package/src/safety/printer-state.ts

@@ -20,7 +20,7 @@ const MODEL_IDS: Record<string, string> = {
   N2S: "A1", A1M: "A1 Mini", C11: "P1P", C12: "P1S", C13: "X1E", "BL-P001": "X1C", "BL-P002": "X1",
 };
 const SERIAL_MODELS: Record<string, string> = {
-  "093": "H2S", "094": "H2D", "239": "H2C", "31B": "H2D Pro", "20P": "X2D",
+  "093": "H2S", "094": "H2D", "31B": "H2C", "239": "H2D Pro", "20P": "X2D",
   "00M": "X1C", "00W": "X1", "03W": "X1E", "01S": "P1P", "01P": "P1S", "22E": "P2S", "039": "A1", "030": "A1 Mini",
 };
 
@@ -28,10 +28,15 @@ function object(value: unknown): value is Record<string, any> {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function observedIdentity(raw: Record<string, any>, configuredSerial: string) {
-  const declarations = [raw.model_id, raw.model, raw.printer_type, raw.device?.devModel, raw.device?.dev_model]
+  const recognizedModelFromModelId = typeof raw.model_id === "string" && raw.model_id.trim()
+    ? normalizeModel(MODEL_IDS[raw.model_id.trim().toUpperCase()] ?? raw.model_id)
+    : undefined;
+  const declarations = [raw.model, raw.printer_type, raw.device?.devModel, raw.device?.dev_model]
     .filter(value => typeof value === "string" && value.trim());
   const models = declarations.map(value => normalizeModel(MODEL_IDS[value.trim().toUpperCase()] ?? value));
   if (models.some(model => !model)) throw new Error("Printer reported an unknown model identity; cannot verify this printer.");
+  if (recognizedModelFromModelId) models.unshift(recognizedModelFromModelId);
+  const hasReportedModel = models.length > 0;
   const serials = [raw.serial, raw.serial_number, raw.sn, raw.device?.sn,
     ...(Array.isArray(raw.modules) ? raw.modules.filter((module: any) => module?.name === "ota").map((module: any) => module.sn) : [])]
     .filter(value => typeof value === "string" && value.trim()).map(value => value.trim());
@@ -44,7 +49,7 @@ function observedIdentity(raw: Record<string, any>, configuredSerial: string) {
   }
   if (new Set(models).size > 1) throw new Error("Printer returned contradictory model identity information.");
   const model = models[0];
-  return { model, observedSerial: serials[0], identitySource: declarations.length ? "report" : "module-serial" };
+  return { model, observedSerial: serials[0], identitySource: hasReportedModel ? "report" : "module-serial" };
 }
 
 /** Only raw reports received after this request are evidence. Never read printer.data here. */