bambu-printer-mcp 1.1.5 → 1.1.8

package/dist/index.js

@@ -5,11 +5,13 @@ 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";
@@ -18,7 +20,24 @@ const DEFAULT_HOST = process.env.BAMBU_PRINTER_HOST || process.env.PRINTER_HOST
 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() ||
@@ -498,6 +517,9 @@ function readRuntimeConfig() {
         enableJsonResponse: parseBooleanEnv(process.env.MCP_HTTP_JSON_RESPONSE, true),
         allowedOrigins: parseCsvEnv(process.env.MCP_HTTP_ALLOWED_ORIGINS),
         blenderBridgeCommand: process.env.BLENDER_MCP_BRIDGE_COMMAND?.trim() || undefined,
+        ffmpegPath: process.env.FFMPEG_PATH?.trim() || undefined,
+        allowExecutableArg: parseBooleanEnv(process.env.MCP_ALLOW_EXECUTABLE_ARG, false),
+        allowBridgeCommandArg: parseBooleanEnv(process.env.MCP_ALLOW_BRIDGE_COMMAND_ARG, false),
     };
 }
 function expandUserPath(rawPath) {
@@ -740,10 +762,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: {},
@@ -821,17 +845,44 @@ class BambuPrinterMCPServer {
             throw elicitError;
         }
     }
