crosspad-mcp-server 6.0.0 → 8.1.1

package/dist/tools/build.d.ts

@@ -6,13 +6,104 @@ export interface BuildResult {
     warnings_count: number;
     output_path: string;
 }
-/** @internal exported for testing */
+/**
+ * Match real compiler / linker / build-system errors only. Keyword-only
+ * matching ("any line containing 'error'") is too greedy — it picks up
+ * comments like `// error handling` from cmake output and inflates the
+ * error list.
+ *
+ * Patterns: GCC/Clang/MSVC compiler diagnostics, linker errors, CMake
+ * Errors, Ninja FAILED markers.
+ *
+ * @internal exported for testing
+ */
 export declare function parseErrors(output: string): string[];
-/** @internal exported for testing */
+/**
+ * Count compiler warnings only — same tightening logic as parseErrors.
+ * @internal exported for testing
+ */
 export declare function countWarnings(output: string): number;
-export declare function crosspadBuild(mode: "incremental" | "clean" | "reconfigure", onLine?: OnLine): Promise<BuildResult>;
+export type BuildType = "Debug" | "Release" | "RelWithDebInfo";
+export declare function crosspadBuild(mode: "incremental" | "clean" | "reconfigure", onLine?: OnLine, buildType?: BuildType, signal?: AbortSignal): Promise<BuildResult>;
 export interface RunResult {
     pid: number | null;
     exe_path: string;
+    already_running?: boolean;
+    responsive?: boolean;
+    error?: string;
 }
-export declare function crosspadRun(): RunResult;
+/**
+ * Launch the simulator binary in the background.
+ *
+ * Refuses to spawn a second instance if one is already responding on the
+ * remote-control port — multiple instances clobber each other's window
+ * state and the TCP listener binds to the same port.
+ *
+ * After spawn we poll the TCP control port for up to ~3s — this distinguishes
+ * "process started, ready to accept commands" from "process started but
+ * crashed before binding" so callers don't fire screenshot/stats too early.
+ */
+export declare function crosspadRun(force?: boolean): Promise<RunResult>;
+export interface KillResult {
+    success: boolean;
+    killed_pids: number[];
+    was_running: boolean;
+    error?: string;
+}
+/**
+ * Canonicalize a filesystem path. realpath resolves every symlink in the
+ * chain — needed because /proc/<pid>/exe always returns the kernel's view
+ * (post-symlink) while BIN_EXE comes from string concatenation under
+ * CROSSPAD_PC_ROOT, which is commonly itself a symlink (e.g. ~/GIT/crosspad-pc
+ * → /mnt/big-disk/crosspad-pc). Without canonicalization the string compare
+ * silently misses every running sim.
+ *
+ * Falls back to path.resolve when realpath fails (binary not built yet, or
+ * a non-existent /proc path during a TOCTOU race) so callers always get a
+ * comparable absolute path.
+ *
+ * @internal exported for testing
+ */
+export declare function canonicalize(p: string): string;
+/**
+ * Strip the kernel's " (deleted)" suffix that appears in /proc/<pid>/exe
+ * when the executable was unlinked or replaced after the process started
+ * (typical during dev: rebuild while sim is still running). Without this
+ * strip the path compare misses any running-but-rebuilt sim — the most
+ * common reason a developer would hit "agent can't kill the simulator."
+ *
+ * @internal exported for testing
+ */
+export declare function stripDeletedSuffix(p: string): string;
+/**
+ * Find PIDs running the CrossPad simulator binary.
+ *
+ * On Linux scans /proc/<pid>/exe and matches the resolved+canonicalized
+ * symlink against BIN_EXE. This is the only reliable identification:
+ * pgrep -x compares /proc/<pid>/comm, which Qt/pthread routinely overwrite
+ * via pthread_setname_np / prctl(PR_SET_NAME), so a sim launched as
+ * "CrossPad" shows up under whatever Qt named the main thread last.
+ * /proc/<pid>/exe is the kernel's record of the executed binary and cannot
+ * be spoofed by userspace renames.
+ *
+ * On macOS/Windows there's no /proc, so fall back to pgrep by basename.
+ * macOS suffers the same Qt comm-rename in theory but our binary name is
+ * 8 chars (fits in comm's 15-char limit) and PC builds are predominantly
+ * exercised on Linux, so this is documented as best-effort.
+ *
+ * @internal exported for testing
+ */
+export declare function findCrosspadPids(): number[];
+/**
+ * Kill the running PC simulator. SIGTERM matched PIDs, poll up to 3s for
+ * graceful exit, SIGKILL stragglers. Detection uses both /proc and the TCP
+ * control port — either signal alone has been observed to lie (TCP port
+ * occasionally lingers after the binary exits, and a crashed process may
+ * keep its socket past the syscall return).
+ *
+ * Per-PID kill errors (EPERM, EUNKNOWN) are aggregated and surfaced in
+ * `error` so the caller sees *why* a kill didn't take, not just "still
+ * running" — historically this was the hardest kill failure to debug
+ * because Node swallowed EPERM and the user just saw success=false.
+ */
+export declare function crosspadKill(): Promise<KillResult>;

