@hyperscale0/hsx 2.4.0 → 2.4.1

package/CHANGELOG.md

@@ -7,6 +7,14 @@ follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 The IR format version (`"hsx": 1`, stamped into every compiled document) moves
 independently of the package version.
 
+## [2.4.1] - 2026-09-17
+
+Pairs with UDL 2.6.0.
+
+### Fixed
+
+- `prefix()` resolves declared instrument `id_prefix` from the catalogue or authored program when known to compilation, falling back to derived initials only when undeclared.
+
 ## [2.4.0] - 2026-09-17
 
 Pairs with UDL 2.6.0.

package/dist/src/cli.d.ts

@@ -18,6 +18,6 @@ export interface Io {
     readonly stdin?: NodeJS.ReadableStream;
     readonly stdout?: NodeJS.WritableStream;
 }
-export declare const USAGE_TEXT = "hsx 2.4.0, the HSX compiler\n\nUsage:\n  hsx check <file.hsx> [--catalog <catalog.udl>] [--strict]\n  hsx build <file.hsx> [--catalog <catalog.udl>] [--out <file.json>] [--strict]\n  hsx cost <file.hsx> [--catalog <catalog.udl>] [--json] [--out <file.json>] [--strict]\n  hsx explain <HSX####>\n  hsx format <file.hsx>\n  hsx lsp\n  hsx --version\n  hsx --help\n\nCommands:\n  check   Compile and report diagnostics. Prints nothing when the program is clean.\n  build   Compile and write canonical UDL as JSON.\n  cost    Compile and print the version-pinned cost manifest as a table or JSON.\n  explain Print one diagnostic title, fix, and source example.\n  format  Print the source in the one canonical HSX style.\n  lsp     Run the language server over stdin and stdout.\n\nOptions:\n  --catalog <file>  Read the published instrument catalogue as canonical UDL JSON.\n  --json        Print the cost manifest as JSON instead of a table.\n  --out <file>  Write build or cost JSON to this path instead of stdout.\n  --strict      Treat warning-severity diagnostics as failures.\n\nExit codes:\n  0  the program compiled (verdict valid, or warning without --strict)\n  1  the program was refused (verdict invalid, or warning with --strict)\n  2  the command line or the input file could not be used";
+export declare const USAGE_TEXT = "hsx 2.4.1, the HSX compiler\n\nUsage:\n  hsx check <file.hsx> [--catalog <catalog.udl>] [--strict]\n  hsx build <file.hsx> [--catalog <catalog.udl>] [--out <file.json>] [--strict]\n  hsx cost <file.hsx> [--catalog <catalog.udl>] [--json] [--out <file.json>] [--strict]\n  hsx explain <HSX####>\n  hsx format <file.hsx>\n  hsx lsp\n  hsx --version\n  hsx --help\n\nCommands:\n  check   Compile and report diagnostics. Prints nothing when the program is clean.\n  build   Compile and write canonical UDL as JSON.\n  cost    Compile and print the version-pinned cost manifest as a table or JSON.\n  explain Print one diagnostic title, fix, and source example.\n  format  Print the source in the one canonical HSX style.\n  lsp     Run the language server over stdin and stdout.\n\nOptions:\n  --catalog <file>  Read the published instrument catalogue as canonical UDL JSON.\n  --json        Print the cost manifest as JSON instead of a table.\n  --out <file>  Write build or cost JSON to this path instead of stdout.\n  --strict      Treat warning-severity diagnostics as failures.\n\nExit codes:\n  0  the program compiled (verdict valid, or warning without --strict)\n  1  the program was refused (verdict invalid, or warning with --strict)\n  2  the command line or the input file could not be used";
 export declare function runCli(argv: readonly string[], io: Io): Promise<number>;
 //# sourceMappingURL=cli.d.ts.map

