bambu-printer-mcp 1.1.6 → 1.1.9

package/dist/index.js

@@ -5,27 +5,46 @@ import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/
 import { ListResourcesRequestSchema, ReadResourceRequestSchema, ListToolsRequestSchema, CallToolRequestSchema, ErrorCode, McpError } from "@modelcontextprotocol/sdk/types.js";
 import dotenv from "dotenv";
 import fs from "fs";
+import os from "node:os";
 import path from "path";
 import { createServer as createHttpServer } from "node:http";
 import { randomUUID } from "node:crypto";
 import { STLManipulator, SLICER_TYPES, normalizeSlicerType, } from "./stl/stl-manipulator.js";
 import { BambuNetworkBridge } from "./bambu-network-bridge.js";
+import { BlenderMcpBridge } from "./blender-mcp-bridge.js";
 import { hasAmsMappingInput, normalizeAmsMappingObject, normalizeBridgeAmsTrayValue } from "./ams-mapping.js";
 import { analyze3MFAmsRequirements, analyze3MFPlateObjects, analyzeCollarCharm3MF, extractBambuTemplateSettings, getCollarCharmRolePolicy, parse3MF } from './3mf_parser.js';
-import { BambuImplementation } from "./printers/bambu.js";
+import { BambuImplementation, assertDirectPrintSupported } from "./printers/bambu.js";
 dotenv.config();
 const DEFAULT_HOST = process.env.BAMBU_PRINTER_HOST || process.env.PRINTER_HOST || "localhost";
 const DEFAULT_BAMBU_SERIAL = process.env.BAMBU_PRINTER_SERIAL || process.env.BAMBU_SERIAL || "";
 const DEFAULT_BAMBU_TOKEN = process.env.BAMBU_PRINTER_ACCESS_TOKEN || process.env.BAMBU_TOKEN || "";
 const DEFAULT_BAMBU_DEV_ID = process.env.BAMBU_DEV_ID || DEFAULT_BAMBU_SERIAL;
-const TEMP_DIR = process.env.TEMP_DIR || path.join(process.cwd(), "temp");
+// os.tmpdir(), not process.cwd() — a packaged Claude Desktop extension is
+// spawned with a cwd we don't control (and may not be writable), so a
+// cwd-relative default here can throw at module load via the mkdirSync
+// below and kill the server before it ever opens the stdio transport.
+const AUTOMATIC_TEMP_DIR = process.env.TEMP_DIR ? undefined : fs.mkdtempSync(path.join(os.tmpdir(), "bambu-printer-mcp-"));
+const TEMP_DIR = process.env.TEMP_DIR || AUTOMATIC_TEMP_DIR;
+if (AUTOMATIC_TEMP_DIR) {
+    // The exit event also covers startup failures and normal event-loop exit.
+    // Only the directory created above belongs to us; explicit TEMP_DIR is retained.
+    process.once("exit", () => {
+        try {
+            fs.rmSync(AUTOMATIC_TEMP_DIR, { recursive: true, force: true });
+        }
+        catch (error) {
+            console.error("Unable to remove the server's temporary directory:", error);
+        }
+    });
+}
 // Printer model and bed type
 const DEFAULT_BAMBU_MODEL = process.env.BAMBU_PRINTER_MODEL?.trim().toLowerCase() ||
     process.env.BAMBU_MODEL?.trim().toLowerCase() ||
     "";
 const DEFAULT_BED_TYPE = process.env.BED_TYPE?.trim().toLowerCase() || "textured_plate";
 const DEFAULT_NOZZLE_DIAMETER = process.env.NOZZLE_DIAMETER?.trim() || "0.4";
-const VALID_BAMBU_MODELS = ["p1s", "p1p", "p2s", "x1c", "x1e", "a1", "a1mini", "h2d", "h2s", "h2c"];
+const VALID_BAMBU_MODELS = ["p1s", "p1p", "p2s", "x1c", "x1e", "a1", "a1mini", "h2d", "h2s", "h2c", "x2d"];
 const H2_BAMBU_MODELS = new Set(["h2d", "h2s", "h2c"]);
 const VALID_BED_TYPES = ["textured_plate", "cool_plate", "engineering_plate", "hot_plate", "supertack_plate"];
 const VALID_BAMBUSTUDIO_CLI_BED_TYPES = ["textured_plate", "cool_plate", "engineering_plate", "hot_plate"];