package/dist/tools/build.js

@@ -1,27 +1,84 @@
 import fs from "fs";
+import path from "path";
+import { spawnSync } from "child_process";
 import { CROSSPAD_PC_ROOT, BUILD_DIR, BIN_EXE, VCPKG_TOOLCHAIN } from "../config.js";
 import { runBuild, runBuildStream, spawnDetached } from "../utils/exec.js";
-/** @internal exported for testing */
+import { isSimulatorRunning } from "../utils/remote-client.js";
+/**
+ * Match real compiler / linker / build-system errors only. Keyword-only
+ * matching ("any line containing 'error'") is too greedy — it picks up
+ * comments like `// error handling` from cmake output and inflates the
+ * error list.
+ *
+ * Patterns: GCC/Clang/MSVC compiler diagnostics, linker errors, CMake
+ * Errors, Ninja FAILED markers.
+ *
+ * @internal exported for testing
+ */
 export function parseErrors(output) {
     const errors = [];
-    for (const line of output.split("\n")) {
-        if (/\berror\b/i.test(line) && !line.includes("error(s)")) {
-            errors.push(line.trim());
+    for (const raw of output.split("\n")) {
+        const line = raw.trim();
+        if (!line)
+            continue;
+        // GCC/Clang: foo.cpp:10:5: error: ...   (also "fatal error:")
+        if (/:\d+:\d+:\s*(?:fatal\s+)?error\s*:/i.test(line)) {
+            errors.push(line);
+            continue;
+        }
+        // MSVC: foo.cpp(10,5): error C1234: ...
+        if (/\(\d+(?:,\d+)?\):\s*(?:fatal\s+)?error\s+[A-Z]\d+\s*:/i.test(line)) {
+            errors.push(line);
+            continue;
+        }
+        // Linker
+        if (/undefined reference to /.test(line)) {
+            errors.push(line);
+            continue;
+        }
+        if (/^.*ld(?:\.exe)?\s*:\s*error\s*:/i.test(line)) {
+            errors.push(line);
+            continue;
+        }
+        if (/LNK\d+:\s*error\b/i.test(line)) {
+            errors.push(line);
+            continue;
+        }
+        // CMake
+        if (/^CMake Error\b/i.test(line)) {
+            errors.push(line);
+            continue;
+        }
+        // Ninja
+        if (/^FAILED:\s/.test(line)) {
+            errors.push(line);
+            continue;
         }
     }
-    return errors.slice(0, 20); // Cap at 20 errors
+    return errors.slice(0, 20);
 }
-/** @internal exported for testing */
+/**
+ * Count compiler warnings only — same tightening logic as parseErrors.
+ * @internal exported for testing
+ */
 export function countWarnings(output) {
     let count = 0;
-    for (const line of output.split("\n")) {
-        if (/\bwarning\b/i.test(line) && !line.includes("warning(s)")) {
+    for (const raw of output.split("\n")) {
+        const line = raw.trim();
+        if (!line)
+            continue;
+        if (/:\d+:\d+:\s*warning\s*:/i.test(line)) {
             count++;
+            continue;
+        }
+        if (/\(\d+(?:,\d+)?\):\s*warning\s+[A-Z]\d+\s*:/i.test(line)) {
+            count++;
+            continue;
         }
     }
     return count;
 }
-export async function crosspadBuild(mode, onLine) {
+export async function crosspadBuild(mode, onLine, buildType = "Debug", signal) {
     const startTime = Date.now();
     // Clean: remove build dir
     if (mode === "clean" && fs.existsSync(BUILD_DIR)) {
@@ -33,11 +90,11 @@ export async function crosspadBuild(mode, onLine) {
         const configCmd = [
             "cmake -B build -G Ninja",
             `-DCMAKE_TOOLCHAIN_FILE=${VCPKG_TOOLCHAIN}`,
-            "-DCMAKE_BUILD_TYPE=Debug",
+            `-DCMAKE_BUILD_TYPE=${buildType}`,
         ].join(" ");
-        onLine?.("stdout", `[crosspad] Configuring: ${mode}...`);
+        onLine?.("stdout", `[crosspad] Configuring: ${mode} (${buildType})...`);
         if (onLine) {
-            const configResult = await runBuildStream(configCmd, CROSSPAD_PC_ROOT, onLine, 600_000);
+            const configResult = await runBuildStream(configCmd, CROSSPAD_PC_ROOT, onLine, 600_000, signal);
             if (!configResult.success) {
                 const combined = configResult.stdout + "\n" + configResult.stderr;
                 return {
@@ -69,7 +126,7 @@ export async function crosspadBuild(mode, onLine) {
     let buildStderr;
     let buildSuccess;
     if (onLine) {
-        const buildResult = await runBuildStream("cmake --build build", CROSSPAD_PC_ROOT, onLine, 600_000);
+        const buildResult = await runBuildStream("cmake --build build", CROSSPAD_PC_ROOT, onLine, 600_000, signal);
         buildStdout = buildResult.stdout;
         buildStderr = buildResult.stderr;
         buildSuccess = buildResult.success;
@@ -91,11 +148,251 @@ export async function crosspadBuild(mode, onLine) {
     onLine?.("stdout", `[crosspad] Build ${result.success ? "succeeded" : "FAILED"} in ${result.duration_seconds.toFixed(1)}s`);
     return result;
 }
-export function crosspadRun() {
+function delay(ms) {
+    return new Promise((r) => setTimeout(r, ms));
+}
+/**
+ * Launch the simulator binary in the background.
+ *
+ * Refuses to spawn a second instance if one is already responding on the
+ * remote-control port — multiple instances clobber each other's window
+ * state and the TCP listener binds to the same port.
+ *
+ * After spawn we poll the TCP control port for up to ~3s — this distinguishes
+ * "process started, ready to accept commands" from "process started but
+ * crashed before binding" so callers don't fire screenshot/stats too early.
+ */
+export async function crosspadRun(force = false) {
     if (!fs.existsSync(BIN_EXE)) {
         return { pid: null, exe_path: BIN_EXE };
     }
+    if (!force && (await isSimulatorRunning())) {
+        return {
+            pid: null,
+            exe_path: BIN_EXE,
+            already_running: true,
+            error: "Simulator already running on port 19840. Pass force=true to spawn another instance anyway.",
+        };
+    }
     const pid = spawnDetached(BIN_EXE, [], CROSSPAD_PC_ROOT);
-    return { pid, exe_path: BIN_EXE };
+    if (pid === null)
+        return { pid, exe_path: BIN_EXE };
+    // Poll for TCP readiness so callers know if the sim actually came up.
+    let responsive = false;
+    for (let i = 0; i < 6; i++) {
+        await delay(500);
+        if (await isSimulatorRunning()) {
+            responsive = true;
+            break;
+        }
+    }
+    return { pid, exe_path: BIN_EXE, responsive };
+}
+/**
+ * Canonicalize a filesystem path. realpath resolves every symlink in the
+ * chain — needed because /proc/<pid>/exe always returns the kernel's view
+ * (post-symlink) while BIN_EXE comes from string concatenation under
+ * CROSSPAD_PC_ROOT, which is commonly itself a symlink (e.g. ~/GIT/crosspad-pc
+ * → /mnt/big-disk/crosspad-pc). Without canonicalization the string compare
+ * silently misses every running sim.
+ *
+ * Falls back to path.resolve when realpath fails (binary not built yet, or
+ * a non-existent /proc path during a TOCTOU race) so callers always get a
+ * comparable absolute path.
+ *
+ * @internal exported for testing
+ */
+export function canonicalize(p) {
+    try {
+        return fs.realpathSync(p);
+    }
+    catch {
+        return path.resolve(p);
+    }
+}
+/**
+ * Strip the kernel's " (deleted)" suffix that appears in /proc/<pid>/exe
+ * when the executable was unlinked or replaced after the process started
+ * (typical during dev: rebuild while sim is still running). Without this
+ * strip the path compare misses any running-but-rebuilt sim — the most
+ * common reason a developer would hit "agent can't kill the simulator."
+ *
+ * @internal exported for testing
+ */
+export function stripDeletedSuffix(p) {
+    return p.replace(/ \(deleted\)$/, "");
+}
+/**
+ * Find PIDs running the CrossPad simulator binary.
+ *
+ * On Linux scans /proc/<pid>/exe and matches the resolved+canonicalized
+ * symlink against BIN_EXE. This is the only reliable identification:
+ * pgrep -x compares /proc/<pid>/comm, which Qt/pthread routinely overwrite
+ * via pthread_setname_np / prctl(PR_SET_NAME), so a sim launched as
+ * "CrossPad" shows up under whatever Qt named the main thread last.
+ * /proc/<pid>/exe is the kernel's record of the executed binary and cannot
+ * be spoofed by userspace renames.
+ *
+ * On macOS/Windows there's no /proc, so fall back to pgrep by basename.
+ * macOS suffers the same Qt comm-rename in theory but our binary name is
+ * 8 chars (fits in comm's 15-char limit) and PC builds are predominantly
+ * exercised on Linux, so this is documented as best-effort.
+ *
+ * @internal exported for testing
+ */
+export function findCrosspadPids() {
+    if (process.platform === "linux") {
+        const target = canonicalize(BIN_EXE);
+        let entries;
+        try {
+            entries = fs.readdirSync("/proc");
+        }
+        catch {
+            return [];
+        }
+        const pids = [];
+        const self = process.pid;
+        for (const entry of entries) {
+            // /proc has many non-pid entries (cpuinfo, self, etc.) — skip anything
+            // that doesn't round-trip as an integer. Also skip our own PID; node
+            // can't be CrossPad but defensive in case BIN_EXE is misconfigured to
+            // /usr/bin/node during testing.
+            if (!/^\d+$/.test(entry))
+                continue;
+            const pid = parseInt(entry, 10);
+            if (pid === self)
+                continue;
+            try {
+                const raw = fs.readlinkSync(`/proc/${pid}/exe`);
+                const exe = canonicalize(stripDeletedSuffix(raw));
+                if (exe === target)
+                    pids.push(pid);
+            }
+            catch {
+                // Process exited mid-scan, or no permission. Either is fine.
+            }
+        }
+        return pids;
+    }
+    // macOS / Windows / other: pgrep by basename. Strip .exe so the same
+    // binary works under wine/CI and on real Windows (where pgrep is absent
+    // — spawnSync.error is caught and we return []).
+    try {
+        const base = path.basename(BIN_EXE).replace(/\.exe$/i, "");
+        const r = spawnSync("pgrep", ["-x", base], { encoding: "utf-8", timeout: 5000 });
+        return (r.stdout || "")
+            .split("\n")
+            .map((s) => parseInt(s.trim(), 10))
+            .filter((n) => Number.isFinite(n));
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * Try to deliver a signal; returns the errno code on failure, undefined on
+ * success. ESRCH is folded into success ("already dead" is the desired state).
+ *
+ * @internal
+ */
+function trySignal(pid, signal) {
+    try {
+        process.kill(pid, signal);
+        return undefined;
+    }
+    catch (e) {
+        const code = e?.code;
+        if (code === "ESRCH")
+            return undefined; // already exited — fine
+        return code ?? "EUNKNOWN";
+    }
+}
+/**
+ * Kill the running PC simulator. SIGTERM matched PIDs, poll up to 3s for
+ * graceful exit, SIGKILL stragglers. Detection uses both /proc and the TCP
+ * control port — either signal alone has been observed to lie (TCP port
+ * occasionally lingers after the binary exits, and a crashed process may
+ * keep its socket past the syscall return).
+ *
+ * Per-PID kill errors (EPERM, EUNKNOWN) are aggregated and surfaced in
+ * `error` so the caller sees *why* a kill didn't take, not just "still
+ * running" — historically this was the hardest kill failure to debug
+ * because Node swallowed EPERM and the user just saw success=false.
+ */
+export async function crosspadKill() {
+    const initialPids = findCrosspadPids();
+    const tcpAliveInitial = await isSimulatorRunning();
+    const wasRunning = initialPids.length > 0 || tcpAliveInitial;
+    if (!wasRunning) {
+        return { success: true, killed_pids: [], was_running: false };
+    }
+    const killedPids = [];
+    const failures = [];
+    for (const pid of initialPids) {
+        const errCode = trySignal(pid, "SIGTERM");
+        if (errCode === undefined) {
+            killedPids.push(pid);
+        }
+        else {
+            failures.push(`SIGTERM pid=${pid} ${errCode}`);
+        }
+    }
+    // Poll up to 3s for SIGTERM to take effect. The first poll runs after a
+    // single 150 ms beat; this is enough for a Qt event loop to acknowledge
+    // SIGTERM in the common case so the kill returns fast.
+    const deadline = Date.now() + 3000;
+    let stillAlive = initialPids;
+    while (Date.now() < deadline) {
+        await delay(150);
+        stillAlive = findCrosspadPids();
+        if (stillAlive.length === 0) {
+            // /proc is clean — confirm the TCP port is gone too. We only pay the
+            // TCP probe in this branch to avoid stretching the polling deadline:
+            // isSimulatorRunning can take seconds when the sim is hung.
+            if (!(await isSimulatorRunning()))
+                break;
+        }
+    }
+    // Force-kill anything that survived SIGTERM. Re-check /proc/<pid>/exe by
+    // way of findCrosspadPids (already done above) — guards against PID
+    // recycling in the gap between SIGTERM and SIGKILL.
+    if (stillAlive.length > 0) {
+        for (const pid of stillAlive) {
+            const errCode = trySignal(pid, "SIGKILL");
+            if (errCode === undefined) {
+                if (!killedPids.includes(pid))
+                    killedPids.push(pid);
+            }
+            else {
+                failures.push(`SIGKILL pid=${pid} ${errCode}`);
+            }
+        }
+        await delay(300);
+    }
+    const finalAlive = findCrosspadPids();
+    const tcpAliveFinal = await isSimulatorRunning();
+    const stillRunning = finalAlive.length > 0 || tcpAliveFinal;
+    let errorMsg;
+    if (stillRunning) {
+        const parts = [
+            `Simulator still alive after SIGTERM+SIGKILL`,
+            `pids=${finalAlive.join(",") || "none"}`,
+            `tcp_alive=${tcpAliveFinal}`,
+        ];
+        if (failures.length > 0)
+            parts.push(`failures=[${failures.join("; ")}]`);
+        errorMsg = parts.join(", ") + ".";
+    }
+    else if (failures.length > 0) {
+        // Sim is dead but some kill attempts errored (e.g. PID gone before our
+        // SIGKILL). Worth surfacing but not a hard failure.
+        errorMsg = `Sim stopped, but some signals errored: ${failures.join("; ")}.`;
+    }
+    return {
+        success: !stillRunning,
+        killed_pids: killedPids,
+        was_running: true,
+        error: errorMsg,
+    };
 }
 //# sourceMappingURL=build.js.map

package/dist/tools/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/tools/build.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/tools/build.ts"],"names":[],"mappings":"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"}

package/dist/tools/diff-core.d.ts

@@ -14,11 +14,15 @@ export interface SubmoduleDiff {
     commit_log: string[];
 }
 export interface DiffCoreResult {
+    parent_repo: string;
     submodules: SubmoduleDiff[];
 }
 /**
  * Show what changed in crosspad-core and/or crosspad-gui relative to the
  * pinned submodule commit. Essential for dev-mode workflows where you're
  * editing shared repos but haven't committed/pinned yet.
+ *
+ * Submodule paths are resolved dynamically from .gitmodules (handles both
+ * `crosspad-core` and `lib/crosspad-core` layouts).
  */
-export declare function crosspadDiffCore(submodule?: "crosspad-core" | "crosspad-gui" | "both"): DiffCoreResult;
+export declare function crosspadDiffCore(submodule?: "crosspad-core" | "crosspad-gui" | "both", parent?: "crosspad-pc" | "platform-idf"): DiffCoreResult;

package/dist/tools/diff-core.js

@@ -1,22 +1,27 @@
 import fs from "fs";
 import path from "path";
-import { CROSSPAD_PC_ROOT } from "../config.js";
+import { CROSSPAD_PC_ROOT, CROSSPAD_IDF_ROOT } from "../config.js";
 import { runCommand } from "../utils/exec.js";
-import { getSubmodulePin } from "../utils/git.js";
+import { getSubmodulePin, findSubmodulePath } from "../utils/git.js";
 /**
  * Show what changed in crosspad-core and/or crosspad-gui relative to the
  * pinned submodule commit. Essential for dev-mode workflows where you're
  * editing shared repos but haven't committed/pinned yet.
+ *
+ * Submodule paths are resolved dynamically from .gitmodules (handles both
+ * `crosspad-core` and `lib/crosspad-core` layouts).
  */
-export function crosspadDiffCore(submodule = "both") {
+export function crosspadDiffCore(submodule = "both", parent = "crosspad-pc") {
+    const parentRoot = parent === "platform-idf" ? CROSSPAD_IDF_ROOT : CROSSPAD_PC_ROOT;
     const targets = submodule === "both"
         ? ["crosspad-core", "crosspad-gui"]
         : [submodule];
     const submodules = [];
     for (const sub of targets) {
-        const subPath = path.join(CROSSPAD_PC_ROOT, sub);
+        const relPath = findSubmodulePath(parentRoot, sub);
+        const subPath = relPath ? path.join(parentRoot, relPath) : path.join(parentRoot, sub);
         const isDevMode = isJunction(subPath);
-        const pinnedCommit = getSubmodulePin(CROSSPAD_PC_ROOT, sub);
+        const pinnedCommit = getSubmodulePin(parentRoot, sub);
         // Get current HEAD
         const headResult = runCommand("git rev-parse HEAD", subPath);
         const currentCommit = headResult.success ? headResult.stdout.trim() : null;
@@ -74,7 +79,7 @@ export function crosspadDiffCore(submodule = "both") {
             commit_log: commitLog,
         });
     }
-    return { submodules };
+    return { parent_repo: parent, submodules };
 }
 function isJunction(p) {
     try {

package/dist/tools/diff-core.js.map

@@ -1 +1 @@
-{"version":3,"file":"diff-core.js","sourceRoot":"","sources":["../../src/tools/diff-core.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diff-core.js","sourceRoot":"","sources":["../../src/tools/diff-core.ts"],"names":[],"mappings":"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"}

package/dist/tools/idf-build.d.ts

@@ -20,4 +20,4 @@ export declare function parseErrors(output: string): string[];
 export declare function parseWarnings(output: string): string[];
 /** @internal exported for testing */
 export declare function getTail(output: string, n: number): string[];
-export declare function crosspadIdfBuild(mode: "build" | "fullclean" | "clean", onLine?: OnLine): Promise<IdfBuildResult>;
+export declare function crosspadIdfBuild(mode: "build" | "fullclean" | "clean", onLine?: OnLine, signal?: AbortSignal): Promise<IdfBuildResult>;

package/dist/tools/idf-build.js

@@ -97,14 +97,14 @@ export function parseWarnings(output) {
 export function getTail(output, n) {
     return output.split("\n").filter(l => l.trim()).slice(-n);
 }
-async function runIdfCmd(cmd, onLine, timeoutMs) {
+async function runIdfCmd(cmd, onLine, timeoutMs, signal) {
     if (onLine) {
-        const r = await runIdfStream(cmd, CROSSPAD_IDF_ROOT, onLine, timeoutMs);
+        const r = await runIdfStream(cmd, CROSSPAD_IDF_ROOT, onLine, timeoutMs, signal);
         return r;
     }
     return runIdf(cmd, CROSSPAD_IDF_ROOT, timeoutMs);
 }
-export async function crosspadIdfBuild(mode, onLine) {
+export async function crosspadIdfBuild(mode, onLine, signal) {
     const startTime = Date.now();
     let autoReconfigured = false;
     // Auto-detect unregistered apps — if found, escalate to fullclean
@@ -118,7 +118,7 @@ export async function crosspadIdfBuild(mode, onLine) {
     }
     if (mode === "fullclean") {
         onLine?.("stdout", "[idf] Running idf.py fullclean...");
-        const r = await runIdfCmd("idf.py fullclean", onLine, 60_000);
+        const r = await runIdfCmd("idf.py fullclean", onLine, 60_000, signal);
         if (!r.success) {
             const combined = r.stdout + "\n" + r.stderr;
             return {
@@ -139,7 +139,7 @@ export async function crosspadIdfBuild(mode, onLine) {
         }
     }
     onLine?.("stdout", "[idf] Building...");
-    const r = await runIdfCmd("idf.py build", onLine, 600_000);
+    const r = await runIdfCmd("idf.py build", onLine, 600_000, signal);
     const combined = r.stdout + "\n" + r.stderr;
     const errors = parseErrors(combined);
     const warnings = parseWarnings(combined);