fix(v1.4.1): F5 Run File works again — fix AMD-loader script ordering + PTY routing

Yogesh Prajapati · Yogesh Prajapati · commit b48b4191c407 · 2026-05-18T15:55:01.000+01:00
The Run File (F5) feature has been broken since the AMD-loader regression:

1. UMD libraries (xterm, xterm-addon-fit, mermaid, diff) loaded AFTER
   monaco-editor/vs/loader.js were eaten by Monaco's global define(),
   so window.Terminal was undefined and the integrated terminal
   silently failed to render. Reordered to load all UMD libs BEFORE
   vs/loader.js, matching the marked.umd.js pattern.

2. runCurrentFile() was spawning a separate cmd.exe via the run-command
   IPC and piping output to terminal id 0 — but the visible PowerShell
   terminal is a node-pty session with its own id, so output went
   nowhere. Now types the run command directly into the existing PTY,
   which gives live stdout/stderr in the visible panel and proper cwd.

3. CSP relaxed: worker-src adds 'self' (Monaco can now spawn its
   workerMain.js from file://, removing the "falling back to main
   thread, may cause UI freezes" warning). script-src adds
   'unsafe-inline' so the inline mermaid.initialize() block executes.

Verified: F5 on test.py now types `cd "&lt;dir&gt;"; python "&lt;file&gt;"` into
the live PowerShell PTY and shows real Python output / tracebacks.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notepp",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Note++ - A powerful text editor",
   "main": "src/main.js",
   "author": "Yogesh Prajapati",
diff --git a/src/index.html b/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-eval' blob:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; worker-src blob: data:; img-src 'self' data: blob:;">
+  <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' blob:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; worker-src 'self' blob: data:; img-src 'self' data: blob:;">
   <title>new 1 - Note++</title>
   <link rel="stylesheet" href="style.css">
   <link rel="stylesheet" href="../node_modules/xterm/css/xterm.css">
@@ -1099,10 +1099,16 @@ <h3>🔒 Encryption</h3>
     }
   </script>
 
-  <script src="../node_modules/monaco-editor/min/vs/loader.js"></script>
+  <!-- All UMD libs MUST load BEFORE vs/loader.js — Monaco's AMD loader installs
+       a global define() that hijacks any UMD script loaded after it, causing
+       e.g. "Terminal is not defined" / "Can only have one anonymous define call". -->
   <script src="../node_modules/xterm/lib/xterm.js"></script>
   <script src="../node_modules/xterm-addon-fit/lib/xterm-addon-fit.js"></script>
   <script src="../node_modules/mermaid/dist/mermaid.min.js"></script>
+  <script src="../node_modules/diff/dist/diff.min.js"></script>
+
+  <script src="../node_modules/monaco-editor/min/vs/loader.js"></script>
+
   <script>
     // Initialize mermaid with startOnLoad:false so we control rendering
     if (window.mermaid) {
@@ -1115,7 +1121,6 @@ <h3>🔒 Encryption</h3>
     }
   </script>
   <script src="crypto.js"></script>
-  <script src="../node_modules/diff/dist/diff.min.js"></script>
   <script src="lsp-client.js"></script>
   <script src="renderer.js"></script>
 </body>
diff --git a/src/renderer.js b/src/renderer.js
@@ -1894,12 +1894,13 @@ async function runCurrentFile() {
   if (tab.dirty) await saveTabFile(tab);
   if (!tab.filePath) { showToast('Save the file first'); return; }
 
-  openTerminal();
-
   const fp = tab.filePath;
   const ext = fp.split('.').pop().toLowerCase();
   const cwd = fp.replace(/[\\/][^\\/]+$/, '');
 
+  // Per-extension runner. Each entry returns the command line to type into
+  // the integrated PTY (PowerShell on Windows). We deliberately reuse the
+  // existing terminal so the user sees live stdout/stderr in the same panel.
   const runners = {
     py: `python "${fp}"`, python: `python "${fp}"`,
     js: `node "${fp}"`, mjs: `node "${fp}"`,
@@ -1909,8 +1910,9 @@ async function runCurrentFile() {
     go: `go run "${fp}"`,
     rs: `cargo run`,
     sh: `bash "${fp}"`,
-    ps1: `powershell.exe -File "${fp}"`,
-    bat: `"${fp}"`,
+    ps1: `& "${fp}"`,           // PowerShell call operator handles spaces in path
+    bat: `& "${fp}"`,
+    cmd: `& "${fp}"`,
     java: `java "${fp}"`,
     r: `Rscript "${fp}"`,
     lua: `lua "${fp}"`,
@@ -1919,12 +1921,18 @@ async function runCurrentFile() {
   const cmd = runners[ext];
   if (!cmd) { showToast(`No runner configured for .${ext}`); return; }
 
-  if (term) {
-    term.writeln(`\x1b[33m> Running: ${cmd}\x1b[0m`);
-    term.writeln('');
-  }
+  // Open the terminal panel and wait for the PTY to actually be alive
+  // (terminalCreate is async — sending input before it resolves is a no-op).
+  await openTerminal();
+  // openTerminal returns immediately if the term already exists; if it just
+  // created one, the create IPC was fired inside a 50 ms setTimeout, so give
+  // it a beat before typing into the PTY on first launch.
+  await new Promise(r => setTimeout(r, 80));
 
-  await window.electronAPI.runCommand(cmd, cwd);
+  // PowerShell: cd to the file's folder, then run. `;` chains regardless of
+  // exit code so we always see the result. CR (\r) submits the line.
+  const line = `cd "${cwd}"; ${cmd}\r`;
+  await window.electronAPI.terminalInput(terminalId, line);
 }
 
 // ===== Status Bar =====

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "notepp",`
`3`		`- "version": "1.4.0",`
	`3`	`+ "version": "1.4.1",`
`4`	`4`	`"description": "Note++ - A powerful text editor",`
`5`	`5`	`"main": "src/main.js",`
`6`	`6`	`"author": "Yogesh Prajapati",`