@@ -41,6 +60,7 @@ const BAMBU_MODEL_PRESETS = {
     h2d: (n) => `Bambu Lab H2D ${n} nozzle`,
     h2s: (n) => `Bambu Lab H2S ${n} nozzle`,
     h2c: (n) => `Bambu Lab H2C ${n} nozzle`,
+    x2d: (n) => `Bambu Lab X2D ${n} nozzle`,
 };
 const FILAMENT_PROFILE_DIR = "/Applications/BambuStudio.app/Contents/Resources/profiles/BBL/filament";
 const FILAMENT_MODEL_CODES = {
@@ -54,6 +74,7 @@ const FILAMENT_MODEL_CODES = {
     h2d: "H2D",
     h2s: "H2S",
     h2c: "H2C",
+    x2d: "X2D",
 };
 const COLLAR_CHARM_POLICY = getCollarCharmRolePolicy();
 let filamentProfileIndexCache = null;
@@ -352,6 +373,19 @@ function extractPrinterDiagnostics(status) {
         diagnostic_fields: diagnosticFields,
     };
 }
+/** Parse "#RRGGBB;#RRGGBB" (leading '#' optional) into positional slot colours. */
+function parseFilamentColours(value) {
+    const colours = value.split(";").map((c) => c.trim()).filter(Boolean)
+        .map((c) => (c.startsWith("#") ? c : `#${c}`).toUpperCase());
+    for (const c of colours) {
+        if (!/^#[0-9A-F]{6}([0-9A-F]{2})?$/.test(c)) {
+            throw new Error(`Invalid filament colour "${c}"; expected #RRGGBB.`);
+        }
+    }
+    if (colours.length === 0)
+        throw new Error("filament_colours must list at least one colour.");
+    return colours;
+}
 function validateBambuModel(model) {
     const normalized = model.trim().toLowerCase();
     if (!VALID_BAMBU_MODELS.includes(normalized)) {
@@ -743,10 +777,12 @@ if (!fs.existsSync(TEMP_DIR)) {
 }
 class BambuPrinterMCPServer {
     constructor() {
+        this.blender = new BlenderMcpBridge();
+        this.shuttingDown = false;
         this.runtimeConfig = readRuntimeConfig();
         this.server = new Server({
             name: "bambu-printer-mcp",
-            version: "1.0.0"
+            version: JSON.parse(fs.readFileSync(new URL("../package.json", import.meta.url), "utf8")).version
         }, {
             capabilities: {
                 resources: {},
@@ -801,6 +837,7 @@ class BambuPrinterMCPServer {
                                 { const: "h2d", title: "H2D" },
                                 { const: "h2s", title: "H2S" },
                                 { const: "h2c", title: "H2C" },
+                                { const: "x2d", title: "X2D" },
                             ],
                         },
                     },
@@ -1528,6 +1565,7 @@ class BambuPrinterMCPServer {
                                 bambu_token: { type: "string", description: "Access token (default: value from env)" },
                                 load_filaments: { type: "string", description: "Override filament profiles. Semicolon-separated paths to filament JSON configs." },
                                 load_filament_ids: { type: "string", description: "Optional filament-to-object mapping string." },
+                                filament_colours: { type: "string", description: "Optional slot colours, one #RRGGBB per filament slot in order, separated by ';' (e.g. '#161616;#FFFFFF'). Defaults to the input 3MF's project colours, else the BambuStudio default." },
                                 ensure_on_bed: { type: "boolean", description: "Lift floating models onto the bed." },
                                 arrange: { type: "boolean", description: "Auto-arrange objects on the build plate." },
                                 orient: { type: "boolean", description: "Auto-orient model for optimal printability." },
@@ -1582,6 +1620,7 @@ class BambuPrinterMCPServer {
                                 load_filaments: { type: "string", description: "Override filament profiles. Semicolon-separated paths to filament JSON configs, e.g. 'pla_basic.json;petg_cf.json'." },
                                 filament_profile: { type: "string", description: "Compatibility alias for load_filaments. Semicolon-separated Orca/Bambu filament profile JSON paths." },
                                 load_filament_ids: { type: "string", description: "Map filaments to objects/parts. Comma-separated IDs matching load_filaments order, e.g. '1,2,3,1' assigns filament 1 to objects 0 and 3." },
+                                filament_colours: { type: "string", description: "Optional slot colours, one #RRGGBB per filament slot in order, separated by ';' (e.g. '#161616;#FFFFFF'). Defaults to the input 3MF's project colours, else the BambuStudio default." },
                                 enable_timelapse: { type: "boolean", description: "Insert timelapse parking moves into gcode. The toolhead parks at a fixed position each layer for camera capture. Adds ~10% print time." },
                                 allow_mix_temp: { type: "boolean", description: "Allow filaments with different temperature requirements on the same plate. Required for multi-material prints mixing e.g. PLA and PETG." },
                                 scale: { type: "number", description: "Uniform scale factor applied to all axes. 1.0 = original size, 2.0 = double, 0.5 = half. Applied before slicing." },
@@ -2086,7 +2125,7 @@ class BambuPrinterMCPServer {
                                 bambu_model: {
                                     type: "string",
                                     enum: [...VALID_BAMBU_MODELS],
-                                    description: "REQUIRED: Bambu Lab printer model. H2D, H2S, and H2C are the primary intended paths."
+                                    description: "REQUIRED: Bambu Lab printer model. H2D, H2S, and H2C are the primary intended paths. X2D direct printing is not supported."
                                 },
                                 host: { type: "string", description: "Hostname or IP of the printer (default: value from env)" },
                                 bambu_serial: { type: "string", description: "Serial number (default: value from env)" },
@@ -2140,28 +2179,62 @@ class BambuPrinterMCPServer {
                             required: ["stl_path"]
                         }
                     },
+                    {
+                        name: "blender_mcp_status",
+                        description: "Inspect Blender MCP configuration or connect and discover the remote server's tools and schemas. Connecting does not edit the scene; use get_scene_info through blender_mcp_call to check the Blender addon.",
+                        inputSchema: {
+                            type: "object",
+                            properties: {
+                                connect: { type: "boolean", description: "Initialize the configured stdio MCP server and discover its tools (default false)." },
+                                timeout_ms: { type: "integer", minimum: 100, maximum: 300000, description: "Total connection and discovery deadline in milliseconds; defaults to BLENDER_MCP_TIMEOUT_MS or 120000." }
+                            },
+                            additionalProperties: false
+                        }
+                    },
+                    {
+                        name: "blender_mcp_call",
+                        description: "Call a discovered tool on the configured Blender MCP server, preserving its full MCP content and errors. Discover tool schemas with blender_mcp_status first; execute_blender_code accepts Python code and user_prompt. Calls can modify the active Blender scene and are never automatically retried.",
+                        inputSchema: {
+                            type: "object",
+                            properties: {
+                                tool_name: { type: "string", description: "Exact name advertised by Blender MCP, such as get_scene_info or execute_blender_code." },
+                                arguments: { type: "object", description: "Arguments matching the remote tool's discovered input schema. Preserve the user's own words in user_prompt when the remote tool requests it." },
+                                timeout_ms: { type: "integer", minimum: 100, maximum: 300000, description: "Total connection, discovery, and tool deadline in milliseconds; defaults to BLENDER_MCP_TIMEOUT_MS or 120000." }
+                            },
+                            required: ["tool_name"],
+                            additionalProperties: false
+                        }
+                    },
                     {
                         name: "blender_mcp_edit_model",
-                        description: "Send STL-edit instructions to a Blender MCP bridge command for advanced model edits",
+                        description: "Import, edit, and export a local STL through standard Blender MCP with verified output and existing scene objects preserved. Requires a shared local filesystem and Blender Object Mode. Also supports a separately configured legacy executable bridge.",
                         inputSchema: {
                             type: "object",
                             properties: {
                                 stl_path: { type: "string", description: "Path to the local STL file" },
                                 operations: {
                                     type: "array",
-                                    description: "Ordered edit operations for Blender (e.g. remesh, boolean, decimate)",
+                                    description: "Ordered operations: decimate:<ratio greater than 0 and at most 1>, remesh:<positive voxel size in STL units>, boolean_union:<STL path>. Legacy custom bridges define their own operations.",
+                                    minItems: 1,
+                                    maxItems: 64,
                                     items: { type: "string" }
                                 },
-                                bridge_command: { type: "string", description: "Override command for invoking Blender MCP bridge. Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1." },
-                                execute: { type: "boolean", description: "Execute bridge command (true) or return payload only (false)" }
+                                output_path: { type: "string", description: "Required for standard MCP previews and execution: new local STL output path whose parent exists. Existing files are never overwritten. Optional for legacy-only bridge configuration." },
+                                user_prompt: { type: "string", description: "The user's own words describing the edit, passed unchanged to Blender MCP." },
+                                timeout_ms: { type: "integer", minimum: 100, maximum: 300000, description: "Total Blender request deadline in milliseconds; defaults to BLENDER_MCP_TIMEOUT_MS or 120000." },
+                                bridge_command: { type: "string", description: "Legacy custom bridge executable override, not a standard MCP command. Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1." },
+                                execute: { type: "boolean", description: "Apply edits and export (true) or validate and return the prepared request without connecting (false, default)." }
                             },
-                            required: ["stl_path", "operations"]
+                            required: process.env.BLENDER_MCP_COMMAND?.trim()
+                                ? ["stl_path", "operations", "output_path"]
+                                : ["stl_path", "operations"],
+                            additionalProperties: false
                         }
                     }
                 ]
             };
         });
-        this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+        this.server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
             const { name, arguments: args } = request.params;
             const host = String(args?.host || DEFAULT_HOST);
             const bambuSerial = String(args?.bambu_serial || DEFAULT_BAMBU_SERIAL);
@@ -2288,23 +2361,27 @@ class BambuPrinterMCPServer {
                         }
                         break;
                     }
-                    case "upload_file":
+                    case "upload_file": {
                         if (!args?.file_path || !args?.filename) {
                             throw new Error("Missing required parameters: file_path and filename");
                         }
-                        if (Boolean(args.print ?? false)) {
-                            await this.resolveBambuModel(args?.bambu_model);
-                        }
-                        result = await this.bambu.uploadFile(host, bambuSerial, bambuToken, String(args.file_path), String(args.filename), Boolean(args.print ?? false));
+                        const print = Boolean(args.print ?? false);
+                        const uploadModel = print ? await this.resolveBambuModel(args?.bambu_model) : undefined;
+                        if (print)
+                            assertDirectPrintSupported(uploadModel, bambuSerial);
+                        result = await this.bambu.uploadFile(host, bambuSerial, bambuToken, String(args.file_path), String(args.filename), print, uploadModel);
                         break;
+                    }
                     case "start_print":
-                    case "start_print_job":
+                    case "start_print_job": {
                         if (!args?.filename) {
                             throw new Error("Missing required parameter: filename");
                         }
-                        await this.resolveBambuModel(args?.bambu_model);
-                        result = await this.bambu.startJob(host, bambuSerial, bambuToken, String(args.filename));
+                        const startModel = await this.resolveBambuModel(args?.bambu_model);
+                        assertDirectPrintSupported(startModel, bambuSerial);
+                        result = await this.bambu.startJob(host, bambuSerial, bambuToken, String(args.filename), startModel);
                         break;
+                    }
                     case "cancel_print":
                         result = await this.bambu.cancelJob(host, bambuSerial, bambuToken);
                         break;
@@ -2444,6 +2521,8 @@ class BambuPrinterMCPServer {
                         }
                         if (args?.load_filament_ids !== undefined)
                             sliceBambuOptions.loadFilamentIds = String(args.load_filament_ids);
+                        if (args?.filament_colours !== undefined)
+                            sliceBambuOptions.filamentColours = parseFilamentColours(String(args.filament_colours));
                         sliceBambuOptions.bedType = resolveBambuStudioCliBedType(args?.bed_type);
                         if (args?.enable_timelapse !== undefined)
                             sliceBambuOptions.enableTimelapse = Boolean(args.enable_timelapse);
@@ -2521,6 +2600,8 @@ class BambuPrinterMCPServer {
                         }
                         if (args?.load_filament_ids !== undefined)
                             sliceBambuOptions.loadFilamentIds = String(args.load_filament_ids);
+                        if (args?.filament_colours !== undefined)
+                            sliceBambuOptions.filamentColours = parseFilamentColours(String(args.filament_colours));
                         sliceBambuOptions.bedType = resolveBambuStudioCliBedType(args?.bed_type);
                         if (args?.enable_timelapse !== undefined)
                             sliceBambuOptions.enableTimelapse = Boolean(args.enable_timelapse);
@@ -2573,6 +2654,7 @@ class BambuPrinterMCPServer {
                         }
                         const { slicerType, slicerPath, slicerProfile } = this.resolveSlicerConfigFromArgs(args, "print_3mf");
                         const printModel = await this.resolveBambuModel(args?.bambu_model);
+                        assertDirectPrintSupported(printModel, bambuSerial);
                         const printBedType = resolveBedType(args?.bed_type);
                         const printNozzle = String(args?.nozzle_diameter || DEFAULT_NOZZLE_DIAMETER);
                         const activeSlicerProfile = await resolveTemplateFirstSlicerProfilePath(args, slicerProfile || undefined, resolveTemplatePathFromName(["json", "config", "3mf"]) || explicitTemplatePath || undefined, TEMP_DIR);
@@ -2583,45 +2665,37 @@ class BambuPrinterMCPServer {
                             throw new Error("plate_index must be a non-negative integer.");
                         }
                         let threeMFPath = String(args.three_mf_path);
-                        // Auto-slice if 3MF has no gcode
-                        try {
-                            const JSZip = (await import('jszip')).default;
-                            const zipData = fs.readFileSync(threeMFPath);
-                            const zip = await JSZip.loadAsync(zipData);
-                            const hasGcode = Object.keys(zip.files).some(f => f.match(/Metadata\/plate_\d+\.gcode/i) || f.endsWith('.gcode'));
-                            if (!hasGcode) {
-                                if (printBedType === "supertack_plate") {
-                                    throw new Error('BambuStudio CLI SuperTack bed type is not verified; use a pre-sliced 3MF for SuperTack or choose textured_plate, cool_plate, engineering_plate, or hot_plate.');
-                                }
-                                console.log(`3MF has no gcode — auto-slicing with ${slicerType} for ${printModel}`);
-                                const autoSliceOptions = {
-                                    uptodate: true,
-                                    ensureOnBed: true,
-                                    minSave: true,
-                                    skipModifiedGcodes: true,
-                                    bedType: printBedType,
-                                };
-                                if (!explicitSlicerProfile) {
-                                    try {
-                                        const liveFilaments = await this.getResolvedPrinterFilamentInventory(host, bambuSerial, bambuToken, printModel, printNozzle);
-                                        if (liveFilaments.recommended?.load_filaments) {
-                                            autoSliceOptions.loadFilaments = liveFilaments.recommended.load_filaments;
-                                        }
-                                    }
-                                    catch (filamentError) {
-                                        console.warn("Could not resolve live printer filaments for auto-slicing:", filamentError);
+                        // Inspect and auto-slice before upload. Preserve any failure instead of sending an unsliced project.
+                        const JSZip = (await import('jszip')).default;
+                        const zipData = fs.readFileSync(threeMFPath);
+                        const zip = await JSZip.loadAsync(zipData);
+                        const hasGcode = Object.values(zip.files).some(entry => !entry.dir && /\.gcode$/i.test(entry.name));
+                        if (!hasGcode) {
+                            if (printBedType === "supertack_plate") {
+                                throw new Error('BambuStudio CLI SuperTack bed type is not verified; use a pre-sliced 3MF for SuperTack or choose textured_plate, cool_plate, engineering_plate, or hot_plate.');
+                            }
+                            console.log(`3MF has no gcode — auto-slicing with ${slicerType} for ${printModel}`);
+                            const autoSliceOptions = {
+                                uptodate: true,
+                                ensureOnBed: true,
+                                minSave: true,
+                                skipModifiedGcodes: true,
+                                bedType: printBedType,
+                            };
+                            if (!explicitSlicerProfile) {
+                                try {
+                                    const liveFilaments = await this.getResolvedPrinterFilamentInventory(host, bambuSerial, bambuToken, printModel, printNozzle);
+                                    if (liveFilaments.recommended?.load_filaments) {
+                                        autoSliceOptions.loadFilaments = liveFilaments.recommended.load_filaments;
                                     }
                                 }
-                                threeMFPath = await this.stlManipulator.sliceSTL(threeMFPath, slicerType, slicerPath, activeSlicerProfile, undefined, // progressCallback
-                                printPreset, autoSliceOptions);
-                                console.log("Auto-sliced to: " + threeMFPath);
-                            }
-                        }
-                        catch (sliceCheckErr) {
-                            if (String(sliceCheckErr?.message || "").includes("SuperTack")) {
-                                throw sliceCheckErr;
+                                catch (filamentError) {
+                                    console.warn("Could not resolve live printer filaments for auto-slicing:", filamentError);
+                                }
                             }
-                            console.warn("Could not check/slice 3MF, proceeding with original:", sliceCheckErr.message);
+                            threeMFPath = await this.stlManipulator.sliceSTL(threeMFPath, slicerType, slicerPath, activeSlicerProfile, undefined, // progressCallback
+                            printPreset, autoSliceOptions);
+                            console.log("Auto-sliced to: " + threeMFPath);
                         }
                         const parsed3MFData = await parse3MF(threeMFPath);
                         const isH2Print = H2_BAMBU_MODELS.has(printModel);
@@ -2721,6 +2795,7 @@ class BambuPrinterMCPServer {
                         }
                         const { slicerType, slicerPath, slicerProfile } = this.resolveSlicerConfigFromArgs(args, "print_collar_charm");
                         const printModel = await this.resolveBambuModel(args?.bambu_model);
+                        assertDirectPrintSupported(printModel, bambuSerial);
                         const printBedType = resolveBedType(args?.bed_type);
                         const printNozzle = String(args?.nozzle_diameter || DEFAULT_NOZZLE_DIAMETER);
                         const activeSlicerProfile = await resolveTemplateFirstSlicerProfilePath(args, slicerProfile || undefined, resolvedTemplateSourcePath || explicitTemplatePath || undefined, TEMP_DIR);
@@ -2783,16 +2858,13 @@ class BambuPrinterMCPServer {
                             throw new Error("Missing required parameter: stl_path");
                         result = await this.stlManipulator.layFlat(String(args.stl_path));
                         break;
+                    case "blender_mcp_status":
+                        result = await this.blender.status(args ?? {}, extra.signal);
+                        break;
+                    case "blender_mcp_call":
+                        return await this.blender.call(args ?? {}, extra.signal);
                     case "blender_mcp_edit_model":
-                        if (!args?.stl_path || !Array.isArray(args.operations)) {
-                            throw new Error("Missing required parameters: stl_path and operations");
-                        }
-                        result = await this.invokeBlenderBridge({
-                            stlPath: String(args.stl_path),
-                            operations: args.operations.map((entry) => String(entry)),
-                            execute: Boolean(args.execute ?? false),
-                            bridgeCommand: this.resolveExecutableSelectorArg(args.bridge_command, "blender_mcp_edit_model", "bridge_command", true) ?? this.runtimeConfig.blenderBridgeCommand,
-                        });
+                        result = await this.blender.edit(args ?? {}, this.resolveExecutableSelectorArg(args?.bridge_command, "blender_mcp_edit_model", "bridge_command", true) ?? (!process.env.BLENDER_MCP_COMMAND?.trim() ? this.runtimeConfig.blenderBridgeCommand : undefined), extra.signal);
                         break;
                     default:
                         throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: ${name}`);
@@ -2823,38 +2895,28 @@ class BambuPrinterMCPServer {
             }
         });
     }
-    async invokeBlenderBridge(params) {
-        const payload = {
-            stlPath: params.stlPath,
-            operations: params.operations,
-        };
-        if (!params.execute || !params.bridgeCommand) {
-            return {
-                status: "prepared",
-                payload,
-                note: params.bridgeCommand
-                    ? "Set execute=true to run the Blender bridge command."
-                    : "No BLENDER_MCP_BRIDGE_COMMAND configured. Set the env var or pass bridge_command.",
-            };
-        }
-        const { execFile } = await import("node:child_process");
-        const { promisify } = await import("node:util");
-        const execFileAsync = promisify(execFile);
-        const { stdout, stderr } = await execFileAsync(params.bridgeCommand, [], {
-            env: { ...process.env, MCP_BLENDER_PAYLOAD: JSON.stringify(payload) },
-            timeout: 120000,
-        });
-        return {
-            status: "executed",
-            stdout: stdout.trim(),
-            stderr: stderr.trim(),
-        };
-    }
     async startStdio() {
         const transport = new StdioServerTransport();
         await this.server.connect(transport);
+        process.stdin.once("end", () => { void this.shutdown(); });
         console.error("Bambu Printer MCP server running on stdio");
     }
+    async shutdown(exitCode = 0) {
+        if (this.shuttingDown)
+            return;
+        this.shuttingDown = true;
+        try {
+            // Closing the MCP transport aborts its active requests before exit cleanup.
+            await this.server.close();
+            this.httpRuntime?.httpServer.close();
+        }
+        catch (error) {
+            console.error("[MCP Shutdown]", error);
+        }
+        finally {
+            process.exit(exitCode);
+        }
+    }
     async startHttp() {
         const { httpHost, httpPort, httpPath, statefulSession, enableJsonResponse, allowedOrigins } = this.runtimeConfig;
         const transport = new StreamableHTTPServerTransport({
@@ -2894,4 +2956,6 @@ class BambuPrinterMCPServer {
     }
 }
 const server = new BambuPrinterMCPServer();
+process.once("SIGINT", () => { void server.shutdown(130); });
+process.once("SIGTERM", () => { void server.shutdown(143); });
 server.run().catch(console.error);

package/dist/printers/bambu.d.ts

@@ -1,3 +1,4 @@
+export declare function assertDirectPrintSupported(model: string | undefined, serial?: string): void;
 interface BambuPrintOptionsInternal {
     projectName: string;
     filePath: string;
@@ -67,8 +68,8 @@ export declare class BambuImplementation {
         name: string;
         exists: boolean;
     }>;
-    uploadFile(host: string, serial: string, token: string, filePath: string, filename: string, print: boolean): Promise<Record<string, unknown>>;
-    startJob(host: string, serial: string, token: string, filename: string): Promise<{
+    uploadFile(host: string, serial: string, token: string, filePath: string, filename: string, print: boolean, bambuModel?: string): Promise<Record<string, unknown>>;
+    startJob(host: string, serial: string, token: string, filename: string, bambuModel?: string): Promise<{
         status: string;
         message: string;
         file: string;

package/dist/printers/bambu.js

@@ -37,6 +37,7 @@ const MODEL_ID_TO_NAME = {
     O1D: "H2D",
     O1E: "H2D Pro",
     O1S: "H2S",
+    N6: "X2D",
     N2S: "A1",
     A1M: "A1 Mini",
     C11: "P1P",
@@ -46,9 +47,18 @@ const MODEL_ID_TO_NAME = {
     C13: "X1E",
 };
 const H2_MODEL_NAMES = new Set(["h2", "h2c", "h2d", "h2dpro", "h2d pro", "h2s"]);
+export function assertDirectPrintSupported(model, serial) {
+    if (model?.trim().toLowerCase() === "x2d" || serial?.trim().toUpperCase().startsWith("20P")) {
+        throw new Error("X2D direct printing is not supported pending native eMMC transport support. " +
+            "X2D status and slicing remain available; use a supported slicer to print.");
+    }
+}
 function isH2ModelName(model) {
     return H2_MODEL_NAMES.has(String(model ?? "").trim().toLowerCase().replace(/\s+/g, " "));
 }
+function isP2SModelName(model) {
+    return String(model ?? "").trim().toLowerCase() === "p2s";
+}
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -88,6 +98,12 @@ class TolerantBambuClient extends BambuClient {
             return "H2S";
         if (sn.startsWith("094"))
             return "H2D";
+        if (sn.startsWith("239"))
+            return "H2C";
+        if (sn.startsWith("31B"))
+            return "H2DPRO";
+        if (sn.startsWith("20P"))
+            return "X2D";
         if (sn.startsWith("00M"))
             return "X1C";
         if (sn.startsWith("00W"))
@@ -98,6 +114,8 @@ class TolerantBambuClient extends BambuClient {
             return "P1P";
         if (sn.startsWith("01P"))
             return "P1S";
+        if (sn.startsWith("22E"))
+            return "P2S";
         if (sn.startsWith("030"))
             return "A1";
         if (sn.startsWith("039"))
@@ -448,6 +466,7 @@ export class BambuImplementation {
         }
     }
     async print3mf(host, serial, token, options) {
+        assertDirectPrintSupported(options.bambuModel, serial);
         if (!options.filePath.toLowerCase().endsWith(".3mf")) {
             throw new Error("print3mf requires a .3mf input file.");
         }
@@ -457,24 +476,33 @@ export class BambuImplementation {
         let remoteFileName = path.basename(options.filePath);
         remoteFileName = remoteFileName.replace(/\.gcode\.3mf\.gcode\.3mf$/i, ".gcode.3mf");
         // H2-series printers land files at the FTP root and reference them via ftp:///<name>.
-        // P1/A1/X1 use /cache/<name> and file:///sdcard/cache/<name>.
+        // Full-size A1 uses SD root/project_file (reported on firmware 01.08.01.00).
+        // P1/X1/A1 mini retain their legacy cache/gcode_file route.
+        // P2S keeps the /cache/<name> upload but only accepts the H2-style
+        // project_file command, referenced via ftp:///cache/<name> (verified on
+        // P2S firmware 01.02.00.00; file:///sdcard/... fails with ERROR STATE).
         const isH2 = serial.startsWith("093") ||
             serial.startsWith("094") ||
             isH2ModelName(options.bambuModel);
-        const remoteProjectPath = isH2 ? remoteFileName : `cache/${remoteFileName}`;
-        const remoteUploadPath = isH2 ? `/${remoteFileName}` : `/cache/${remoteFileName}`;
-        const projectUrl = isH2
-            ? `ftp:///${remoteFileName}`
+        const isP2S = serial.startsWith("22E") || isP2SModelName(options.bambuModel);
+        const isA1 = String(options.bambuModel ?? "").trim().toLowerCase() === "a1" ||
+            (!options.bambuModel && serial.startsWith("030"));
+        const usesH2ProjectFile = isH2 || isP2S;
+        const remoteProjectPath = isH2 || isA1 ? remoteFileName : `cache/${remoteFileName}`;
+        const remoteUploadPath = `/${remoteProjectPath}`;
+        const projectUrl = usesH2ProjectFile
+            ? `ftp:///${remoteProjectPath}`
             : `file:///sdcard/${remoteProjectPath}`;
         // Upload via basic-ftp directly (bypasses bambu-js double-path bug)
         await this.ftpUpload(host, token, options.filePath, remoteUploadPath);
         // Pre-sliced .gcode.3mf files: routing depends on firmware generation.
-        // P1/A1/X1 series: project_file returns 405004002 for .gcode.3mf (firmware
+        // Legacy P1/X1/A1 mini: project_file returns 405004002 for .gcode.3mf (firmware
         // doesn't recognise the container), so use gcode_file instead.
-        // H2-series: gcode_file is not supported; project_file works because the
+        // H2-series and P2S: gcode_file is not supported (P2S answers 0500-4002
+        // "Unsupported file path or name"); project_file works because the
         // firmware can open the zip and find Metadata/plate_<n>.gcode directly.
         if (options.filePath.toLowerCase().endsWith(".gcode.3mf")) {
-            if (!isH2) {
+            if (!usesH2ProjectFile && !isA1) {
                 const printer = await this.getPrinter(host, serial, token);
                 await invokeWithoutAck(printer, new GCodeFileCommand({ fileName: remoteProjectPath }));
                 return {
@@ -483,7 +511,7 @@ export class BambuImplementation {
                     remoteProjectPath,
                 };
             }
-            // H2-series: fall through to project_file path below
+            // H2-series and P2S: fall through to project_file path below
         }
         const projectMetadata = await this.resolveProjectFileMetadata(options.filePath, options.plateIndex);
         // Send project_file command via bambu-node MQTT (bypasses bambu-js
@@ -550,7 +578,7 @@ export class BambuImplementation {
         }
         let amsMapping;
         let amsMapping2;
-        if (isH2) {
+        if (usesH2ProjectFile) {
             const projLen = Math.max(projectMetadata.projectFilamentCount, baseMapping.length, 1);
             amsMapping = Array.from({ length: projLen }, (_, i) => i < baseMapping.length ? baseMapping[i] : -1);
             amsMapping2 = amsMapping.map((v) => {
@@ -564,12 +592,12 @@ export class BambuImplementation {
             });
         }
         else {
-            amsMapping = Array.from({ length: 5 }, (_, i) => i < baseMapping.length ? baseMapping[i] : -1);
+            amsMapping = Array.from({ length: Math.max(5, baseMapping.length, projectMetadata.projectFilamentCount) }, (_, i) => i < baseMapping.length ? baseMapping[i] : -1);
             amsMapping2 = [];
         }
         const b = (v) => (v ? 1 : 0);
         let projectFileCmd;
-        if (isH2) {
+        if (usesH2ProjectFile) {
             const submissionId = String(Date.now() & 0x7fffffff);
             projectFileCmd = {
                 print: {
@@ -911,7 +939,9 @@ export class BambuImplementation {
             exists,
         };
     }
-    async uploadFile(host, serial, token, filePath, filename, print) {
+    async uploadFile(host, serial, token, filePath, filename, print, bambuModel) {
+        if (print)
+            assertDirectPrintSupported(bambuModel, serial);
         await fs.access(filePath);
         const normalizedFileName = filename.replace(/^\/+/, "");
         const remotePath = normalizedFileName.includes("/")
@@ -927,7 +957,7 @@ export class BambuImplementation {
         };
         if (print) {
             if (remotePath.toLowerCase().endsWith(".gcode")) {
-                response.startResult = await this.startJob(host, serial, token, remotePath);
+                response.startResult = await this.startJob(host, serial, token, remotePath, bambuModel);
             }
             else if (remotePath.toLowerCase().endsWith(".3mf")) {
                 response.note =
@@ -939,7 +969,8 @@ export class BambuImplementation {
         }
         return response;
     }
-    async startJob(host, serial, token, filename) {
+    async startJob(host, serial, token, filename, bambuModel) {
+        assertDirectPrintSupported(bambuModel, serial);
         const lower = filename.toLowerCase();
         if (lower.endsWith(".3mf") && !lower.endsWith(".gcode.3mf")) {
             throw new Error("Use print_3mf for .3mf project files.");
@@ -989,15 +1020,15 @@ export class BambuImplementation {
         // P1/A1 series still use the proprietary TCP-on-6000 framed JPEG path
         // (per https://github.com/Doridian/OpenBambuAPI/blob/main/video.md).
         const TCP_CAMERA_MODELS = new Set(["a1", "a1mini", "p1s", "p1p"]);
-        // X1, P2S, AND H2 (H2S/H2D/H2C) all use RTSP on port 322. The
+        // X1, P2S, H2 (H2S/H2D/H2C), AND X2D all use RTSP on port 322. The
         // OpenBambuAPI doc only mentions X1/P2S, but the HA bambulab
         // integration's models.py shows the printer reports its own
         // `ipcam.rtsp_url` for these models, and Parker (H2S) rejects the
         // A1/P1 80-byte auth packet on port 6000 (verified 2026-04-27 --
-        // see PROGRESS.md "H2 probe results").
+        // confirmed by local H2 camera transport probes).
         const RTSP_MODELS = new Set([
             "x1", "x1c", "x1carbon", "x1e", "p2s",
-            "h2", "h2s", "h2d", "h2c", "h2dpro",
+            "h2", "h2s", "h2d", "h2c", "h2dpro", "x2d",
         ]);
         if (!model) {
             throw new Error("camera_snapshot requires bambu_model or BAMBU_MODEL so it can choose the correct Bambu camera protocol.");