@typecad/cuttlefish 1.0.0-alpha.3 → 1.0.0-alpha.7

package/dist/emit/utils/async-state-machine.js

@@ -4,6 +4,7 @@
  * Extracted from cpp-emitter.ts
  */
 import { escapeCppStringLiteral } from "../../utils/strings.js";
+import { routeHALOp } from "../route-hal-op.js";
 /**
  * Converts a string to PascalCase.
  * Used for generating class names from function names.
@@ -53,6 +54,20 @@ export function generateAsyncTaskClass(fnName, fnStatements, strategy, knownFunc
             segments.push({ preStatements: currentPre, awaitedCallee: stmt.callee, awaitedArgs: stmt.args });
             currentPre = [];
         }
+        else if (
+        // Chained HAL calls (e.g. `await Http.get(url).send()`) resolve to a
+        // block of hal-ops whose LAST statement is the awaited wait marker.
+        // Flatten it so the split sees the marker; the leading ops (begin,
+        // setters) run as pre-statements of the same segment.
+        stmt.kind === "block" &&
+            stmt.body.length > 0 &&
+            stmt.body[stmt.body.length - 1].kind === "call" &&
+            stmt.body[stmt.body.length - 1].isAwaited) {
+            const last = stmt.body[stmt.body.length - 1];
+            currentPre.push(...stmt.body.slice(0, -1));
+            segments.push({ preStatements: currentPre, awaitedCallee: last.callee, awaitedArgs: last.args });
+            currentPre = [];
+        }
         else {
             currentPre.push(stmt);
         }
@@ -101,16 +116,74 @@ export function generateAsyncTaskClass(fnName, fnStatements, strategy, knownFunc
             tapMembers.set(member, i);
         }
     }
+    // Collect net-wait (WiFi/HTTP/HAL) markers: awaited hal-ops rewritten to
+    // __WIFI_WAIT__/__HTTP_WAIT__/__HAL_WAIT__ calls carrying the op as a
+    // hal-expr arg. The strategy lowers the op to start code + poll condition.
+    const netInfoMap = new Map();
+    for (let i = 0; i < segments.length; i++) {
+        const seg = segments[i];
+        if ((seg.awaitedCallee === "__WIFI_WAIT__" || seg.awaitedCallee === "__HTTP_WAIT__" || seg.awaitedCallee === "__BLE_WAIT__" || seg.awaitedCallee === "__HAL_WAIT__") &&
+            seg.awaitedArgs[0]?.kind === "hal-expr") {
+            const op = seg.awaitedArgs[0].operation;
+            netInfoMap.set(i, netWaitInfo(op, strategy));
+        }
+    }
+    // ── Render each state ──────────────────────────────────────────────────
+    // Decomposition: a state's ENTRY condition comes from the await that ended
+    // the PREVIOUS segment (edge / tap / net poll / timed deadline); once the
+    // condition fires, the segment body runs and the await ending THIS segment
+    // is armed (pin snapshot / tap snapshot / net start op / deadline).
+    // Lines that arm the await ending segment i and advance the state.
+    const armNextLines = (i, pad) => {
+        const seg = segments[i];
+        const lines = [];
+        if (seg.awaitedCallee === undefined) {
+            lines.push(`${pad}_state = ${isCyclic ? "STATE_0" : "STATE_DONE"};`);
+            return lines;
+        }
+        const edge = edgeInfoMap.get(i);
+        const tap = tapInfoMap.get(i);
+        const net = netInfoMap.get(i);
+        if (edge) {
+            lines.push(`${pad}_edgePrev_p${edge.pin} = digitalRead(${edge.pin});`);
+            if (edge.timeout !== null) {
+                lines.push(`${pad}_waitUntil = ${strategy.currentTimeMillis()} + ${edge.timeout};`);
+            }
+        }
+        else if (tap) {
+            lines.push(`${pad}_tapPrev_${i} = __ui_tap_seq;`);
+        }
+        else if (net) {
+            for (const startLine of net.startLines)
+                lines.push(`${pad}${startLine}`);
+            if (net.timeoutExpr !== null) {
+                lines.push(`${pad}_waitUntil = ${strategy.currentTimeMillis()} + ${net.timeoutExpr};`);
+            }
+        }
+        else {
+            // Plain timed wait (await delay(ms)) — arm its deadline.
+            const ms = seg.awaitedArgs[0] ? renderExpression(seg.awaitedArgs[0], strategy) : "0";
+            lines.push(`${pad}_waitUntil = ${strategy.currentTimeMillis()} + ${ms};`);
+        }
+        lines.push(`${pad}_state = STATE_${i + 1};`);
+        return lines;
+    };
     const caseLines = [];
     for (let i = 0; i < segments.length; i++) {
         const seg = segments[i];
         const stateName = `STATE_${i}`;
-        const isTerminal = seg.awaitedCallee === undefined;
         const body = [];
-        const edgeSetup = edgeInfoMap.get(i);
         const edgePoll = i > 0 ? edgeInfoMap.get(i - 1) : undefined;
-        const tapSetup = tapInfoMap.get(i);
         const tapPoll = i > 0 ? tapInfoMap.get(i - 1) : undefined;
+        const netPoll = i > 0 ? netInfoMap.get(i - 1) : undefined;
+        // Segment body + arming of the next await, at the given indent.
+        const runSegment = (pad) => {
+            const lines = [];
+            for (const stmt of seg.preStatements)
+                lines.push(`${pad}${renderStmt(stmt)}`);
+            lines.push(...armNextLines(i, pad));
+            return lines;
+        };
         if (edgePoll) {
             // Poll state: check pin transition via digitalRead
             const prevVar = `_edgePrev_p${edgePoll.pin}`;
@@ -124,53 +197,12 @@ export function generateAsyncTaskClass(fnName, fnStatements, strategy, knownFunc
             body.push(`          int _cur = digitalRead(${edgePoll.pin});`);
             body.push(`          if (${fullCond}) {`);
             body.push(`            ${prevVar} = _cur;`);
-            for (const stmt of seg.preStatements)
-                body.push(`            ${renderStmt(stmt)}`);
-            if (edgeSetup) {
-                // Next await is also edge detection — set up its pin tracking
-                body.push(`            _edgePrev_p${edgeSetup.pin} = digitalRead(${edgeSetup.pin});`);
-                if (edgeSetup.timeout !== null) {
-                    body.push(`            _waitUntil = ${strategy.currentTimeMillis()} + ${edgeSetup.timeout};`);
-                }
-                body.push(`            _state = STATE_${i + 1};`);
-            }
-            else if (!isTerminal) {
-                const ms = seg.awaitedArgs[0] ? renderExpression(seg.awaitedArgs[0], strategy) : "0";
-                body.push(`            _waitUntil = ${strategy.currentTimeMillis()} + ${ms};`);
-                body.push(`            _state = STATE_${i + 1};`);
-            }
-            else {
-                body.push(`            _state = ${isCyclic ? "STATE_0" : "STATE_DONE"};`);
-            }
+            body.push(...runSegment(`            `));
             body.push(`          } else {`);
             body.push(`            ${prevVar} = _cur;`);
             body.push(`          }`);
             body.push(`        }`);
         }
-        else if (edgeSetup) {
-            // Setup state: capture initial pin state before polling
-            const prevVar = `_edgePrev_p${edgeSetup.pin}`;
-            if (i === 0) {
-                for (const stmt of seg.preStatements)
-                    body.push(`        ${renderStmt(stmt)}`);
-                body.push(`        ${prevVar} = digitalRead(${edgeSetup.pin});`);
-                if (edgeSetup.timeout !== null) {
-                    body.push(`        _waitUntil = ${strategy.currentTimeMillis()} + ${edgeSetup.timeout};`);
-                }
-                body.push(`        _state = STATE_${i + 1};`);
-            }
-            else {
-                body.push(`        if (${strategy.currentTimeMillis()} >= _waitUntil) {`);
-                for (const stmt of seg.preStatements)
-                    body.push(`          ${renderStmt(stmt)}`);
-                body.push(`          ${prevVar} = digitalRead(${edgeSetup.pin});`);
-                if (edgeSetup.timeout !== null) {
-                    body.push(`          _waitUntil = ${strategy.currentTimeMillis()} + ${edgeSetup.timeout};`);
-                }
-                body.push(`          _state = STATE_${i + 1};`);
-                body.push(`        }`);
-            }
-        }
         else if (tapPoll) {
             // Tap-poll state: a previous segment ended with `await ui.onTap()`.
             // Wait until __ui_tap_seq bumps from the captured snapshot. A per-node
@@ -181,81 +213,31 @@ export function generateAsyncTaskClass(fnName, fnStatements, strategy, knownFunc
                 ? `__ui_tap_seq != ${prevVar}`
                 : `(__ui_tap_seq != ${prevVar}) && (__ui_tap_node == ${nodeFilter})`;
             body.push(`        if (${cond}) {`);
-            for (const stmt of seg.preStatements)
-                body.push(`          ${renderStmt(stmt)}`);
-            // What does the NEXT await (ending this segment) look like? Re-derive
-            // from the maps via a fresh lookup so TS doesn't narrow edgeSetup away.
-            const nextEdge = edgeInfoMap.get(i) ?? null;
-            if (tapSetup) {
-                // Next await is also a tap — capture its snapshot now.
-                body.push(`          _tapPrev_${i} = __ui_tap_seq;`);
-                body.push(`          _state = STATE_${i + 1};`);
-            }
-            else if (nextEdge) {
-                body.push(`          _edgePrev_p${nextEdge.pin} = digitalRead(${nextEdge.pin});`);
-                if (nextEdge.timeout !== null) {
-                    body.push(`          _waitUntil = ${strategy.currentTimeMillis()} + ${nextEdge.timeout};`);
-                }
-                body.push(`          _state = STATE_${i + 1};`);
-            }
-            else if (!isTerminal) {
-                // Next await is a normal timed wait (delay) — arm its deadline.
-                const ms = seg.awaitedArgs[0] ? renderExpression(seg.awaitedArgs[0], strategy) : "0";
-                body.push(`          _waitUntil = ${strategy.currentTimeMillis()} + ${ms};`);
-                body.push(`          _state = STATE_${i + 1};`);
-            }
-            else {
-                body.push(`          _state = ${isCyclic ? "STATE_0" : "STATE_DONE"};`);
-            }
+            body.push(...runSegment(`          `));
             body.push(`        }`);
         }
-        else if (tapSetup && !edgePoll) {
-            // Tap-setup state: this segment ends with `await ui.onTap()`. Capture the
-            // current tap counter so the poll state can detect the NEXT bump.
-            // (edgePoll takes precedence when the previous await was an edge.)
-            if (i === 0) {
-                for (const stmt of seg.preStatements)
-                    body.push(`        ${renderStmt(stmt)}`);
-                body.push(`        _tapPrev_${i} = __ui_tap_seq;`);
-                body.push(`        _state = STATE_${i + 1};`);
-            }
-            else {
-                body.push(`        if (${strategy.currentTimeMillis()} >= _waitUntil) {`);
-                for (const stmt of seg.preStatements)
-                    body.push(`          ${renderStmt(stmt)}`);
-                body.push(`          _tapPrev_${i} = __ui_tap_seq;`);
-                body.push(`          _state = STATE_${i + 1};`);
-                body.push(`        }`);
-            }
+        else if (netPoll) {
+            // Net-poll state: a previous segment ended with an awaited WiFi/HTTP
+            // op. Wait until its poll condition fires (or its deadline expires).
+            const deadline = `${strategy.currentTimeMillis()} >= _waitUntil`;
+            const cond = netPoll.pollCond === null
+                ? deadline
+                : netPoll.timeoutExpr !== null
+                    ? `(${netPoll.pollCond}) || ${deadline}`
+                    : netPoll.pollCond;
+            body.push(`        if (${cond}) {`);
+            body.push(...runSegment(`          `));
+            body.push(`        }`);
+        }
+        else if (i === 0) {
+            // First state runs immediately.
+            body.push(...runSegment(`        `));
         }
         else {
-            // Normal timed-wait state
-            if (i === 0) {
-                for (const stmt of seg.preStatements)
-                    body.push(`        ${renderStmt(stmt)}`);
-                if (!isTerminal) {
-                    const ms = seg.awaitedArgs[0] ? renderExpression(seg.awaitedArgs[0], strategy) : "0";
-                    body.push(`        _waitUntil = ${strategy.currentTimeMillis()} + ${ms};`);
-                    body.push(`        _state = STATE_${i + 1};`);
-                }
-                else {
-                    body.push(`        _state = ${isCyclic ? "STATE_0" : "STATE_DONE"};`);
-                }
-            }
-            else {
-                body.push(`        if (${strategy.currentTimeMillis()} >= _waitUntil) {`);
-                for (const stmt of seg.preStatements)
-                    body.push(`          ${renderStmt(stmt)}`);
-                if (!isTerminal) {
-                    const ms = seg.awaitedArgs[0] ? renderExpression(seg.awaitedArgs[0], strategy) : "0";
-                    body.push(`          _waitUntil = ${strategy.currentTimeMillis()} + ${ms};`);
-                    body.push(`          _state = STATE_${i + 1};`);
-                }
-                else {
-                    body.push(`          _state = ${isCyclic ? "STATE_0" : "STATE_DONE"};`);
-                }
-                body.push(`        }`);
-            }
+            // Previous await was a plain timed wait — poll its deadline.
+            body.push(`        if (${strategy.currentTimeMillis()} >= _waitUntil) {`);
+            body.push(...runSegment(`          `));
+            body.push(`        }`);
         }
         caseLines.push(`      case ${stateName}:`, `        {`, ...body, `        }`, `        break;`);
     }
@@ -331,6 +313,93 @@ function renderExpression(expr, strategy) {
             return "/* complex expr */";
     }
 }