-    bridgeOptionsFromArgs(args) {
+    bridgeOptionsFromArgs(args, toolName) {
         return {
-            bridgeCommand: args?.bridge_command !== undefined ? String(args.bridge_command) : undefined,
+            bridgeCommand: this.resolveExecutableSelectorArg(args?.bridge_command, toolName, "bridge_command", true),
             configDir: args?.bambu_network_config_dir !== undefined ? String(args.bambu_network_config_dir) : undefined,
             countryCode: args?.country_code !== undefined ? String(args.country_code) : undefined,
             userInfo: args?.user_info !== undefined ? String(args.user_info) : undefined,
             timeoutMs: args?.timeout_ms !== undefined ? Number(args.timeout_ms) : undefined,
         };
     }
+    resolveExecutableSelectorArg(rawValue, toolName, argumentName, allowLegacyBridgeArg = false) {
+        if (rawValue === undefined) {
+            return undefined;
+        }
+        const value = String(rawValue);
+        if (value.length === 0) {
+            return undefined;
+        }
+        const isAllowed = this.runtimeConfig.allowExecutableArg ||
+            (allowLegacyBridgeArg && this.runtimeConfig.allowBridgeCommandArg);
+        if (!isAllowed) {
+            throw new Error(`${toolName}: the ${argumentName} argument cannot select an executable by default. ` +
+                "Executable paths and commands are read from server environment configuration. Set " +
+                `MCP_ALLOW_EXECUTABLE_ARG=1 to accept ${argumentName} for process execution.`);
+        }
+        return value;
+    }
+    resolveSlicerConfigFromArgs(args, toolName) {
+        const config = resolveSlicerConfig(args);
+        if (args?.slicer_path !== undefined) {
+            const resolvedSlicerPath = this.resolveExecutableSelectorArg(args.slicer_path, toolName, "slicer_path");
+            if (resolvedSlicerPath !== undefined) {
+                config.slicerPath = resolvedSlicerPath;
+            }
+        }
+        return config;
+    }
     async ensurePrintableThreeMFPath(args, printModel, printPreset, bedType) {
-        const { slicerType, slicerPath, slicerProfile } = resolveSlicerConfig(args);
+        const { slicerType, slicerPath, slicerProfile } = this.resolveSlicerConfigFromArgs(args, "print_3mf_bambu_network");
         let threeMFPath = String(args.three_mf_path);
         const JSZip = (await import('jszip')).default;
         const zipData = fs.readFileSync(threeMFPath);
@@ -993,7 +1044,7 @@ class BambuPrinterMCPServer {
             task_ext_change_assist: args?.external_change_assist !== undefined ? Boolean(args.external_change_assist) : false,
             try_emmc_print: args?.try_emmc_print !== undefined ? Boolean(args.try_emmc_print) : false,
         };
-        const bridgeResult = await this.bambuNetwork.callWithAgent(bridgeMethod, { client_job_id: clientJobId, params }, this.bridgeOptionsFromArgs(args));
+        const bridgeResult = await this.bambuNetwork.callWithAgent(bridgeMethod, { client_job_id: clientJobId, params }, this.bridgeOptionsFromArgs(args, "print_3mf_bambu_network"));
         if (typeof bridgeResult === "object" && bridgeResult !== null && bridgeResult.ok === false) {
             throw new Error(`FULU BambuNetwork bridge method ${bridgeMethod} failed: ${String(bridgeResult.error || "unknown bridge error")}`);
         }
@@ -1484,7 +1535,7 @@ class BambuPrinterMCPServer {
                                     enum: SLICER_SCHEMA_VALUES,
                                     description: "Type of slicer to use. Bambu-compatible choices (bambustudio, orcaslicer, orcaslicer-bambulab) export sliced 3MF; aliases such as fulu-orca and orca-studio are accepted."
                                 },
-                                slicer_path: { type: "string", description: "Path to the slicer executable (default: value from env)" },
+                                slicer_path: { type: "string", description: "Path to the slicer executable (default: value from env). Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1." },
                                 slicer_profile: { type: "string", description: "Explicit slicer profile/config file. Overrides the named template only when provided in the tool call." },
                                 nozzle_diameter: { type: "string", description: "Nozzle diameter in mm (default: 0.4)" },
                                 bed_type: {
@@ -1530,7 +1581,7 @@ class BambuPrinterMCPServer {
                                     enum: SLICER_SCHEMA_VALUES,
                                     description: "Type of slicer to use. Bambu-compatible choices (bambustudio, orcaslicer, orcaslicer-bambulab) export sliced 3MF; aliases such as fulu-orca and orca-studio are accepted."
                                 },
-                                slicer_path: { type: "string", description: "Path to the slicer executable (default: value from env)" },
+                                slicer_path: { type: "string", description: "Path to the slicer executable (default: value from env). Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1." },
                                 slicer_profile: { type: "string", description: "Path to the slicer profile/config file (optional, overrides bambu_model preset)" },
                                 template_3mf_path: { type: "string", description: "Optional template 3MF whose embedded Bambu slicer settings should be reused when slicing a new STL or 3MF." },
                                 template_name: { type: "string", description: "Optional named template from the local registry. Resolves to template_3mf_path automatically." },
@@ -1584,7 +1635,7 @@ class BambuPrinterMCPServer {
                             type: "object",
                             properties: {
                                 connect: { type: "boolean", description: "When true, start the bridge command and run a handshake plus agent initialization probe." },
-                                bridge_command: { type: "string", description: "Override command for the FULU bridge host or macOS/WSL wrapper; defaults to BAMBU_NETWORK_BRIDGE_COMMAND." },
+                                bridge_command: { type: "string", description: "Override command for the FULU bridge host or macOS/WSL wrapper; defaults to BAMBU_NETWORK_BRIDGE_COMMAND. Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1." },
                                 bambu_network_config_dir: { type: "string", description: "Config/log directory used by the BambuNetwork agent; defaults to BAMBU_NETWORK_CONFIG_DIR or a user config directory." },
                                 country_code: { type: "string", description: "BambuNetwork country code, such as US, used by the agent during startup." },
                                 user_info: { type: "string", description: "Optional BambuNetwork user_info JSON string to pass to net.change_user after the agent starts." },
@@ -1601,7 +1652,7 @@ class BambuPrinterMCPServer {
                                 method: { type: "string", description: "FULU bridge method name, for example bridge.handshake, net.is_user_login, or net.get_user_selected_machine." },
                                 payload: { type: "object", description: "JSON payload passed to the bridge method." },
                                 with_agent: { type: "boolean", description: "When true, initialize a BambuNetwork agent and add its agent id to the payload before calling the method." },
-                                bridge_command: { type: "string", description: "Override command for the FULU bridge host or macOS/WSL wrapper; defaults to BAMBU_NETWORK_BRIDGE_COMMAND." },
+                                bridge_command: { type: "string", description: "Override command for the FULU bridge host or macOS/WSL wrapper; defaults to BAMBU_NETWORK_BRIDGE_COMMAND. Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1." },
                                 bambu_network_config_dir: { type: "string", description: "Config/log directory used by the BambuNetwork agent; defaults to BAMBU_NETWORK_CONFIG_DIR or a user config directory." },
                                 country_code: { type: "string", description: "BambuNetwork country code, such as US, used by the agent during startup." },
                                 user_info: { type: "string", description: "Optional BambuNetwork user_info JSON string to pass to net.change_user after the agent starts." },
@@ -1637,13 +1688,13 @@ class BambuPrinterMCPServer {
                                 preset_name: { type: "string", description: "Optional preset name sent in FULU PrintParams; defaults to project plus one-based plate index." },
                                 task_name: { type: "string", description: "Optional BambuNetwork task name; defaults to the project name." },
                                 config_filename: { type: "string", description: "Optional config 3MF path for cloud print; defaults to the same 3MF path." },
-                                bridge_command: { type: "string", description: "Override command for the FULU bridge host or macOS/WSL wrapper; defaults to BAMBU_NETWORK_BRIDGE_COMMAND." },
+                                bridge_command: { type: "string", description: "Override command for the FULU bridge host or macOS/WSL wrapper; defaults to BAMBU_NETWORK_BRIDGE_COMMAND. Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1." },
                                 bambu_network_config_dir: { type: "string", description: "Config/log directory used by the BambuNetwork agent; defaults to BAMBU_NETWORK_CONFIG_DIR or a user config directory." },
                                 country_code: { type: "string", description: "BambuNetwork country code, such as US, used by the agent during startup." },
                                 user_info: { type: "string", description: "Optional BambuNetwork user_info JSON string to pass to net.change_user after the agent starts." },
                                 timeout_ms: { type: "number", description: "Bridge request timeout in milliseconds." },
                                 slicer_type: { type: "string", enum: SLICER_SCHEMA_VALUES, description: "Slicer to use only if auto-slicing an unsliced 3MF; use orcaslicer-bambulab for FULU's fork." },
-                                slicer_path: { type: "string", description: "Path to the slicer executable for auto-slicing; defaults to value from env or a platform default." },
+                                slicer_path: { type: "string", description: "Path to the slicer executable for auto-slicing; defaults to value from env or a platform default. Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1." },
                                 slicer_profile: { type: "string", description: "Path to an optional slicer profile/config file for auto-slicing." },
                                 nozzle_diameter: { type: "string", description: "Nozzle diameter in mm for auto-slicing (default: 0.4)." },
                                 use_ams: { type: "boolean", description: "Whether to use the AMS; defaults to auto-detect from the 3MF mapping." },
@@ -1679,7 +1730,7 @@ class BambuPrinterMCPServer {
                                 timeout_ms: { type: "number", description: "Max ms to wait for a full frame (default 8000). Camera may take a few seconds on cold start." },
                                 bambu_model: { type: "string", description: "Printer model. Used to route to the correct protocol or fail fast on unsupported models. Defaults to BAMBU_MODEL." },
                                 experimental: { type: "boolean", description: "Deprecated and ignored. Earlier this flag let callers probe H2 series via the A1/P1 TCP-on-6000 path; live testing on an H2S confirmed H2 uses RTSP instead, so the flag has no effect now." },
-                                ffmpeg_path: { type: "string", description: "Override path to the ffmpeg binary used by the RTSP path. Defaults to ffmpeg via $PATH. Required only for the RTSP transport (X1, P2S, H2 series)." },
+                                ffmpeg_path: { type: "string", description: "Override path to the ffmpeg binary used by the RTSP path. Defaults to FFMPEG_PATH or ffmpeg via $PATH. Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1. Required only for the RTSP transport (X1, P2S, H2 series)." },
                                 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)" },
                                 bambu_token: { type: "string", description: "Access token (default: value from env)" }
@@ -1997,7 +2048,7 @@ class BambuPrinterMCPServer {
                                 bambu_network_method: { type: "string", enum: BAMBU_NETWORK_PRINT_METHODS, description: "FULU print method when connection_mode is bambu_network; defaults to start_print for cloud and start_local_print for lan." },
                                 dev_id: { type: "string", description: "Bambu device id for FULU BambuNetwork printing; defaults to BAMBU_DEV_ID or BAMBU_SERIAL." },
                                 dev_ip: { type: "string", description: "Printer IP address for FULU BambuNetwork LAN/local print methods; defaults to host when provided." },
-                                bridge_command: { type: "string", description: "Override command for the FULU bridge host or macOS/WSL wrapper; defaults to BAMBU_NETWORK_BRIDGE_COMMAND." },
+                                bridge_command: { type: "string", description: "Override command for the FULU bridge host or macOS/WSL wrapper; defaults to BAMBU_NETWORK_BRIDGE_COMMAND. Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1." },
                                 bambu_network_config_dir: { type: "string", description: "Config/log directory used by the FULU BambuNetwork agent." },
                                 country_code: { type: "string", description: "BambuNetwork country code, such as US, used by the FULU bridge agent." },
                                 user_info: { type: "string", description: "Optional BambuNetwork user_info JSON string passed to net.change_user for the FULU bridge." },
@@ -2015,7 +2066,7 @@ class BambuPrinterMCPServer {
                                     enum: SLICER_SCHEMA_VALUES,
                                     description: "Slicer to use only if auto-slicing an unsliced 3MF. Bambu-compatible slicer aliases such as fulu-orca and orca-studio are accepted."
                                 },
-                                slicer_path: { type: "string", description: "Path to the slicer executable for auto-slicing (default: value from env or a platform default)" },
+                                slicer_path: { type: "string", description: "Path to the slicer executable for auto-slicing (default: value from env or a platform default). Per-call overrides require MCP_ALLOW_EXECUTABLE_ARG=1." },
                                 use_ams: { type: "boolean", description: "Whether to use the AMS (default: auto-detect from 3MF)" },
                                 ams_mapping: {
                                     type: "array",
@@ -2110,28 +2161,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" },
-                                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);
@@ -2195,7 +2280,7 @@ class BambuPrinterMCPServer {
                         break;
                     case "bambu_network_bridge_status": {
                         const bridgeArgs = args;
-                        const options = this.bridgeOptionsFromArgs(bridgeArgs);
+                        const options = this.bridgeOptionsFromArgs(bridgeArgs, "bambu_network_bridge_status");
                         result = this.bambuNetwork.getStatus(options);
                         if (Boolean(bridgeArgs?.connect)) {
                             const probe = await this.bambuNetwork.ensureAgent(options);
@@ -2216,7 +2301,7 @@ class BambuPrinterMCPServer {
                         const payload = bridgeArgs.payload && typeof bridgeArgs.payload === "object"
                             ? bridgeArgs.payload
                             : {};
-                        const options = this.bridgeOptionsFromArgs(bridgeArgs);
+                        const options = this.bridgeOptionsFromArgs(bridgeArgs, "bambu_network_call");
                         result = bridgeArgs.with_agent === false
                             ? await this.bambuNetwork.request(String(bridgeArgs.method), payload, options)
                             : await this.bambuNetwork.callWithAgent(String(bridgeArgs.method), payload, options);
@@ -2233,7 +2318,7 @@ class BambuPrinterMCPServer {
                             timeoutMs: args?.timeout_ms !== undefined ? Number(args.timeout_ms) : undefined,
                             bambuModel: snapshotModel ? String(snapshotModel) : undefined,
                             experimental: Boolean(args?.experimental),
-                            ffmpegPath: args?.ffmpeg_path ? String(args.ffmpeg_path) : undefined,
+                            ffmpegPath: this.resolveExecutableSelectorArg(args?.ffmpeg_path, "camera_snapshot", "ffmpeg_path") ?? this.runtimeConfig.ffmpegPath,
                         });
                         break;
                     }
@@ -2380,7 +2465,7 @@ class BambuPrinterMCPServer {
                         if (!args?.template_name) {
                             throw new Error("Missing required parameter: template_name");
                         }
-                        const { slicerType, slicerPath, slicerProfile } = resolveSlicerConfig(args);
+                        const { slicerType, slicerPath, slicerProfile } = this.resolveSlicerConfigFromArgs(args, "slice_with_template");
                         const sliceModel = await this.resolveBambuModel(args?.bambu_model);
                         const nozzleDiam = String(args?.nozzle_diameter || DEFAULT_NOZZLE_DIAMETER);
                         const activeSlicerProfile = await resolveTemplateFirstSlicerProfilePath(args, slicerProfile || undefined, resolveTemplatePathFromName(["json", "config", "3mf"]) || explicitTemplatePath || undefined, TEMP_DIR);
@@ -2456,7 +2541,7 @@ class BambuPrinterMCPServer {
                         if (!args?.stl_path) {
                             throw new Error("Missing required parameter: stl_path");
                         }
-                        const { slicerType, slicerPath, slicerProfile } = resolveSlicerConfig(args);
+                        const { slicerType, slicerPath, slicerProfile } = this.resolveSlicerConfigFromArgs(args, "slice_stl");
                         const sliceModel = await this.resolveBambuModel(args?.bambu_model);
                         const nozzleDiam = String(args?.nozzle_diameter || DEFAULT_NOZZLE_DIAMETER);
                         const activeSlicerProfile = await resolveSlicerProfilePath(slicerProfile || undefined, resolveTemplatePathFromName(["json", "config", "3mf"]) || explicitTemplatePath || undefined, TEMP_DIR);
@@ -2541,7 +2626,7 @@ class BambuPrinterMCPServer {
                         if (!bambuSerial || !bambuToken) {
                             throw new Error("Bambu serial number and access token are required for print_3mf.");
                         }
-                        const { slicerType, slicerPath, slicerProfile } = resolveSlicerConfig(args);
+                        const { slicerType, slicerPath, slicerProfile } = this.resolveSlicerConfigFromArgs(args, "print_3mf");
                         const printModel = await this.resolveBambuModel(args?.bambu_model);
                         const printBedType = resolveBedType(args?.bed_type);
                         const printNozzle = String(args?.nozzle_diameter || DEFAULT_NOZZLE_DIAMETER);
@@ -2553,45 +2638,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);
@@ -2689,7 +2766,7 @@ class BambuPrinterMCPServer {
                         if (!bambuSerial || !bambuToken) {
                             throw new Error("Bambu serial number and access token are required for print_collar_charm.");
                         }
-                        const { slicerType, slicerPath, slicerProfile } = resolveSlicerConfig(args);
+                        const { slicerType, slicerPath, slicerProfile } = this.resolveSlicerConfigFromArgs(args, "print_collar_charm");
                         const printModel = await this.resolveBambuModel(args?.bambu_model);
                         const printBedType = resolveBedType(args?.bed_type);
                         const printNozzle = String(args?.nozzle_diameter || DEFAULT_NOZZLE_DIAMETER);
@@ -2753,18 +2830,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: args.bridge_command
-                                ? String(args.bridge_command)
-                                : 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}`);
@@ -2795,38 +2867,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({
@@ -2866,4 +2928,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.js

@@ -49,6 +49,9 @@ const H2_MODEL_NAMES = new Set(["h2", "h2c", "h2d", "h2dpro", "h2d pro", "h2s"])
 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 +91,10 @@ 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("00M"))
             return "X1C";
         if (sn.startsWith("00W"))
@@ -98,6 +105,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"))
@@ -457,24 +466,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 +501,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 +568,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 +582,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: {
@@ -994,7 +1012,7 @@ export class BambuImplementation {
         // 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",