package/dist/src/typecheck.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typecheck.d.ts","sourceRoot":"","sources":["../../src/typecheck.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAaV,OAAO,EAKR,MAAM,UAAU,CAAC;AASlB,OAAO,KAAK,EACV,kBAAkB,EASnB,MAAM,SAAS,CAAC;AAajB,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC;CACzC;AAkCD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,mBAAwB,GAChC,kBAAkB,CA4cpB"}
+{"version":3,"file":"typecheck.d.ts","sourceRoot":"","sources":["../../src/typecheck.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAaV,OAAO,EAKR,MAAM,UAAU,CAAC;AASlB,OAAO,KAAK,EACV,kBAAkB,EASnB,MAAM,SAAS,CAAC;AAajB,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,WAAW,CAAC;CACzC;AAkCD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,mBAAwB,GAChC,kBAAkB,CAufpB"}

package/dist/src/typecheck.js

@@ -139,15 +139,33 @@ export function checkGeneralProgram(program, options = {}) {
         else
             templates.set(decl.name.name, decl);
     }
+    const prefixByInstrument = new Map();
+    if (options.publishedCatalog) {
+        for (const inst of options.publishedCatalog.instruments) {
+            if (inst.idPrefix) {
+                prefixByInstrument.set(inst.id, inst.idPrefix);
+            }
+        }
+    }
+    for (const [name, decl] of templates) {
+        const prefix = stringSlot(decl.body, "idPrefix", "id_prefix") ?? prefixFor(name);
+        prefixByInstrument.set(name, prefix);
+    }
+    for (const decl of program.decls) {
+        if (decl.kind === "instrument_apply" && decl.metadata) {
+            const prefix = stringSlot(decl.metadata, "idPrefix", "id_prefix");
+            if (prefix) {
+                prefixByInstrument.set(decl.name.name, prefix);
+            }
+        }
+    }
+    const resolvePrefix = (target) => prefixByInstrument.get(target);
     const concrete = [];
     const reachedPorts = new Set();
     const droppedPorts = new Set();
     const scopedDeclarations = (declarationScope) => {
         const scopedAliases = new Map(aliases);
-        const scopedConstants = resolveConstants([
-            ...program.decls,
-            ...declarationScope,
-        ]);
+        const scopedConstants = resolveConstants([...program.decls, ...declarationScope], resolvePrefix);
         const scopedParties = new Set(parties);
         const scopedPorts = new Map(ports);
         const scopedTemplates = new Map(templates);
@@ -160,6 +178,9 @@ export function checkGeneralProgram(program, options = {}) {
                 scopedPorts.set(local.name.name, local);
             if (local.kind === "instrument") {
                 scopedTemplates.set(local.name.name, local);
+                const prefix = stringSlot(local.body, "idPrefix", "id_prefix") ??
+                    prefixFor(local.name.name);
+                prefixByInstrument.set(local.name.name, prefix);
             }
         }
         checkPortDeclarations(scopedPorts, scopedParties);
@@ -189,9 +210,15 @@ export function checkGeneralProgram(program, options = {}) {
                 values.set(name, reference);
                 bindPortCompileValues(values, name, reference, scoped.ports, diagnostics, scoped.aliases, shapes, dependencies);
             }
-            const selected = selectCompileTimeRows(decl.body, values, diagnostics, dependencies);
-            const body = expandComprehensions(selected, diagnostics, values, dependencies);
-            concrete.push(...bindActionPorts(constructedInstruments(decl.name, body, diagnostics), scoped.ports, reachedPorts).map((candidate) => ({
+            const selected = selectCompileTimeRows(decl.body, values, diagnostics, dependencies, [], resolvePrefix);
+            const body = expandComprehensions(selected, diagnostics, values, dependencies, resolvePrefix);
+            const constructed = constructedInstruments(decl.name, body, diagnostics, resolvePrefix);
+            for (const candidate of constructed) {
+                const prefix = stringSlot(candidate.body, "idPrefix", "id_prefix") ??
+                    prefixFor(candidate.name.name);
+                prefixByInstrument.set(candidate.name.name, prefix);
+            }
+            concrete.push(...bindActionPorts(constructed, scoped.ports, reachedPorts).map((candidate) => ({
                 ...candidate,
                 aliases: scoped.aliases,
                 callee: candidate.name.name,
@@ -216,13 +243,19 @@ export function checkGeneralProgram(program, options = {}) {
             continue;
         }
         const boundPorts = new Map();
-        const body = instantiate(template, application, diagnostics, decl.name, scoped.ports, scoped.parties, scoped.aliases, scoped.constants, boundPorts);
+        const body = instantiate(template, application, diagnostics, decl.name, scoped.ports, scoped.parties, scoped.aliases, scoped.constants, boundPorts, resolvePrefix);
         if (body) {
             const applicationPorts = new Set();
             const merged = decl.metadata
                 ? mergeApplicationMetadata(body, decl.metadata, diagnostics)
                 : body;
-            concrete.push(...bindActionPorts(constructedInstruments(decl.name, merged, diagnostics), boundPorts, applicationPorts).map((candidate) => {
+            const constructed = constructedInstruments(decl.name, merged, diagnostics, resolvePrefix);
+            for (const candidate of constructed) {
+                const prefix = stringSlot(candidate.body, "idPrefix", "id_prefix") ??
+                    prefixFor(candidate.name.name);
+                prefixByInstrument.set(candidate.name.name, prefix);
+            }
+            concrete.push(...bindActionPorts(constructed, boundPorts, applicationPorts).map((candidate) => {
                 let candidateCallee = callee;
                 if (candidate.name.name !== decl.name.name &&
                     candidate.name.name.startsWith(`${decl.name.name}_`)) {
@@ -252,24 +285,11 @@ export function checkGeneralProgram(program, options = {}) {
     if (options.publishedCatalog) {
         checkPortCaptureTypes(allocated, options.publishedCatalog, aliases, diagnostics);
     }
-    const prefixByInstrument = new Map();
-    if (options.publishedCatalog) {
-        for (const inst of options.publishedCatalog.instruments) {
-            if (inst.idPrefix) {
-                prefixByInstrument.set(inst.id, inst.idPrefix);
-            }
-        }
-    }
-    for (const [name, decl] of templates) {
-        const prefix = stringSlot(decl.body, "idPrefix", "id_prefix") ?? prefixFor(name);
-        prefixByInstrument.set(name, prefix);
-    }
     for (const candidate of allocated) {
         const prefix = stringSlot(candidate.body, "idPrefix", "id_prefix") ??
             prefixFor(candidate.name.name);
         prefixByInstrument.set(candidate.name.name, prefix);
     }
-    const resolvePrefix = (target) => prefixByInstrument.get(target);
     const instruments = [];
     const ids = new Set();
     for (const candidate of allocated) {
@@ -282,7 +302,7 @@ export function checkGeneralProgram(program, options = {}) {
             report("HSX1022", candidate.name.span, `authored instrument ${candidate.name.name} collides with published catalog instrument`, "rename the authored instrument to avoid colliding with the published catalog");
             continue;
         }
-        const expandedBody = expandComprehensions(candidate.body, diagnostics);
+        const expandedBody = expandComprehensions(candidate.body, diagnostics, new Map(), new Map(), resolvePrefix);
         const checked = checkInstrument(candidate.name, expandedBody, candidate.parties, candidate.ports, candidate.aliases, diagnostics, resolvePrefix);
         if (checked)
             instruments.push(checked);
@@ -838,8 +858,8 @@ function bindActionPorts(candidates, bindings, reached) {
         return { ...candidate, body: { ...candidate.body, entries }, ports };
     });
 }
-function constructedInstruments(rootName, body, diagnostics) {
-    const expanded = expandComprehensions(body, diagnostics);
+function constructedInstruments(rootName, body, diagnostics, resolvePrefix) {
+    const expanded = expandComprehensions(body, diagnostics, new Map(), new Map(), resolvePrefix);
     const construction = entry(expanded, "instruments");
     const root = {
         body: {
@@ -984,13 +1004,13 @@ function checkConstants(decls, aliases, diagnostics) {
             validateMoneyLiteral(decl, diagnostics);
     }
 }
-function resolveConstants(decls) {
+function resolveConstants(decls, resolvePrefix) {
     const constants = new Map(decls
         .filter((decl) => decl.kind === "const")
         .map((decl) => [decl.name.name, decl.value]));
     for (let pass = 0; pass < constants.size; pass += 1) {
         for (const [name, value] of constants) {
-            constants.set(name, substituteExpr(value, constants));
+            constants.set(name, substituteExpr(value, constants, resolvePrefix));
         }
     }
     return constants;
@@ -1010,7 +1030,7 @@ function validateMoneyLiteral(decl, diagnostics) {
         span: decl.value.span,
     });
 }
-function instantiate(template, application, diagnostics, instrumentName, ports, parties, aliases, constants, boundPorts) {
+function instantiate(template, application, diagnostics, instrumentName, ports, parties, aliases, constants, boundPorts, resolvePrefix) {
     const loweredPortShapes = new Map();
     const portDependencies = new Map();
     const partyKeyedParameters = partyKeyedBlockParameters(template, aliases);
@@ -1100,7 +1120,7 @@ function instantiate(template, application, diagnostics, instrumentName, ports,
             });
             continue;
         }
-        const expectedExpr = substituteExpr(optionalInner(parameter.type) ?? parameter.type, values);
+        const expectedExpr = substituteExpr(optionalInner(parameter.type) ?? parameter.type, values, resolvePrefix);
         const expected = typeOf(expectedExpr, aliases);
         const actual = typeOf(value, aliases);
         const nonPartyKeys = partyKeyedParameters.get(parameter.name.name);
@@ -1152,7 +1172,7 @@ function instantiate(template, application, diagnostics, instrumentName, ports,
         else if (expected.kind !== "party" && value.kind === "ident") {
             fieldBindings.set(parameter.name.name, {
                 name: value,
-                type: substituteExpr(optionalInner(parameter.type) ?? parameter.type, values),
+                type: substituteExpr(optionalInner(parameter.type) ?? parameter.type, values, resolvePrefix),
             });
             values.set(parameter.name.name, value);
         }
@@ -1165,11 +1185,11 @@ function instantiate(template, application, diagnostics, instrumentName, ports,
             const port = ports.get(value.name.name);
             if (port)
                 boundPorts.set(parameter.name.name, port);
-            bindPortCompileValues(values, parameter.name.name, value, ports, diagnostics, aliases, loweredPortShapes, portDependencies);
+            bindPortCompileValues(values, parameter.name.name, value, ports, diagnostics, aliases, loweredPortShapes, portDependencies, resolvePrefix);
         }
     }
     checkClaimAmountPortField(resolvedArgs, ports, aliases, diagnostics);
-    const selected = selectCompileTimeRows(template.body, values, diagnostics, portDependencies);
+    const selected = selectCompileTimeRows(template.body, values, diagnostics, portDependencies, [], resolvePrefix);
     const dependencyDiagnosticStart = diagnostics.length;
     for (const [name, parameter] of missingOptional) {
         if (!referencesIdentifier(selected, name, values))
@@ -1187,7 +1207,7 @@ function instantiate(template, application, diagnostics, instrumentName, ports,
     }
     if (diagnostics.length > dependencyDiagnosticStart)
         return undefined;
-    const body = expandComprehensions(selected, diagnostics, values, portDependencies);
+    const body = expandComprehensions(selected, diagnostics, values, portDependencies, resolvePrefix);
     const binding = {
         key: { kind: "ident", name: "template_binding", span: application.span },
         qualifiers: [],
@@ -1426,7 +1446,7 @@ function shapeTypeText(expr) {
     }
     return nameText(expr);
 }
-function lowerPortShapeField(port, row, aliases, diagnostics) {
+function lowerPortShapeField(port, row, aliases, diagnostics, resolvePrefix) {
     const type = typeOf(row.value, aliases);
     if (![
         "text",
@@ -1464,7 +1484,7 @@ function lowerPortShapeField(port, row, aliases, diagnostics) {
         extras.max_length = 180;
         extras.min_length = 1;
         if (type.target)
-            extras.pattern = `^${prefixFor(type.target)}_(sandbox|live)_[a-z0-9]{8,64}$`;
+            extras.pattern = `^${resolvePrefix?.(type.target) ?? prefixFor(type.target)}_(sandbox|live)_[a-z0-9]{8,64}$`;
     }
     else if (type.kind === "account") {
         extras.pattern = ACCOUNT_PATTERN;
@@ -1522,7 +1542,7 @@ function lowerPortShapeField(port, row, aliases, diagnostics) {
         },
     };
 }
-function lowerPortShape(port, rawShape, aliases, diagnostics) {
+function lowerPortShape(port, rawShape, aliases, diagnostics, resolvePrefix) {
     if (rawShape.kind !== "block") {
         diagnostics.push({
             code: "HSX1025",
@@ -1547,7 +1567,7 @@ function lowerPortShape(port, rawShape, aliases, diagnostics) {
             continue;
         }
         names.add(row.key.name);
-        const lowered = lowerPortShapeField(port, row, aliases, diagnostics);
+        const lowered = lowerPortShapeField(port, row, aliases, diagnostics, resolvePrefix);
         if (lowered)
             entries.push(lowered);
     }
@@ -1631,7 +1651,7 @@ function checkClaimAmountPortField(resolvedArgs, ports, aliases, diagnostics) {
         }
     }
 }
-function bindPortCompileValues(values, binding, value, ports, diagnostics, aliases = new Map(), loweredPortShapes = new Map(), dependencies = new Map()) {
+function bindPortCompileValues(values, binding, value, ports, diagnostics, aliases = new Map(), loweredPortShapes = new Map(), dependencies = new Map(), resolvePrefix) {
     const port = ports.get(value.name.name);
     if (!port) {
         diagnostics.push({
@@ -1655,7 +1675,7 @@ function bindPortCompileValues(values, binding, value, ports, diagnostics, alias
             span: port.body.span,
         };
         const shapeDiagnostics = [];
-        shape = lowerPortShape(port, rawShape, aliases, shapeDiagnostics);
+        shape = lowerPortShape(port, rawShape, aliases, shapeDiagnostics, resolvePrefix);
         for (const diagnostic of shapeDiagnostics) {
             if (!diagnostics.some((prior) => prior.code === diagnostic.code &&
                 prior.span === diagnostic.span &&
@@ -1679,7 +1699,7 @@ function bindPortCompileValues(values, binding, value, ports, diagnostics, alias
     if (value.deadline)
         values.set(`${binding}_deadline`, value.deadline);
 }
-function substituteExpr(expr, values) {
+function substituteExpr(expr, values, resolvePrefix) {
     if (expr.kind === "ident") {
         return values.get(expr.name) ?? substituteName(expr, values);
     }
@@ -1717,7 +1737,7 @@ function substituteExpr(expr, values) {
                         ? {
                             iteration: {
                                 ...entry.iteration,
-                                bound: substituteExpr(entry.iteration.bound, values),
+                                bound: substituteExpr(entry.iteration.bound, values, resolvePrefix),
                             },
                         }
                         : {}),
@@ -1734,7 +1754,7 @@ function substituteExpr(expr, values) {
                             ? nameFromValue(qualifier, value)
                             : substituteName(qualifier, nestedValues);
                     }),
-                    value: substituteExpr(entry.value, nestedValues),
+                    value: substituteExpr(entry.value, nestedValues, resolvePrefix),
                 };
             }),
         };
@@ -1742,20 +1762,20 @@ function substituteExpr(expr, values) {
     if (expr.kind === "list") {
         return {
             ...expr,
-            items: expr.items.map((item) => substituteExpr(item, values)),
+            items: expr.items.map((item) => substituteExpr(item, values, resolvePrefix)),
         };
     }
     if (expr.kind === "type_apply") {
         return {
             ...expr,
-            args: expr.args.map((arg) => substituteExpr(arg, values)),
+            args: expr.args.map((arg) => substituteExpr(arg, values, resolvePrefix)),
         };
     }
     if (expr.kind === "call") {
         const hasUnbound = expr.args.some((arg) => hasUnboundCompileIdentifier(arg, values));
         const substituted = {
             ...expr,
-            args: expr.args.map((arg) => substituteCompileArgument(arg, values)),
+            args: expr.args.map((arg) => substituteCompileArgument(arg, values, resolvePrefix)),
         };
         const structural = new Set([
             "at",
@@ -1764,30 +1784,35 @@ function substituteExpr(expr, values) {
             "keys_except",
             "kind",
             "len",
+            "prefix",
             "values",
         ]).has(expr.callee.name);
         return hasUnbound && !structural
             ? substituted
-            : (evaluateCompileTimeCall(substituted, !hasUnbound) ?? substituted);
+            : (evaluateCompileTimeCall(substituted, !hasUnbound, resolvePrefix) ??
+                substituted);
     }
     if (expr.kind === "apply") {
         return {
             ...expr,
-            args: expr.args.map((arg) => substituteExpr(arg, values)),
-            typeArgs: expr.typeArgs.map((arg) => substituteExpr(arg, values)),
+            args: expr.args.map((arg) => substituteExpr(arg, values, resolvePrefix)),
+            typeArgs: expr.typeArgs.map((arg) => substituteExpr(arg, values, resolvePrefix)),
         };
     }
     if (expr.kind === "binding") {
-        return { ...expr, type: substituteExpr(expr.type, values) };
+        return { ...expr, type: substituteExpr(expr.type, values, resolvePrefix) };
     }
     if (expr.kind === "decided_amount") {
-        return { ...expr, body: substituteExpr(expr.body, values) };
+        return {
+            ...expr,
+            body: substituteExpr(expr.body, values, resolvePrefix),
+        };
     }
     return expr;
 }
-function substituteCompileArgument(expr, values) {
+function substituteCompileArgument(expr, values, resolvePrefix) {
     if (expr.kind !== "ident")
-        return substituteExpr(expr, values);
+        return substituteExpr(expr, values, resolvePrefix);
     const value = values.get(expr.name);
     if (!value)
         return expr;
@@ -1920,7 +1945,7 @@ function expressionPorts(value, dependencies) {
     }
     return [...found];
 }
-function selectCompileTimeRows(block, values, diagnostics, dependencies = new Map(), controls = []) {
+function selectCompileTimeRows(block, values, diagnostics, dependencies = new Map(), controls = [], resolvePrefix) {
     const entries = [];
     const locals = new Map(values);
     const localDependencies = new Map(dependencies);
@@ -1929,13 +1954,13 @@ function selectCompileTimeRows(block, values, diagnostics, dependencies = new Ma
             const binding = row.qualifiers[0];
             if (binding) {
                 localDependencies.set(binding.name, expressionPorts(row.value, localDependencies));
-                locals.set(binding.name, substituteExpr(row.value, locals));
+                locals.set(binding.name, substituteExpr(row.value, locals, resolvePrefix));
             }
             entries.push(row);
             continue;
         }
         if (row.key.name === "unsupported") {
-            const value = substituteExpr(row.value, locals);
+            const value = substituteExpr(row.value, locals, resolvePrefix);
             if (value.kind !== "block") {
                 diagnostics.push({
                     code: "HSX1405",
@@ -1965,7 +1990,7 @@ function selectCompileTimeRows(block, values, diagnostics, dependencies = new Ma
             row.key.name !== "when_not" &&
             row.key.name !== "when_eq") {
             const value = row.value.kind === "block" && !row.iteration
-                ? selectCompileTimeRows(row.value, locals, diagnostics, localDependencies, controls)
+                ? selectCompileTimeRows(row.value, locals, diagnostics, localDependencies, controls, resolvePrefix)
                 : row.value;
             const conditionPorts = row.key.name === "action"
                 ? [
@@ -2022,7 +2047,7 @@ function selectCompileTimeRows(block, values, diagnostics, dependencies = new Ma
                     ...controls,
                     ...(subject ? expressionPorts(subject, localDependencies) : []),
                 ]),
-            ]).entries);
+            ], resolvePrefix).entries);
         }
     }
     return { ...block, entries };
@@ -2042,7 +2067,7 @@ function compileTimeTruthy(value) {
         return value.entries.length > 0;
     return true;
 }
-function evaluateCompileTimeCall(expr, resolveMissing = true) {
+function evaluateCompileTimeCall(expr, resolveMissing = true, resolvePrefix) {
     const [first, second, third, fourth] = expr.args;
     const number = (value) => {
         if (value?.kind === "percent")
@@ -2226,7 +2251,9 @@ function evaluateCompileTimeCall(expr, resolveMissing = true) {
         case "words":
             return first ? text(nameText(first).replaceAll("_", " ")) : undefined;
         case "prefix":
-            return first ? text(prefixFor(nameText(first))) : undefined;
+            return first
+                ? text(resolvePrefix?.(nameText(first)) ?? prefixFor(nameText(first)))
+                : undefined;
         case "owner":
             return first?.kind === "settlement_ref"
                 ? text(first.owner.name)
@@ -2293,7 +2320,7 @@ function nameText(value) {
         return `${value.owner.name}.${value.member.name}`;
     return "invalid_compile_time_name";
 }
-function expandComprehensions(block, diagnostics, values = new Map(), dependencies = new Map()) {
+function expandComprehensions(block, diagnostics, values = new Map(), dependencies = new Map(), resolvePrefix) {
     const budget = { used: 0 };
     const expand = (current, inherited = new Map(), inheritedDependencies = dependencies) => {
         const entries = [];
@@ -2313,7 +2340,7 @@ function expandComprehensions(block, diagnostics, values = new Map(), dependenci
                     continue;
                 }
                 localDependencies.set(binding.name, expressionPorts(row.value, localDependencies));
-                locals.set(binding.name, substituteExpr(row.value, locals));
+                locals.set(binding.name, substituteExpr(row.value, locals, resolvePrefix));
                 continue;
             }
             if (row.key.name === "when" ||
@@ -2348,7 +2375,7 @@ function expandComprehensions(block, diagnostics, values = new Map(), dependenci
                             ? nameFromValue(qualifier, value)
                             : substituteName(qualifier, locals);
                     }),
-                    value: substituteExpr(row.value, locals),
+                    value: substituteExpr(row.value, locals, resolvePrefix),
                 };
                 entries.push({
                     ...substituted,
@@ -2360,8 +2387,8 @@ function expandComprehensions(block, diagnostics, values = new Map(), dependenci
             }
             if (row.value.kind !== "block")
                 continue;
-            const bound = substituteExpr(row.iteration.bound, locals);
-            const values = finiteIterationValues(bound);
+            const bound = substituteExpr(row.iteration.bound, locals, resolvePrefix);
+            const values = finiteIterationValues(bound, resolvePrefix);
             if (!values) {
                 diagnostics.push({
                     code: "HSX1403",
@@ -2388,7 +2415,7 @@ function expandComprehensions(block, diagnostics, values = new Map(), dependenci
                     ...locals,
                     [row.iteration.binding.name, value],
                 ]);
-                const body = selectCompileTimeRows(row.value, substitutions, diagnostics, localDependencies, row.conditionPorts);
+                const body = selectCompileTimeRows(row.value, substitutions, diagnostics, localDependencies, row.conditionPorts, resolvePrefix);
                 entries.push(...expand(body, substitutions, localDependencies).entries);
             }
         }
@@ -2396,10 +2423,12 @@ function expandComprehensions(block, diagnostics, values = new Map(), dependenci
     };
     return expand(block, values);
 }
-function finiteIterationValues(bound) {
+function finiteIterationValues(bound, resolvePrefix) {
     if (bound.kind === "call") {
-        const evaluated = evaluateCompileTimeCall(bound);
-        return evaluated ? finiteIterationValues(evaluated) : undefined;
+        const evaluated = evaluateCompileTimeCall(bound, true, resolvePrefix);
+        return evaluated
+            ? finiteIterationValues(evaluated, resolvePrefix)
+            : undefined;
     }
     if (bound.kind === "list")
         return bound.items;
@@ -2609,7 +2638,7 @@ function checkInstrument(name, body, parties, ports, aliases, diagnostics, resol
         if (!actionName || candidate.value.kind !== "block")
             return [];
         return [
-            checkAction(actionName, candidate.value, fields, name.name, endpointFields, holdDestinations, diagnostics),
+            checkAction(actionName, candidate.value, fields, name.name, endpointFields, holdDestinations, diagnostics, resolvePrefix),
         ];
     })
         .map((action) => {
@@ -2888,7 +2917,7 @@ function lowerField(row, aliases, diagnostics, resolvePrefix) {
         extra = blockToObject({
             ...row.value,
             entries: row.value.entries.filter((item) => !["type", "description", "desc", "optional", "allow_zero"].includes(item.key.name)),
-        }, new Map(), diagnostics);
+        }, new Map(), diagnostics, false, resolvePrefix);
     }
     const type = typeOf(typeExpr, aliases);
     // Diagnostics point at the field's own type expression, not at an alias
@@ -3030,7 +3059,7 @@ function checkLifecycle(instrument, block, actions, diagnostics) {
     }
     return { parked, value: { initial, states, transitions } };
 }
-function checkAction(name, body, fields, instrumentId, endpointFields, holdDestinations, diagnostics) {
+function checkAction(name, body, fields, instrumentId, endpointFields, holdDestinations, diagnostics, resolvePrefix) {
     const slots = {};
     let omitsPublicAction = false;
     const fieldNames = new Set(fields.map((field) => field.name));
@@ -3076,7 +3105,7 @@ function checkAction(name, body, fields, instrumentId, endpointFields, holdDesti
                     });
                 }
             }
-            const rawValue = exprToJsonForUdlSlot(row.value, definition.target, diagnostics);
+            const rawValue = exprToJsonForUdlSlot(row.value, definition.target, diagnostics, resolvePrefix);
             const moveOffset = Array.isArray(slots.moves) ? slots.moves.length : 0;
             const value = definition.target === "moves"
                 ? normalizeMoves(rawValue, name.name, instrumentId, fields, endpointFields, holdDestinations, diagnostics, row.span, moveOffset)
@@ -3788,12 +3817,12 @@ function stringSlot(block, ...names) {
         return found.name;
     return undefined;
 }
-function blockToObject(block, substitutions, diagnostics, literalKeys = false) {
+function blockToObject(block, substitutions, diagnostics, literalKeys = false, resolvePrefix) {
     if (!block)
         return {};
     const result = {};
     for (const row of block.entries) {
-        const value = substituteExpr(row.value, substitutions);
+        const value = substituteExpr(row.value, substitutions, resolvePrefix);
         if (twoArgumentMoneyCall(value)) {
             diagnostics.push({
                 code: "HSX1104",
@@ -3805,11 +3834,11 @@ function blockToObject(block, substitutions, diagnostics, literalKeys = false) {
             continue;
         }
         result[literalKeys || row.key.quoted ? row.key.name : camel(row.key.name)] =
-            exprToJson(value, diagnostics, literalKeys);
+            exprToJson(value, diagnostics, literalKeys, resolvePrefix);
     }
     return result;
 }
-function exprToJsonForUdlSlot(expr, slot, diagnostics) {
+function exprToJsonForUdlSlot(expr, slot, diagnostics, resolvePrefix) {
     if (twoArgumentMoneyCall(expr)) {
         diagnostics.push({
             code: "HSX1104",
@@ -3822,16 +3851,16 @@ function exprToJsonForUdlSlot(expr, slot, diagnostics) {
     if (slot === "callerParkedStates" && expr.kind === "block") {
         return Object.fromEntries(expr.entries.map((row) => [
             row.key.name,
-            exprToJson(row.value, diagnostics),
+            exprToJson(row.value, diagnostics, false, resolvePrefix),
         ]));
     }
     // Declaration maps retain their authored keys; field-spelling aliases still normalize.
     const literalKeys = udlClauseVocabulary.some((clause) => clause.target === slot &&
         "literalKeys" in clause &&
         clause.literalKeys === true);
-    return exprToJson(expr, diagnostics, literalKeys);
+    return exprToJson(expr, diagnostics, literalKeys, resolvePrefix);
 }
-function exprToJson(expr, diagnostics, literalKeys = false) {
+function exprToJson(expr, diagnostics, literalKeys = false, resolvePrefix) {
     switch (expr.kind) {
         case "boolean":
             return expr.value;
@@ -3873,17 +3902,17 @@ function exprToJson(expr, diagnostics, literalKeys = false) {
         case "settlement_ref":
             return `${expr.owner.name}.${expr.member.name}`;
         case "list":
-            return expr.items.map((item) => exprToJson(item, diagnostics, literalKeys));
+            return expr.items.map((item) => exprToJson(item, diagnostics, literalKeys, resolvePrefix));
         case "block":
-            return blockToObject(expr, new Map(), diagnostics, literalKeys);
+            return blockToObject(expr, new Map(), diagnostics, literalKeys, resolvePrefix);
         case "call":
-            return `${expr.callee.name}(${expr.args.map((arg) => String(exprToJson(arg, diagnostics))).join(",")})`;
+            return `${expr.callee.name}(${expr.args.map((arg) => String(exprToJson(arg, diagnostics, false, resolvePrefix))).join(",")})`;
         case "type_apply":
-            return `${expr.callee.name}<${expr.args.map((arg) => String(exprToJson(arg, diagnostics))).join(",")}>`;
+            return `${expr.callee.name}<${expr.args.map((arg) => String(exprToJson(arg, diagnostics, false, resolvePrefix))).join(",")}>`;
         case "binding":
-            return exprToJson(expr.type, diagnostics);
+            return exprToJson(expr.type, diagnostics, false, resolvePrefix);
         case "decided_amount":
-            return blockToObject(expr.body, new Map(), diagnostics);
+            return blockToObject(expr.body, new Map(), diagnostics, false, resolvePrefix);
         case "port_ref":
             return expr.name.name;
         case "apply":