+/** Numeric-or-rendered HAL field → C++ text. */
+function ms(v) {
+    return String(v);
+}
+/** True when a timeout field is the literal 0 (wait forever, no deadline). */
+function isZeroTimeout(v) {
+    return v === undefined || v === null || String(v).trim() === "0";
+}
+/**
+ * Map an awaitable HAL op to its start statements + poll condition, lowering
+ * the start op and poll predicate through the platform strategy. Keep the set
+ * of handled ops in sync with AWAITABLE_HAL_OPS in ir/transformers/expressions.ts.
+ *
+ * Falls back to running the blocking form as the "start" with an immediate
+ * completion when the strategy can't lower the split ops.
+ */
+function netWaitInfo(op, strategy) {
+    const o = op;
+    const route = (routedOp) => routeHALOp(routedOp, strategy);
+    const expr = (operation) => route({ operation })?.expression ?? null;
+    switch (op.operation) {
+        case "timing.delay":
+            return { startLines: [], pollCond: null, timeoutExpr: ms(o.ms) };
+        case "wifi.connect": {
+            const start = route({ operation: "wifi.connect_start", ssid: o.ssid, password: o.password });
+            const poll = expr("wifi.is_connected");
+            if (start?.code && poll) {
+                return {
+                    startLines: [start.code],
+                    pollCond: poll,
+                    timeoutExpr: isZeroTimeout(o.timeoutMs) ? null : ms(o.timeoutMs),
+                };
+            }
+            break;
+        }
+        case "wifi.wait_connected": {
+            const poll = expr("wifi.is_connected");
+            if (poll) {
+                return {
+                    startLines: [],
+                    pollCond: poll,
+                    timeoutExpr: isZeroTimeout(o.timeoutMs) ? null : ms(o.timeoutMs),
+                };
+            }
+            break;
+        }
+        case "wifi.wait_disconnected": {
+            const poll = expr("wifi.is_connected");
+            if (poll) {
+                return { startLines: [], pollCond: `!${poll}`, timeoutExpr: null };
+            }
+            break;
+        }
+        case "wifi.scan": {
+            const start = route({ operation: "wifi.scan_start" });
+            const poll = expr("wifi.scan_done");
+            if (start?.code && poll) {
+                return { startLines: [start.code], pollCond: poll, timeoutExpr: null };
+            }
+            break;
+        }
+        case "http.send": {
+            const start = route({ operation: "http.send_start" });
+            const poll = expr("http.done");
+            if (start?.code && poll) {
+                return { startLines: [start.code], pollCond: poll, timeoutExpr: null };
+            }
+            break;
+        }
+        case "ble.until_connected": {
+            const start = route({ operation: "ble.until_connected_start" });
+            const poll = expr("ble.is_connected");
+            if (start?.code && poll) {
+                return {
+                    startLines: [start.code],
+                    pollCond: poll,
+                    timeoutExpr: isZeroTimeout(o.timeoutMs) ? null : ms(o.timeoutMs),
+                };
+            }
+            break;
+        }
+    }
+    // Fallback: run the blocking form immediately and complete on the next tick.
+    const blocking = routeHALOp(op, strategy);
+    const line = blocking?.code ?? (blocking?.expression ? `${blocking.expression};` : `/* unhandled awaited hal-op: ${op.operation} */`);
+    return { startLines: [line], pollCond: null, timeoutExpr: "0" };
+}
 function parseEdgeMarker(argText) {
     const match = argText.match(/^__EDGE_(RISING|FALLING)__([a-zA-Z0-9_]+)__T(.*)$/);
     if (!match)

package/dist/emit/utils/hal-op-cpp-type.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Best-effort C++ return type for a HAL expression op.
+ * Used by snprintf format inference and expression type inference so
+ * string-returning ops (e.g. wifi.scan_ssid → const char*) use %s, not %d.
+ */
+export declare function cppTypeForHalOp(operation: string): string | undefined;

package/dist/emit/utils/hal-op-cpp-type.js

@@ -0,0 +1,40 @@
+/**
+ * Best-effort C++ return type for a HAL expression op.
+ * Used by snprintf format inference and expression type inference so
+ * string-returning ops (e.g. wifi.scan_ssid → const char*) use %s, not %d.
+ */
+export function cppTypeForHalOp(operation) {
+    switch (operation) {
+        case "wifi.local_ip":
+        case "wifi.mac":
+        case "wifi.ap_ip":
+        case "wifi.scan_ssid":
+        case "http.body":
+        case "http.response_header":
+            return "const char*";
+        case "wifi.is_connected":
+        case "wifi.connect":
+        case "wifi.wait_connected":
+        case "wifi.scan_done":
+        case "wifi.ap_start":
+        case "wifi.connect_saved":
+        case "http.ok":
+        case "http.done":
+            return "bool";
+        case "wifi.status":
+        case "wifi.rssi":
+        case "wifi.scan":
+        case "wifi.scan_count":
+        case "wifi.scan_rssi":
+        case "wifi.scan_encryption":
+        case "wifi.scan_channel":
+        case "wifi.ap_client_count":
+        case "http.status":
+        case "http.content_length":
+            return "int";
+        case "http.send":
+            return "bool";
+        default:
+            return undefined;
+    }
+}

package/dist/ir/adc-range-validation.js

@@ -59,7 +59,7 @@ function extractNumericValue(expr) {
 /**
  * Check binary comparison expressions for ADC range issues.
  */
-function checkComparisonForADCRange(left, operator, right, adcConfig, diagnostics) {
+function checkComparisonForADCRange(left, operator, right, adcConfig, filePath, diagnostics) {
     // Check if one side is an analog read and the other is a literal
     let analogReadSide = null;
     let literalValue = null;
@@ -83,6 +83,7 @@ function checkComparisonForADCRange(left, operator, right, adcConfig, diagnostic
             severity: 'info',
             message: `Comparison ${comparisonDesc} may never be true. ADC resolution is ${adcConfig.resolution}-bit (max ${adcConfig.maxValue}) on this board.`,
             code: 'adc-range-warning',
+            filePath,
             source: 'adc-range-validation',
         });
     }
@@ -90,7 +91,7 @@ function checkComparisonForADCRange(left, operator, right, adcConfig, diagnostic
 /**
  * Scan an expression for ADC range issues.
  */
-function scanExpressionForADCRange(expr, adcConfig, diagnostics) {
+function scanExpressionForADCRange(expr, adcConfig, filePath, diagnostics) {
     if (!expr || typeof expr !== 'object')
         return;
     // Check binary comparisons
@@ -98,59 +99,59 @@ function scanExpressionForADCRange(expr, adcConfig, diagnostics) {
         const bin = expr;
         const comparisonOps = ['>', '>=', '<', '<=', '===', '==', '!==', '!='];
         if (comparisonOps.includes(bin.operator)) {
-            checkComparisonForADCRange(bin.left, bin.operator, bin.right, adcConfig, diagnostics);
+            checkComparisonForADCRange(bin.left, bin.operator, bin.right, adcConfig, filePath, diagnostics);
         }
         // Recursively scan both sides
-        scanExpressionForADCRange(bin.left, adcConfig, diagnostics);
-        scanExpressionForADCRange(bin.right, adcConfig, diagnostics);
+        scanExpressionForADCRange(bin.left, adcConfig, filePath, diagnostics);
+        scanExpressionForADCRange(bin.right, adcConfig, filePath, diagnostics);
     }
     // Check ternary conditions
     if (expr.kind === 'ternary') {
         const ternary = expr;
-        scanExpressionForADCRange(ternary.condition, adcConfig, diagnostics);
-        scanExpressionForADCRange(ternary.whenTrue, adcConfig, diagnostics);
-        scanExpressionForADCRange(ternary.whenFalse, adcConfig, diagnostics);
+        scanExpressionForADCRange(ternary.condition, adcConfig, filePath, diagnostics);
+        scanExpressionForADCRange(ternary.whenTrue, adcConfig, filePath, diagnostics);
+        scanExpressionForADCRange(ternary.whenFalse, adcConfig, filePath, diagnostics);
     }
     // Check property access
     if (expr.kind === 'property-access') {
         const pa = expr;
-        scanExpressionForADCRange(pa.object, adcConfig, diagnostics);
+        scanExpressionForADCRange(pa.object, adcConfig, filePath, diagnostics);
     }
 }
 /**
  * Scan a statement for ADC range issues.
  */
-function scanStatementForADCRange(stmt, adcConfig, diagnostics) {
+function scanStatementForADCRange(stmt, adcConfig, filePath, diagnostics) {
     if (!stmt || typeof stmt !== 'object')
         return;
     switch (stmt.kind) {
         case 'var_decl': {
             const varDecl = stmt;
             if (varDecl.initializer) {
-                scanExpressionForADCRange(varDecl.initializer, adcConfig, diagnostics);
+                scanExpressionForADCRange(varDecl.initializer, adcConfig, filePath, diagnostics);
             }
             break;
         }
         case 'assign': {
             const assign = stmt;
             if (assign.value) {
-                scanExpressionForADCRange(assign.value, adcConfig, diagnostics);
+                scanExpressionForADCRange(assign.value, adcConfig, filePath, diagnostics);
             }
             break;
         }
         case 'if': {
             const ifStmt = stmt;
             if (ifStmt.condition) {
-                scanExpressionForADCRange(ifStmt.condition, adcConfig, diagnostics);
+                scanExpressionForADCRange(ifStmt.condition, adcConfig, filePath, diagnostics);
             }
             if (ifStmt.thenBranch) {
                 for (const s of ifStmt.thenBranch) {
-                    scanStatementForADCRange(s, adcConfig, diagnostics);
+                    scanStatementForADCRange(s, adcConfig, filePath, diagnostics);
                 }
             }
             if (ifStmt.elseBranch) {
                 for (const s of ifStmt.elseBranch) {
-                    scanStatementForADCRange(s, adcConfig, diagnostics);
+                    scanStatementForADCRange(s, adcConfig, filePath, diagnostics);
                 }
             }
             break;
@@ -158,11 +159,11 @@ function scanStatementForADCRange(stmt, adcConfig, diagnostics) {
         case 'while': {
             const whileStmt = stmt;
             if (whileStmt.condition) {
-                scanExpressionForADCRange(whileStmt.condition, adcConfig, diagnostics);
+                scanExpressionForADCRange(whileStmt.condition, adcConfig, filePath, diagnostics);
             }
             if (whileStmt.body) {
                 for (const s of whileStmt.body) {
-                    scanStatementForADCRange(s, adcConfig, diagnostics);
+                    scanStatementForADCRange(s, adcConfig, filePath, diagnostics);
                 }
             }
             break;
@@ -170,11 +171,11 @@ function scanStatementForADCRange(stmt, adcConfig, diagnostics) {
         case 'for': {
             const forStmt = stmt;
             if (forStmt.condition) {
-                scanExpressionForADCRange(forStmt.condition, adcConfig, diagnostics);
+                scanExpressionForADCRange(forStmt.condition, adcConfig, filePath, diagnostics);
             }
             if (forStmt.body) {
                 for (const s of forStmt.body) {
-                    scanStatementForADCRange(s, adcConfig, diagnostics);
+                    scanStatementForADCRange(s, adcConfig, filePath, diagnostics);
                 }
             }
             break;
@@ -182,7 +183,7 @@ function scanStatementForADCRange(stmt, adcConfig, diagnostics) {
         case 'return': {
             const retStmt = stmt;
             if (retStmt.value) {
-                scanExpressionForADCRange(retStmt.value, adcConfig, diagnostics);
+                scanExpressionForADCRange(retStmt.value, adcConfig, filePath, diagnostics);
             }
             break;
         }
@@ -190,7 +191,7 @@ function scanStatementForADCRange(stmt, adcConfig, diagnostics) {
             const call = stmt;
             if (call.args) {
                 for (const arg of call.args) {
-                    scanExpressionForADCRange(arg, adcConfig, diagnostics);
+                    scanExpressionForADCRange(arg, adcConfig, filePath, diagnostics);
                 }
             }
             break;
@@ -214,7 +215,7 @@ export function validateADCRange(program, boardConstants) {
     // Scan top-level statements
     if (program.topLevelStatements) {
         for (const stmt of program.topLevelStatements) {
-            scanStatementForADCRange(stmt, adcConfig, diagnostics);
+            scanStatementForADCRange(stmt, adcConfig, program.fileName, diagnostics);
         }
     }
     // Scan function bodies
@@ -222,7 +223,7 @@ export function validateADCRange(program, boardConstants) {
         for (const fn of program.functions) {
             if (fn.statements) {
                 for (const stmt of fn.statements) {
-                    scanStatementForADCRange(stmt, adcConfig, diagnostics);
+                    scanStatementForADCRange(stmt, adcConfig, program.fileName, diagnostics);
                 }
             }
         }
@@ -234,14 +235,14 @@ export function validateADCRange(program, boardConstants) {
                 for (const method of cls.methods) {
                     if (method.statements) {
                         for (const stmt of method.statements) {
-                            scanStatementForADCRange(stmt, adcConfig, diagnostics);
+                            scanStatementForADCRange(stmt, adcConfig, program.fileName, diagnostics);
                         }
                     }
                 }
             }
             if (cls.constructor?.statements) {
                 for (const stmt of cls.constructor.statements) {
-                    scanStatementForADCRange(stmt, adcConfig, diagnostics);
+                    scanStatementForADCRange(stmt, adcConfig, program.fileName, diagnostics);
                 }
             }
         }

package/dist/ir/build-ir.js

@@ -144,7 +144,11 @@ export function buildProgramIR(fileName, sourceText, boardPackage, prebuiltClass
     const parentStrategy = getContext().activeStrategy;
     return contextStorage.run(new CompilationContext(), () => {
         getContext().activeStrategy = parentStrategy;
-        loadHALModules(true); // Parse HAL source files (force reload to pick up changes)
+        // Ensure HAL modules are loaded. transpile.ts warms the HAL registry once
+        // per transpile run (before the per-file IR build), so this is normally a
+        // cheap no-op. The non-forced call is a safety net for direct/test callers
+        // of buildProgramIR that didn't warm the registry first.
+        loadHALModules();
         const normalizedSourceText = normalizeEntrypointSyntax(sourceText);
         const source = parseSource(fileName, normalizedSourceText);
         const diagnostics = [];