scad-gltf 0.3.3 → 0.5.0

package/src/cli-utils.js

@@ -117,7 +117,33 @@ export function askQuestion(message) {
   });
 }
 
-export function generateScadPreviewUrl(scadCode) {
+export function logAIThinking(reasoning, isVerbose = false) {
+  if (!reasoning) return;
+  const lines = reasoning.trim().split("\n");
+  if (lines.length === 0) return;
+
+  console.log(`\n🤔 AI Thinking:`);
+  if (isVerbose || lines.length <= 8) {
+    console.log(`   | ${lines.join("\n   | ")}`);
+    return;
+  }
+
+  // Hybrid view: initial intent + final conclusions
+  const head = lines.slice(0, 3);
+  const tail = lines.slice(-5);
+  const hiddenCount = lines.length - head.length - tail.length;
+
+  console.log(`   | ${head.join("\n   | ")}`);
+  console.log(
+    `   | ... [${hiddenCount} lines hidden, pass --verbose to view full thought process]`,
+  );
+  console.log(`   | ${tail.join("\n   | ")}`);
+}
+
+export function generateScadPreviewUrl(
+  scadCode,
+  baseUrl = "http://localhost:3000",
+) {
   try {
     const deflated = zlib.deflateRawSync(Buffer.from(scadCode, "utf-8"));
     const base64 = deflated
@@ -125,7 +151,7 @@ export function generateScadPreviewUrl(scadCode) {
       .replace(/\+/g, "-")
       .replace(/\//g, "_")
       .replace(/=+$/, "");
-    return `https://iliagrigorevdev.github.io/scad-gltf/#c${base64}`;
+    return `${baseUrl}/#c${base64}`;
   } catch (e) {
     return null;
   }
@@ -139,11 +165,18 @@ export async function runAutomatedAIFlow(
   inputRequest,
   allowedTools = ["render_scad_model", "test_godot_project"],
   projectType = "godot",
+  flowOptions = {},
 ) {
   if (!baseUrl) {
     throw new Error("Base URL is required to run the automated AI flow.");
   }
 
+  const isVerbose = Boolean(
+    flowOptions.verbose ||
+    process.argv.includes("--verbose") ||
+    process.argv.includes("-v") ||
+    process.env.VERBOSE,
+  );
   const outputFilename = `generate_${projectType}_project.js`;
   const isRawScad = projectType === "scad";
   const modelTag = modelName ? ` (${modelName})` : "";
@@ -153,6 +186,18 @@ export async function runAutomatedAIFlow(
   let mcpClient = null;
   let mcpTransport = null;
   let openaiTools = [];
+  let serveProc = null;
+
+  if (isRawScad) {
+    console.log("🌐 Starting local viewer background server...");
+    const scadServePath = path.resolve(__dirname, "../bin/serve.js");
+    serveProc = spawn(process.execPath, [scadServePath], {
+      cwd: process.cwd(),
+      stdio: "ignore", // Hide Express logs from the terminal
+      detached: false,
+    });
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+  }
 
   try {
     const mcpClientIndex =
@@ -208,439 +253,435 @@ export async function runAutomatedAIFlow(
   // Ensure the baseUrl points to the chat completions path
   const endpoint = baseUrl.replace(/\/+$/, "") + "/chat/completions";
 
-  while (iterations < maxIterations) {
-    iterations++;
-    const waitingFrom = modelName ? ` from ${modelName}` : "";
-    console.log(`\n🧠 Waiting for response${waitingFrom}...`);
+  try {
+    while (iterations < maxIterations) {
+      iterations++;
+      const waitingFrom = modelName ? ` from ${modelName}` : "";
+      console.log(`\n🧠 Waiting for response${waitingFrom}...`);
 
-    const body = {
-      messages: messages,
-    };
+      const body = {
+        messages: messages,
+      };
 
-    if (modelName) {
-      body.model = modelName;
-    }
+      if (modelName) {
+        body.model = modelName;
+      }
 
-    if (openaiTools.length > 0) {
-      body.tools = openaiTools;
-    }
+      if (openaiTools.length > 0) {
+        body.tools = openaiTools;
+      }
 
-    let response;
-    try {
-      response = await fetch(endpoint, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${apiKey || "sk-no-key-required"}`,
-        },
-        body: JSON.stringify(body),
-      });
-    } catch (error) {
-      throw new Error(`AI API Network Error: ${error.message}`);
-    }
+      let response;
+      try {
+        response = await fetch(endpoint, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${apiKey || "sk-no-key-required"}`,
+          },
+          body: JSON.stringify(body),
+        });
+      } catch (error) {
+        throw new Error(`AI API Network Error: ${error.message}`);
+      }
 
-    if (!response.ok) {
-      const errorText = await response.text();
-
-      // Auto-fallback if the model complains about image/vision input
-      const errLower = errorText.toLowerCase();
-      if (
-        !disableImageSupport &&
-        (errLower.includes("image") ||
-          errLower.includes("vision") ||
-          errLower.includes("invalid_request"))
-      ) {
-        console.log(
-          "\n⚠️  API rejected image input. Falling back to text-only mode and retrying...",
-        );
-        disableImageSupport = true;
-
-        // Strip any existing images from previous messages
-        for (const msg of messages) {
-          if (Array.isArray(msg.content)) {
-            msg.content = msg.content.filter((c) => c.type !== "image_url");
-            // If only text parts remain, just keep them. If empty, add placeholder.
-            if (msg.content.length === 0) {
-              msg.content =
-                "[Images removed by system fallback due to lack of model vision support]";
+      if (!response.ok) {
+        const errorText = await response.text();
+
+        // Auto-fallback if the model complains about image/vision input
+        const errLower = errorText.toLowerCase();
+        if (
+          !disableImageSupport &&
+          (errLower.includes("image") ||
+            errLower.includes("vision") ||
+            errLower.includes("invalid_request"))
+        ) {
+          console.log(
+            "\n⚠️  API rejected image input. Falling back to text-only mode and retrying...",
+          );
+          disableImageSupport = true;
+
+          // Strip any existing images from previous messages
+          for (const msg of messages) {
+            if (Array.isArray(msg.content)) {
+              msg.content = msg.content.filter((c) => c.type !== "image_url");
+              // If only text parts remain, just keep them. If empty, add placeholder.
+              if (msg.content.length === 0) {
+                msg.content =
+                  "[Images removed by system fallback due to lack of model vision support]";
+              }
             }
           }
+
+          iterations--;
+          continue;
         }
 
-        iterations--;
-        continue;
+        throw new Error(
+          `AI API Error: ${response.status} ${response.statusText}\n${errorText}`,
+        );
       }
 
-      throw new Error(
-        `AI API Error: ${response.status} ${response.statusText}\n${errorText}`,
-      );
-    }
+      const data = await response.json();
+      const choice = data.choices[0];
+      const message = choice.message;
 
-    const data = await response.json();
-    const choice = data.choices[0];
-    const message = choice.message;
+      const reasoning = message.reasoning_content || message.reasoning || "";
+      if (reasoning) {
+        logAIThinking(reasoning, isVerbose);
+      }
 
-    // Append the assistant message exactly as provided (including tool_calls)
-    messages.push(message);
+      // Append the assistant message exactly as provided (including tool_calls)
+      messages.push(message);
 
-    if (message.tool_calls && message.tool_calls.length > 0) {
-      const toolImagesUserContent = [];
+      if (message.tool_calls && message.tool_calls.length > 0) {
+        const toolImagesUserContent = [];
 
-      for (const toolCall of message.tool_calls) {
-        console.log(`\n⚙️  AI is using tool: ${toolCall.function.name}`);
+        for (const toolCall of message.tool_calls) {
+          console.log(`\n⚙️  AI is using tool: ${toolCall.function.name}`);
 
-        let argsToLog = {};
-        try {
-          argsToLog = JSON.parse(toolCall.function.arguments);
-        } catch (e) {
-          console.error(
-            "   ❌ Failed to parse tool arguments:",
-            toolCall.function.arguments,
+          let argsToLog = {};
+          try {
+            argsToLog = JSON.parse(toolCall.function.arguments);
+          } catch (e) {
+            console.error(
+              "   ❌ Failed to parse tool arguments:",
+              toolCall.function.arguments,
+            );
+          }
+
+          // Log truncated arguments to avoid flooding the terminal
+          for (const key in argsToLog) {
+            if (
+              typeof argsToLog[key] === "string" &&
+              argsToLog[key].length > 300
+            ) {
+              argsToLog[key] =
+                argsToLog[key].substring(0, 300) +
+                "\n... [truncated for logging]";
+            }
+          }
+          console.log(
+            `   Args:`,
+            JSON.stringify(argsToLog, null, 2).replace(/\n/g, "\n   "),
           );
-        }
 
-        // Log truncated arguments to avoid flooding the terminal
-        for (const key in argsToLog) {
-          if (
-            typeof argsToLog[key] === "string" &&
-            argsToLog[key].length > 300
-          ) {
-            argsToLog[key] =
-              argsToLog[key].substring(0, 300) +
-              "\n... [truncated for logging]";
+          if (!mcpClient) {
+            console.error("   ❌ MCP client not available.");
+            messages.push({
+              role: "tool",
+              tool_call_id: toolCall.id,
+              content: "MCP client not available.",
+            });
+            continue;
           }
-        }
-        console.log(
-          `   Args:`,
-          JSON.stringify(argsToLog, null, 2).replace(/\n/g, "\n   "),
-        );
 
-        if (!mcpClient) {
-          console.error("   ❌ MCP client not available.");
-          messages.push({
-            role: "tool",
-            tool_call_id: toolCall.id,
-            content: "MCP client not available.",
-          });
-          continue;
-        }
+          try {
+            const callArgs = JSON.parse(toolCall.function.arguments);
 
-        try {
-          const callArgs = JSON.parse(toolCall.function.arguments);
+            if (disableImageSupport) {
+              callArgs.return_images = false;
+            }
 
-          if (disableImageSupport) {
-            callArgs.return_images = false;
-          }
+            if (
+              toolCall.function.name === "render_scad_model" &&
+              callArgs.scad_code
+            ) {
+              const link = generateScadPreviewUrl(callArgs.scad_code);
+              if (link) {
+                console.log(
+                  `   🔗 Intermediate Web Preview Link:\n      ${link}`,
+                );
+              }
+            }
 
-          if (
-            toolCall.function.name === "render_scad_model" &&
-            callArgs.scad_code
-          ) {
-            const link = generateScadPreviewUrl(callArgs.scad_code);
-            if (link) {
-              console.log(
-                `   🔗 Intermediate Web Preview Link:\n      ${link}`,
-              );
+            const result = await mcpClient.callTool({
+              name: toolCall.function.name,
+              arguments: callArgs,
+            });
+
+            let responseText = "";
+            let imageContents = [];
+            for (const item of result.content) {
+              if (item.type === "text") responseText += item.text + "\n";
+              if (item.type === "image") {
+                imageContents.push({
+                  type: "image_url",
+                  image_url: {
+                    url: `data:${item.mimeType};base64,${item.data}`,
+                  },
+                });
+              }
             }
-          }
 
-          const result = await mcpClient.callTool({
-            name: toolCall.function.name,
-            arguments: callArgs,
-          });
+            messages.push({
+              role: "tool",
+              tool_call_id: toolCall.id,
+              content: responseText || "Success",
+            });
 
-          let responseText = "";
-          let imageContents = [];
-          for (const item of result.content) {
-            if (item.type === "text") responseText += item.text + "\n";
-            if (item.type === "image") {
-              imageContents.push({
-                type: "image_url",
-                image_url: {
-                  url: `data:${item.mimeType};base64,${item.data}`,
-                },
+            if (imageContents.length > 0) {
+              toolImagesUserContent.push({
+                type: "text",
+                text: `Visual result of ${toolCall.function.name}:`,
               });
+              toolImagesUserContent.push(...imageContents);
             }
-          }
 
-          messages.push({
-            role: "tool",
-            tool_call_id: toolCall.id,
-            content: responseText || "Success",
-          });
+            console.log(`✔️  Tool ${toolCall.function.name} completed.`);
 
-          if (imageContents.length > 0) {
-            toolImagesUserContent.push({
-              type: "text",
-              text: `Visual result of ${toolCall.function.name}:`,
+            if (responseText) {
+              const lines = responseText.trim().split("\n");
+              const previewLines = lines.slice(0, 15);
+              console.log(`   Response:\n   | ${previewLines.join("\n   | ")}`);
+              if (lines.length > 15)
+                console.log(`   | ... [${lines.length - 15} more lines]`);
+            }
+          } catch (err) {
+            console.error(`⚠️  Tool error: ${err.message}`);
+            messages.push({
+              role: "tool",
+              tool_call_id: toolCall.id,
+              content: `Error: ${err.message}`,
             });
-            toolImagesUserContent.push(...imageContents);
           }
+        }
 
-          console.log(`✔️  Tool ${toolCall.function.name} completed.`);
-
-          if (responseText) {
-            const lines = responseText.trim().split("\n");
-            const previewLines = lines.slice(0, 15);
-            console.log(`   Response:\n   | ${previewLines.join("\n   | ")}`);
-            if (lines.length > 15)
-              console.log(`   | ... [${lines.length - 15} more lines]`);
-          }
-        } catch (err) {
-          console.error(`⚠️  Tool error: ${err.message}`);
+        // Append accumulated tool images as a follow-up user message so the AI can "see" the visual outputs
+        if (toolImagesUserContent.length > 0) {
           messages.push({
-            role: "tool",
-            tool_call_id: toolCall.id,
-            content: `Error: ${err.message}`,
+            role: "user",
+            content: toolImagesUserContent,
           });
-        }
-      }
-
-      // Append accumulated tool images as a follow-up user message so the AI can "see" the visual outputs
-      if (toolImagesUserContent.length > 0) {
-        messages.push({
-          role: "user",
-          content: toolImagesUserContent,
-        });
-        const numImages = toolImagesUserContent.filter(
-          (c) => c.type === "image_url",
-        ).length;
-        console.log(`   🖼️  Appended ${numImages} image(s) to AI context.`);
-      }
-    } else {
-      const finalText = message.content || "";
-      console.log("\n✅ AI proposed a final code version.");
-
-      let finalCode = "";
-      let extractedFilename = outputFilename;
-
-      // Extract the code payload based on the project type target
-      if (isRawScad) {
-        const match = finalText.match(/```(?:openscad|scad)?\n([\s\S]*?)```/i);
-        finalCode = match ? match[1].trim() : finalText.trim();
-
-        extractedFilename = "generated_model.scad";
-        const nameMatch = finalCode.match(
-          /\/\*\s*Model Name:\s*([^*]+)\s*\*\//i,
-        );
-        if (nameMatch) {
-          let safeName = nameMatch[1]
-            .trim()
-            .toLowerCase()
-            .replace(/[^a-z0-9_]/g, "_");
-          if (!safeName.endsWith(".scad")) safeName += ".scad";
-          extractedFilename = safeName;
+          const numImages = toolImagesUserContent.filter(
+            (c) => c.type === "image_url",
+          ).length;
+          console.log(`   🖼️  Appended ${numImages} image(s) to AI context.`);
         }
       } else {
-        const match = finalText.match(
-          /```(?:javascript|js|node)?\n([\s\S]*?)```/i,
-        );
-        finalCode = match ? match[1].trim() : finalText.trim();
-      }
+        const finalText = message.content || "";
+        console.log("\n✅ AI proposed a final code version.");
 
-      const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "scad-preview-"));
-      const tempFilePath = path.join(tempDir, extractedFilename);
-      let runProc = null;
-
-      try {
-        fs.writeFileSync(tempFilePath, finalCode, "utf-8");
+        let finalCode = "";
+        let extractedFilename = outputFilename;
 
+        // Extract the code payload based on the project type target
         if (isRawScad) {
-          console.log(
-            `   Generating OpenSCAD file to preview in a temporary folder...`,
+          const match = finalText.match(
+            /```(?:openscad|scad)?\n([\s\S]*?)```/i,
           );
-          console.log(`   Temp file: ${tempFilePath}`);
+          finalCode = match ? match[1].trim() : finalText.trim();
 
-          const link = generateScadPreviewUrl(finalCode);
-          if (link) {
-            console.log(`\n🔗 Direct Web Preview Link:\n   ${link}\n`);
+          extractedFilename = "generated_model.scad";
+          const nameMatch = finalCode.match(
+            /\/\*\s*Model Name:\s*([^*]+)\s*\*\//i,
+          );
+          if (nameMatch) {
+            let safeName = nameMatch[1]
+              .trim()
+              .toLowerCase()
+              .replace(/[^a-z0-9_]/g, "_");
+            if (!safeName.endsWith(".scad")) safeName += ".scad";
+            extractedFilename = safeName;
           }
-
-          console.log(
-            `\n🌐 Starting local viewer to preview ${extractedFilename}...`,
+        } else {
+          const match = finalText.match(
+            /```(?:javascript|js|node)?\n([\s\S]*?)```/i,
           );
+          finalCode = match ? match[1].trim() : finalText.trim();
+        }
 
-          const scadServePath = path.resolve(__dirname, "../bin/serve.js");
-          runProc = spawn(process.execPath, [scadServePath], {
-            cwd: tempDir,
-            stdio: "inherit",
-            detached: false,
-          });
+        const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "scad-preview-"));
+        const tempFilePath = path.join(tempDir, extractedFilename);
+        let runProc = null;
 
-          await new Promise((resolve) => setTimeout(resolve, 2000));
-        } else {
-          console.log(
-            `   Generating project files to preview in a temporary folder...`,
-          );
-          console.log(`   Temp script: ${tempFilePath}`);
+        try {
+          fs.writeFileSync(tempFilePath, finalCode, "utf-8");
+          if (isRawScad) {
+            console.log(
+              `   Generating OpenSCAD file to preview in a temporary folder...`,
+            );
+            console.log(`   Temp file: ${tempFilePath}`);
 
-          execSync(`node "${tempFilePath}"`, {
-            cwd: tempDir,
-            stdio: "pipe",
-          });
+            const link = generateScadPreviewUrl(finalCode);
+            if (link) {
+              console.log(`\n🔗 Direct Web Preview Link:\n   ${link}\n`);
+            }
+          } else {
+            console.log(
+              `   Generating project files to preview in a temporary folder...`,
+            );
+            console.log(`   Temp script: ${tempFilePath}`);
+
+            execSync(`node "${tempFilePath}"`, {
+              cwd: tempDir,
+              stdio: "pipe",
+            });
 
-          let projectDir = null;
-          let latestTime = 0;
-          const items = fs.readdirSync(tempDir);
-
-          for (const item of items) {
-            const itemPath = path.join(tempDir, item);
-            if (fs.statSync(itemPath).isDirectory()) {
-              const isGodot =
-                projectType === "godot" &&
-                fs.existsSync(path.join(itemPath, "project.godot"));
-              const isWeb =
-                projectType === "web" &&
-                fs.existsSync(path.join(itemPath, "package.json"));
-              const isBevy =
-                projectType === "bevy" &&
-                fs.existsSync(path.join(itemPath, "Cargo.toml"));
-              const isWgpu =
-                projectType === "wgpu" &&
-                fs.existsSync(path.join(itemPath, "Cargo.toml"));
-
-              if (isGodot || isWeb || isBevy || isWgpu) {
-                const mtime = fs.statSync(itemPath).mtimeMs;
-                if (mtime > latestTime) {
-                  latestTime = mtime;
-                  projectDir = itemPath;
+            let projectDir = null;
+            let latestTime = 0;
+            const items = fs.readdirSync(tempDir);
+
+            for (const item of items) {
+              const itemPath = path.join(tempDir, item);
+              if (fs.statSync(itemPath).isDirectory()) {
+                const isGodot =
+                  projectType === "godot" &&
+                  fs.existsSync(path.join(itemPath, "project.godot"));
+                const isWeb =
+                  projectType === "web" &&
+                  fs.existsSync(path.join(itemPath, "package.json"));
+                const isBevy =
+                  projectType === "bevy" &&
+                  fs.existsSync(path.join(itemPath, "Cargo.toml"));
+                const isWgpu =
+                  projectType === "wgpu" &&
+                  fs.existsSync(path.join(itemPath, "Cargo.toml"));
+
+                if (isGodot || isWeb || isBevy || isWgpu) {
+                  const mtime = fs.statSync(itemPath).mtimeMs;
+                  if (mtime > latestTime) {
+                    latestTime = mtime;
+                    projectDir = itemPath;
+                  }
                 }
               }
             }
-          }
 
-          if (!projectDir) {
-            console.log(`   ❌ Could not find the generated project folder.`);
-            const expectedFile =
-              projectType === "godot"
-                ? "project.godot"
-                : projectType === "bevy" || projectType === "wgpu"
-                  ? "Cargo.toml"
-                  : "package.json";
-            messages.push({
-              role: "user",
-              content: `Your script successfully executed, but no valid project directory was found. Make sure your script creates a root folder and generates the correct required files (like ${expectedFile}) inside it.`,
-            });
-            continue;
-          }
+            if (!projectDir) {
+              console.log(`   ❌ Could not find the generated project folder.`);
+              const expectedFile =
+                projectType === "godot"
+                  ? "project.godot"
+                  : projectType === "bevy" || projectType === "wgpu"
+                    ? "Cargo.toml"
+                    : "package.json";
+              messages.push({
+                role: "user",
+                content: `Your script successfully executed, but no valid project directory was found. Make sure your script creates a root folder and generates the correct required files (like ${expectedFile}) inside it.`,
+              });
+              continue;
+            }
 
-          console.log(`   Project folder: ${projectDir}`);
+            console.log(`   Project folder: ${projectDir}`);
 
-          if (projectType === "godot") {
-            console.log(
-              `\n🎮 Launching project visually: ${path.basename(projectDir)}`,
-            );
-            const godotBin = getGodotBin();
-            runProc = spawn(godotBin, ["--path", projectDir], {
-              stdio: "ignore",
-              detached: true,
-            });
-            runProc.unref();
-          } else if (projectType === "web") {
-            console.log(
-              `\n🌐 Installing dependencies for: ${path.basename(projectDir)}...`,
-            );
-            try {
-              execSync("npm install", { cwd: projectDir, stdio: "inherit" });
-            } catch (e) {
+            if (projectType === "godot") {
               console.log(
-                "⚠️ npm install failed, trying to continue anyway...",
+                `\n🎮 Launching project visually: ${path.basename(projectDir)}`,
               );
-            }
+              const godotBin = getGodotBin();
+              runProc = spawn(godotBin, ["--path", projectDir], {
+                stdio: "ignore",
+                detached: true,
+              });
+              runProc.unref();
+            } else if (projectType === "web") {
+              console.log(
+                `\n🌐 Installing dependencies for: ${path.basename(projectDir)}...`,
+              );
+              try {
+                execSync("npm install", { cwd: projectDir, stdio: "inherit" });
+              } catch (e) {
+                console.log(
+                  "⚠️ npm install failed, trying to continue anyway...",
+                );
+              }
 
-            console.log(`\n🌐 Starting dev server...`);
-            const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
-            runProc = spawn(npmCmd, ["run", "dev"], {
-              cwd: projectDir,
-              stdio: "inherit",
-              detached: false,
-            });
+              console.log(`\n🌐 Starting dev server...`);
+              const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
+              runProc = spawn(npmCmd, ["run", "dev"], {
+                cwd: projectDir,
+                stdio: "inherit",
+                detached: false,
+              });
 
-            await new Promise((resolve) => setTimeout(resolve, 2000));
-          } else if (projectType === "bevy" || projectType === "wgpu") {
-            const fwName = projectType === "bevy" ? "Bevy" : "wgpu";
-            console.log(
-              `\n🦀 Building and running ${fwName} project: ${path.basename(projectDir)}...`,
-            );
-            const cargoCmd =
-              process.platform === "win32" ? "cargo.exe" : "cargo";
-            runProc = spawn(cargoCmd, ["run"], {
-              cwd: projectDir,
-              stdio: "inherit",
-              detached: false,
-            });
-            await new Promise((resolve) => setTimeout(resolve, 2000));
+              await new Promise((resolve) => setTimeout(resolve, 2000));
+            } else if (projectType === "bevy" || projectType === "wgpu") {
+              const fwName = projectType === "bevy" ? "Bevy" : "wgpu";
+              console.log(
+                `\n🦀 Building and running ${fwName} project: ${path.basename(projectDir)}...`,
+              );
+              const cargoCmd =
+                process.platform === "win32" ? "cargo.exe" : "cargo";
+              runProc = spawn(cargoCmd, ["run"], {
+                cwd: projectDir,
+                stdio: "inherit",
+                detached: false,
+              });
+              await new Promise((resolve) => setTimeout(resolve, 2000));
+            }
           }
-        }
-
-        const feedback = await askQuestion(
-          "\nAre you happy with this result? (Type 'y' to accept, or type feedback for the AI to fix): ",
-        );
 
-        if (
-          feedback.toLowerCase() === "y" ||
-          feedback.toLowerCase() === "yes" ||
-          feedback === ""
-        ) {
-          fs.copyFileSync(
-            tempFilePath,
-            path.resolve(process.cwd(), extractedFilename),
+          const feedback = await askQuestion(
+            "\nAre you happy with this result? (Type 'y' to accept, or type feedback for the AI to fix): ",
           );
 
-          console.log(
-            `\n🎉 Success! Final file finalized and written to: ${extractedFilename}`,
-          );
+          if (
+            feedback.toLowerCase() === "y" ||
+            feedback.toLowerCase() === "yes" ||
+            feedback === ""
+          ) {
+            fs.copyFileSync(
+              tempFilePath,
+              path.resolve(process.cwd(), extractedFilename),
+            );
 
-          if (!isRawScad) {
             console.log(
-              `▶️  Run it again later to unpack the final project with: node ${extractedFilename}`,
+              `\n🎉 Success! Final file finalized and written to: ${extractedFilename}`,
             );
-          }
 
-          if (mcpTransport) {
-            try {
-              await mcpTransport.close();
-            } catch (e) {}
+            if (!isRawScad) {
+              console.log(
+                `▶️  Run it again later to unpack the final project with: node ${extractedFilename}`,
+              );
+            }
+
+            break;
+          } else {
+            console.log("\n🔄 Sending your feedback back to the LLM...");
+            messages.push({
+              role: "user",
+              content: `I reviewed the current version. Here is my feedback to improve it:\n\n${feedback}\n\nPlease implement these fixes and output an updated ${isRawScad ? "OpenSCAD block" : "Node.js script"}.`,
+            });
           }
-          break;
-        } else {
-          console.log("\n🔄 Sending your feedback back to the LLM...");
+        } catch (err) {
+          const stderr = err.stderr ? err.stderr.toString() : err.message;
+          console.error(
+            `   ❌ Failed to execute/preview generated code:\n${stderr}`,
+          );
           messages.push({
             role: "user",
-            content: `I reviewed the current version. Here is my feedback to improve it:\n\n${feedback}\n\nPlease implement these fixes and output an updated ${isRawScad ? "OpenSCAD block" : "Node.js script"}.`,
+            content: `Your generated code threw an error when I tried to run/preview it locally:\n${stderr}\n\nPlease fix the ${isRawScad ? "OpenSCAD code" : "Node.js script"}.`,
           });
-        }
-      } catch (err) {
-        const stderr = err.stderr ? err.stderr.toString() : err.message;
-        console.error(
-          `   ❌ Failed to execute/preview generated code:\n${stderr}`,
-        );
-        messages.push({
-          role: "user",
-          content: `Your generated code threw an error when I tried to run/preview it locally:\n${stderr}\n\nPlease fix the ${isRawScad ? "OpenSCAD code" : "Node.js script"}.`,
-        });
-      } finally {
-        if (runProc) {
+        } finally {
+          if (runProc) {
+            try {
+              runProc.kill();
+            } catch (e) {}
+          }
           try {
-            runProc.kill();
+            fs.rmSync(tempDir, { recursive: true, force: true });
           } catch (e) {}
         }
-        try {
-          fs.rmSync(tempDir, { recursive: true, force: true });
-        } catch (e) {}
       }
     }
-  }
 
-  if (iterations >= maxIterations) {
-    console.log(
-      `\n⚠️ Reached maximum iterations (${maxIterations}). Terminating.`,
-    );
+    if (iterations >= maxIterations) {
+      console.log(
+        `\n⚠️ Reached maximum iterations (${maxIterations}). Terminating.`,
+      );
+    }
+  } finally {
     if (mcpTransport) {
       try {
         await mcpTransport.close();
       } catch (e) {}
     }
+    if (serveProc) {
+      try {
+        serveProc.kill();
+      } catch (e) {}
+    }
   }
 }
 
@@ -670,11 +711,11 @@ export async function runCliApp({
     console.error("Examples with JSON options (Automated AI flow):");
     if (isRawScad) {
       console.error(
-        `  scad-gltf gen ${projectType} "A modular sci-fi corridor piece" '{"openaiApiKey": "sk-...", "openaiModel": "gpt-4o"}'`,
+        `  scad-gltf gen ${projectType} "A modular sci-fi corridor piece" '{"openaiApiKey": "sk-...", "openaiModel": "gpt-4o", "scadFiles": ["./base.scad"]}'`,
       );
     } else {
       console.error(
-        `  scad-gltf gen ${projectType} "A simple 3D simulation" '{"openaiApiKey": "sk-...", "openaiModel": "gpt-4o"}'`,
+        `  scad-gltf gen ${projectType} "A simple 3D simulation" '{"openaiApiKey": "sk-...", "openaiModel": "gpt-4o", "scadFiles": ["./character.scad"]}'`,
       );
     }
     process.exit(1);
@@ -736,13 +777,14 @@ export async function runCliApp({
       inputRequestOutput,
       allowedTools,
       projectType,
+      options,
     );
     return;
   }
 
   if (isRawScad) {
     try {
-      await writeToClipboard(inputRequestOutput);
+      await writeToClipboard(systemClipboardOutput);
       console.log(
         "✔️  Input request and syntax rules have been copied to the clipboard. You can now paste it into your LLM.",
       );
@@ -754,31 +796,19 @@ export async function runCliApp({
     return;
   }
 
-  // Write to System Clipboard (Part 1: System Instructions)
-  try {
-    await writeToClipboard(systemClipboardOutput);
-    console.log("✔️  System instructions have been copied to the clipboard.");
-  } catch (err) {
-    console.error(
-      "Error: Failed to copy system instructions to the clipboard.",
-    );
-    console.error(err.message);
-    process.exit(1);
-  }
+  const combinedOutput = `=== SYSTEM PROMPT ===
+${systemClipboardOutput}
 
-  // Await user confirmation
-  await waitForEnter(
-    "Please paste the system instructions into your LLM, then press ENTER to copy your input request...",
-  );
+=== USER REQUEST ===
+${inputRequestOutput}`;
 
-  // Write to System Clipboard (Part 2: Input Request)
   try {
-    await writeToClipboard(inputRequestOutput);
+    await writeToClipboard(combinedOutput);
     console.log(
-      "✔️  Input request has been copied to the clipboard. You can now paste it into your LLM.",
+      "✔️  The system prompt and input request have been combined and copied to the clipboard. You can now paste them into your LLM.",
     );
   } catch (err) {
-    console.error("Error: Failed to copy input request to the clipboard.");
+    console.error("Error: Failed to copy to the clipboard.");
     console.error(err.message);
     process.exit(1);
   }