bambu-printer-mcp 1.1.6 → 1.1.8

package/src/index.ts

@@ -13,6 +13,7 @@ import {
 } 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, type IncomingMessage, type Server as HttpServer, type ServerResponse } from "node:http";
 import { randomUUID } from "node:crypto";
@@ -24,6 +25,7 @@ import {
   type SlicerType,
 } from "./stl/stl-manipulator.js";
 import { BambuNetworkBridge, type BambuNetworkBridgeOptions } 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 type { ThreeMFAmsRequirements } from "./types.js";
@@ -36,7 +38,23 @@ const DEFAULT_BAMBU_SERIAL = process.env.BAMBU_PRINTER_SERIAL || process.env.BAM
 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 =
@@ -1015,16 +1033,18 @@ class BambuPrinterMCPServer {
   private server: Server;
   private bambu: BambuImplementation;
   private bambuNetwork: BambuNetworkBridge;
+  private readonly blender = new BlenderMcpBridge();
   private stlManipulator: STLManipulator;
   private readonly runtimeConfig: RuntimeConfig;
   private httpRuntime?: { transport: StreamableHTTPServerTransport; httpServer: HttpServer };
+  private shuttingDown = false;
 
   constructor() {
     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: {
@@ -2637,29 +2657,63 @@ 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);
@@ -3229,57 +3283,50 @@ class BambuPrinterMCPServer {
 
             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.'
+            // 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: BambuSliceOptions = {
+                uptodate: true,
+                ensureOnBed: true,
+                minSave: true,
+                skipModifiedGcodes: true,
+                bedType: printBedType,
+              };
+              if (!explicitSlicerProfile) {
+                try {
+                  const liveFilaments = await this.getResolvedPrinterFilamentInventory(
+                    host,
+                    bambuSerial,
+                    bambuToken,
+                    printModel,
+                    printNozzle
                   );
-                }
-                console.log(`3MF has no gcode — auto-slicing with ${slicerType} for ${printModel}`);
-                const autoSliceOptions: BambuSliceOptions = {
-                  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);
+                  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);
                 }
-                threeMFPath = await this.stlManipulator.sliceSTL(
-                  threeMFPath, slicerType, slicerPath, activeSlicerProfile,
-                  undefined, // progressCallback
-                  printPreset,
-                  autoSliceOptions
-                );
-                console.log("Auto-sliced to: " + threeMFPath);
-              }
-            } catch (sliceCheckErr: any) {
-              if (String(sliceCheckErr?.message || "").includes("SuperTack")) {
-                throw sliceCheckErr;
               }
-              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);
@@ -3496,21 +3543,24 @@ class BambuPrinterMCPServer {
             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: any) => String(entry)),
-              execute: Boolean(args.execute ?? false),
-              bridgeCommand: this.resolveExecutableSelectorArg(
-                args.bridge_command,
+            result = await this.blender.edit(
+              args ?? {},
+              this.resolveExecutableSelectorArg(
+                args?.bridge_command,
                 "blender_mcp_edit_model",
                 "bridge_command",
                 true
-              ) ?? this.runtimeConfig.blenderBridgeCommand,
-            });
+              ) ?? (!process.env.BLENDER_MCP_COMMAND?.trim() ? this.runtimeConfig.blenderBridgeCommand : undefined),
+              extra.signal
+            );
             break;
 
           default:
@@ -3547,49 +3597,27 @@ class BambuPrinterMCPServer {
     });
   }
 
-  private async invokeBlenderBridge(params: {
-    stlPath: string;
-    operations: string[];
-    execute: boolean;
-    bridgeCommand?: string;
-  }): Promise<any> {
-    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: 120_000,
-    });
-
-    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;
@@ -3640,4 +3668,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/src/printers/bambu.ts

@@ -62,6 +62,10 @@ function isH2ModelName(model: unknown): boolean {
   return H2_MODEL_NAMES.has(String(model ?? "").trim().toLowerCase().replace(/\s+/g, " "));
 }
 
+function isP2SModelName(model: unknown): boolean {
+  return String(model ?? "").trim().toLowerCase() === "p2s";
+}
+
 interface BambuPrintOptionsInternal {
   projectName: string;
   filePath: string;
@@ -145,11 +149,14 @@ class TolerantBambuClient extends BambuClient {
     const sn = this.config.serialNumber;
     if (sn.startsWith("093")) 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")) return "X1";
     if (sn.startsWith("03W")) return "X1E";
     if (sn.startsWith("01S")) return "P1P";
     if (sn.startsWith("01P")) return "P1S";
+    if (sn.startsWith("22E")) return "P2S";
     if (sn.startsWith("030")) return "A1";
     if (sn.startsWith("039")) return "A1M";
     return undefined;
@@ -572,27 +579,36 @@ export class BambuImplementation {
     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 {
@@ -601,7 +617,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(
@@ -687,7 +703,7 @@ export class BambuImplementation {
 
     let amsMapping: number[];
     let amsMapping2: Array<{ ams_id: number; slot_id: number }>;
-    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
@@ -699,7 +715,7 @@ export class BambuImplementation {
         return { ams_id: Math.floor(v / 4), slot_id: v % 4 };
       });
     } else {
-      amsMapping = Array.from({ length: 5 }, (_, i) =>
+      amsMapping = Array.from({ length: Math.max(5, baseMapping.length, projectMetadata.projectFilamentCount) }, (_, i) =>
         i < baseMapping.length ? baseMapping[i] : -1
       );
       amsMapping2 = [];
@@ -707,7 +723,7 @@ export class BambuImplementation {
 
     const b = (v: any) => (v ? 1 : 0);
     let projectFileCmd: Record<string, any>;
-    if (isH2) {
+    if (usesH2ProjectFile) {
       const submissionId = String(Date.now() & 0x7fffffff);
       projectFileCmd = {
         print: {
@@ -1270,7 +1286,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",