@hominis/fireforge 0.44.4 → 0.46.0

package/dist/src/commands/export-placement-policy.js

@@ -2,10 +2,8 @@
 /**
  * Policy-aware checks for export placement plans.
  */
+import { formatOrderRange, formatPatchOrder } from '../core/patch-parse.js';
 import { InvalidArgumentError } from '../errors/base.js';
-function reservedRangeLabel(range) {
-    return `${String(range.from).padStart(3, '0')}-${String(range.to).padStart(3, '0')}`;
-}
 function findReservedRange(config, order) {
     return (config.patchPolicy?.reservedRanges?.find((range) => order >= range.from && order <= range.to) ??
         null);
@@ -42,11 +40,11 @@ export function assertPlacementAvoidsReservedRanges(plan, manifestPatches, confi
             (oldOrder !== undefined ? findReservedRange(config, oldOrder) : null);
         if (reserved === null)
             continue;
-        const label = reservedRangeLabel(reserved);
+        const label = formatOrderRange(reserved);
         const freeOrder = firstFreeOrderBelowReservedRange(manifestPatches, reserved);
         if (freeOrder !== null) {
             throw new InvalidArgumentError(`Positional insert would renumber the reserved range ${label}; ` +
-                `pass --order ${String(freeOrder).padStart(3, '0')} (first free order below the ` +
+                `pass --order ${formatPatchOrder(freeOrder)} (first free order below the ` +
                 'reserved block) to place the new patch without renumbering reserved patches.', 'export placement');
         }
         throw new InvalidArgumentError(`Positional insert would renumber the reserved range ${label}; ` +

package/dist/src/commands/export-shared.d.ts

@@ -2,29 +2,43 @@ import type { PatchesManifest, PatchLintIssue } from '../types/commands/index.js
 import type { ExportOptions, PatchCategory } from '../types/commands/index.js';
 import type { FireForgeConfig } from '../types/config.js';
 import type { SpinnerHandle } from '../utils/logger.js';
+export interface RunPatchLintOptions {
+    /** Engine root directory. */
+    engineDir: string;
+    /** Files touched by the patch. */
+    filesAffected: string[];
+    /** Raw unified diff string. */
+    diffContent: string;
+    /** Project configuration. */
+    config: FireForgeConfig;
+    /** If true, downgrade errors to warnings. */
+    skipLint?: boolean | undefined;
+    /** Optional cross-patch context for ownership resolution. */
+    patchQueueCtx?: import('../core/patch-lint-cross.js').PatchQueueContext | undefined;
+    /**
+     * Optional per-patch set of `check` IDs to suppress (threaded from
+     * `PatchMetadata.lintIgnore`). Surgical alternative to `--skip-lint` when
+     * exactly one advisory rule does not apply to a specific patch — e.g.
+     * `large-patch-lines` on a cohesive branding bundle that genuinely cannot
+     * be split.
+     */
+    ignoreChecks?: ReadonlySet<string> | undefined;
+    /**
+     * Optional explicit tier override (threaded from `PatchMetadata.tier`).
+     * Forces the branding-tier thresholds when set, independent of the
+     * auto-detect allowlist. When the branding tier is applied, a single
+     * `info()` line surfaces the choice so the tier decision is visible rather
+     * than silent.
+     */
+    patchTier?: 'branding' | undefined;
+}
 /**
  * Runs the full patch lint pipeline and reports results. Warnings are always
  * displayed. Errors block the export unless skipLint is true.
  *
- * @param engineDir - Engine root directory
- * @param filesAffected - Files touched by the patch
- * @param diffContent - Raw unified diff string
- * @param config - Project configuration
- * @param skipLint - If true, downgrade errors to warnings
- * @param patchQueueCtx - Optional cross-patch context for ownership
- *   resolution
- * @param ignoreChecks - Optional per-patch set of `check` IDs to suppress
- *   (threaded from `PatchMetadata.lintIgnore`). Surgical alternative to
- *   `--skip-lint` when exactly one advisory rule does not apply to a
- *   specific patch — e.g. `large-patch-lines` on a cohesive branding bundle
- *   that genuinely cannot be split.
- * @param patchTier - Optional explicit tier override (threaded from
- *   `PatchMetadata.tier`). Forces the branding-tier thresholds when set,
- *   independent of the auto-detect allowlist. When the branding tier is
- *   applied, a single `info()` line surfaces the choice so the tier decision
- *   is visible rather than silent.
+ * @param options - See {@link RunPatchLintOptions}
  */
-export declare function runPatchLint(engineDir: string, filesAffected: string[], diffContent: string, config: FireForgeConfig, skipLint?: boolean, patchQueueCtx?: import('../core/patch-lint-cross.js').PatchQueueContext, ignoreChecks?: ReadonlySet<string>, patchTier?: 'branding'): Promise<void>;
+export declare function runPatchLint(options: RunPatchLintOptions): Promise<void>;
 /**
  * Prints a patch-lint issue list with `runPatchLint`'s exact severity
  * buckets and skip-lint semantics, throwing on errors unless `skipLint`.
@@ -32,17 +46,22 @@ export declare function runPatchLint(engineDir: string, filesAffected: string[],
  * stored issues through the identical reporter without re-linting.
  */
 export declare function reportPatchLintOutcome(issues: PatchLintIssue[], skipLint?: boolean): void;
+/** Patch identity resolved for an export, from flags or interactive prompts. */
+export interface ExportPatchMetadata {
+    /** Normalized patch name (without order prefix or extension). */
+    patchName: string;
+    /** Category the patch is filed under. */
+    selectedCategory: PatchCategory;
+    /** Human-readable patch description. */
+    description: string;
+}
 /**
  * Resolves patch metadata interactively or from flags, with shared validation.
  * @param options - Export command options
  * @param isInteractive - Whether interactive prompts are allowed
  * @param commandName - Command name for error/help text
  */
-export declare function promptExportPatchMetadata(options: ExportOptions, isInteractive: boolean, commandName: 'export' | 'export-all', config?: FireForgeConfig): Promise<{
-    patchName: string;
-    selectedCategory: PatchCategory;
-    description: string;
-} | null>;
+export declare function promptExportPatchMetadata(options: ExportOptions, isInteractive: boolean, commandName: 'export' | 'export-all', config?: FireForgeConfig): Promise<ExportPatchMetadata | null>;
 /**
  * Confirms whether an export may supersede existing patches.
  * @param patchesDir - Patches directory

package/dist/src/commands/export-shared.js

@@ -15,25 +15,10 @@ import { describePatchNameProblem, normalizePatchDisplayName, PATCH_CATEGORIES,
  * Runs the full patch lint pipeline and reports results. Warnings are always
  * displayed. Errors block the export unless skipLint is true.
  *
- * @param engineDir - Engine root directory
- * @param filesAffected - Files touched by the patch
- * @param diffContent - Raw unified diff string
- * @param config - Project configuration
- * @param skipLint - If true, downgrade errors to warnings
- * @param patchQueueCtx - Optional cross-patch context for ownership
- *   resolution
- * @param ignoreChecks - Optional per-patch set of `check` IDs to suppress
- *   (threaded from `PatchMetadata.lintIgnore`). Surgical alternative to
- *   `--skip-lint` when exactly one advisory rule does not apply to a
- *   specific patch — e.g. `large-patch-lines` on a cohesive branding bundle
- *   that genuinely cannot be split.
- * @param patchTier - Optional explicit tier override (threaded from
- *   `PatchMetadata.tier`). Forces the branding-tier thresholds when set,
- *   independent of the auto-detect allowlist. When the branding tier is
- *   applied, a single `info()` line surfaces the choice so the tier decision
- *   is visible rather than silent.
+ * @param options - See {@link RunPatchLintOptions}
  */
-export async function runPatchLint(engineDir, filesAffected, diffContent, config, skipLint, patchQueueCtx, ignoreChecks, patchTier) {
+export async function runPatchLint(options) {
+    const { engineDir, filesAffected, diffContent, config, skipLint, patchQueueCtx, ignoreChecks, patchTier, } = options;
     // Compute the tier decision independently of the lint pipeline so it can
     // be surfaced even when the rule body emitted no issues — a branding patch
     // under the soft threshold still benefits from operators knowing which
@@ -353,7 +338,7 @@ export async function guardOwnershipOverlap(args) {
         return true;
     s.stop();
     const entries = [...overlap.entries()].sort(([a], [b]) => a.localeCompare(b));
-    warn(`This export would create cross-patch ownership overlap on ${String(entries.length)} file${entries.length === 1 ? '' : 's'}:`);
+    warn(`This export would create cross-patch ownership overlap on ${entries.length} file${entries.length === 1 ? '' : 's'}:`);
     for (const [file, owners] of entries) {
         warn(`  - ${file} already claimed by: ${owners.join(', ')}`);
     }

package/dist/src/commands/export.js

@@ -258,7 +258,16 @@ export async function exportCommand(projectRoot, files, options) {
         const patchQueueCtx = (await pathExists(paths.patches))
             ? await buildPatchQueueContext(paths.patches)
             : undefined;
-        await runPatchLint(paths.engine, filesAffected, diff, config, options.skipLint, patchQueueCtx, exportIgnoreChecks, options.tier);
+        await runPatchLint({
+            engineDir: paths.engine,
+            filesAffected,
+            diffContent: diff,
+            config,
+            skipLint: options.skipLint,
+            patchQueueCtx,
+            ignoreChecks: exportIgnoreChecks,
+            patchTier: options.tier,
+        });
         // Resolve placement (if any flag was given). Placement is mutually
         // exclusive with supersede — the semantics overlap confusingly.
         let placementPlan = null;

package/dist/src/commands/furnace/authoring-config.d.ts

@@ -0,0 +1,13 @@
+import type { FurnaceConfig } from '../../types/index.js';
+/**
+ * Loads `furnace.json` for an authoring command, defaulting to an empty
+ * configuration when the project has none yet.
+ *
+ * `furnace create` and `furnace override` both need this: they are the two
+ * commands that may run before any furnace configuration exists, and both must
+ * treat "no file" as "nothing registered yet" rather than an error. They had a
+ * byte-identical private copy each.
+ * @param projectRoot - Project root to load from.
+ * @returns The parsed configuration, or a fresh default.
+ */
+export declare function loadAuthoringFurnaceConfig(projectRoot: string): Promise<FurnaceConfig>;

package/dist/src/commands/furnace/authoring-config.js

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: EUPL-1.2
+import { createDefaultFurnaceConfig, furnaceConfigExists, loadFurnaceConfig, } from '../../core/furnace-config.js';
+/**
+ * Loads `furnace.json` for an authoring command, defaulting to an empty
+ * configuration when the project has none yet.
+ *
+ * `furnace create` and `furnace override` both need this: they are the two
+ * commands that may run before any furnace configuration exists, and both must
+ * treat "no file" as "nothing registered yet" rather than an error. They had a
+ * byte-identical private copy each.
+ * @param projectRoot - Project root to load from.
+ * @returns The parsed configuration, or a fresh default.
+ */
+export async function loadAuthoringFurnaceConfig(projectRoot) {
+    if (await furnaceConfigExists(projectRoot)) {
+        return loadFurnaceConfig(projectRoot);
+    }
+    return createDefaultFurnaceConfig();
+}

package/dist/src/commands/furnace/chrome-doc-remove.js

@@ -10,7 +10,7 @@ import { loadConfig } from '../../core/config.js';
 import { stdioIsInteractive } from '../../core/destructive.js';
 import { completeJournalRollback, runFurnaceMutation, } from '../../core/furnace-operation.js';
 import { assertFurnaceEngineReady } from '../../core/furnace-precondition.js';
-import { createRollbackJournal, snapshotDir, snapshotFile } from '../../core/furnace-rollback.js';
+import { createRollbackJournal, snapshotDir, snapshotFile, } from '../../core/furnace-rollback.js';
 import { FurnaceError } from '../../errors/furnace.js';
 import { pathExists, readText, removeDir, removeFile, writeText } from '../../utils/fs.js';
 import { cancel, info, intro, isCancel, note, outro } from '../../utils/logger.js';

package/dist/src/commands/furnace/create-browser-test.js

@@ -16,6 +16,7 @@ import { toError } from '../../utils/errors.js';
 import { ensureDir, pathExists, readText, writeText } from '../../utils/fs.js';
 import { info, success, warn } from '../../utils/logger.js';
 import { stripEnginePrefix } from '../../utils/paths.js';
+import { browserTestFileName, deriveTestStem } from './test-file-name.js';
 /**
  * Validates the `--test-dir` option against the resolved test style before
  * any writes. Mochikit lives in the upstream toolkit/content/tests/widgets
@@ -65,15 +66,9 @@ export function resolveTestDirOverride(raw) {
  * the harness will try to run.
  */
 export async function scaffoldTestFiles(componentName, license, forgeConfig, paths, journal, testDirOverride) {
-    const strippedName = componentName.startsWith('moz-') ? componentName.slice(4) : componentName;
-    // Avoid double-prefixing: strip binaryName prefix since the default test
-    // dir name already uses it
     const binaryName = forgeConfig.binaryName;
-    const withoutBinaryPrefix = strippedName.startsWith(binaryName + '-')
-        ? strippedName.slice(binaryName.length + 1)
-        : strippedName;
-    const underscored = withoutBinaryPrefix.replace(/-/g, '_');
-    const testFileName = `browser_${binaryName}_${underscored}.js`;
+    const underscored = deriveTestStem(componentName, binaryName);
+    const testFileName = browserTestFileName(componentName, binaryName);
     // --test-dir redirects the scaffold: the hardcoded
     // `.../test/<binaryName>/` target can collide with a test suite owned by a
     // different patch. The manifest-registration name is the path below

package/dist/src/commands/furnace/create-dry-run.js

@@ -8,6 +8,7 @@
  * independently of the mutation plumbing.
  */
 import { BROWSER_TEST_SCAFFOLD_ROOT, resolveBrowserChromeTestDir, resolveXpcshellTestDir, } from '../../core/furnace-constants.js';
+import { deriveTestStem } from './test-file-name.js';
 /**
  * Builds the test-section fragment of the dry-run plan for a given
  * harness choice. Kept separate from the top-level formatter so the
@@ -18,11 +19,7 @@ function formatTestSection(args) {
     const { testStyle, componentName, binaryName, testDir } = args;
     if (testStyle === 'none')
         return '';
-    const strippedName = componentName.startsWith('moz-') ? componentName.slice(4) : componentName;
-    const withoutBinaryPrefix = strippedName.startsWith(binaryName + '-')
-        ? strippedName.slice(binaryName.length + 1)
-        : strippedName;
-    const underscored = withoutBinaryPrefix.replace(/-/g, '_');
+    const underscored = deriveTestStem(componentName, binaryName);
     if (testStyle === 'browser-chrome') {
         // Same resolver as scaffoldTestFiles: the registration name is the
         // path below browser/base/content/test/, which under --test-dir is

package/dist/src/commands/furnace/create-templates.d.ts

@@ -3,6 +3,22 @@
  * command entrypoint so the generator is unit-testable in isolation and the
  * command file stays under the per-file LOC budget.
  */
+export interface GenerateMjsContentOptions {
+    /** Custom element tag name. */
+    name: string;
+    /** Generated component class name. */
+    className: string;
+    /** Human-readable component description. */
+    description: string;
+    /** Whether to emit the Fluent wiring. */
+    localized: boolean;
+    /** License header prepended to the module. */
+    header: string;
+    /** chrome:// sub-path for the generated FTL reference, when localized. */
+    ftlChromeSubPath: string | undefined;
+    /** Explicit shared FTL path, used verbatim when supplied. */
+    sharedFtl: string | undefined;
+}
 /**
  * Generates the .mjs file content for a custom component.
  *
@@ -23,7 +39,7 @@
  *      matching the locale jar.mn entry that `furnace apply` writes.
  *   3. `<name>.ftl` — fallback when no chrome sub-path was resolvable.
  */
-export declare function generateMjsContent(name: string, className: string, description: string, localized: boolean, header: string, ftlChromeSubPath: string | undefined, sharedFtl: string | undefined): string;
+export declare function generateMjsContent(options: GenerateMjsContentOptions): string;
 /** Generates the .css file content for a custom component. */
 export declare function generateCssContent(header: string): string;
 /** Generates the .ftl file content for a custom component. */

package/dist/src/commands/furnace/create-templates.js

@@ -24,7 +24,8 @@
  *      matching the locale jar.mn entry that `furnace apply` writes.
  *   3. `<name>.ftl` — fallback when no chrome sub-path was resolvable.
  */
-export function generateMjsContent(name, className, description, localized, header, ftlChromeSubPath, sharedFtl) {
+export function generateMjsContent(options) {
+    const { name, className, description, localized, header, ftlChromeSubPath, sharedFtl } = options;
     // A `*/` in the operator-supplied description would close the JSDoc block
     // early and leave the remainder as stray code. Escaped here rather than
     // rejected at input, because the same text is also rendered by

package/dist/src/commands/furnace/create.js

@@ -3,7 +3,7 @@ import { join } from 'node:path';
 import { text } from '@clack/prompts';
 import { getProjectPaths, loadConfig } from '../../core/config.js';
 import { stdioIsInteractive } from '../../core/destructive.js';
-import { createDefaultFurnaceConfig, furnaceConfigExists, getFurnacePaths, loadFurnaceConfig, writeFurnaceConfig, } from '../../core/furnace-config.js';
+import { getFurnacePaths, writeFurnaceConfig } from '../../core/furnace-config.js';
 import { resolveFtlChromeSubPath, tagNameToClassName, WIDGETS_DIR, } from '../../core/furnace-constants.js';
 import { completeJournalRollback, runFurnaceMutation, } from '../../core/furnace-operation.js';
 import { CUSTOM_ELEMENT_TAG_PATTERN, CUSTOM_ELEMENT_TAG_RULES, describeTagNameProblem, } from '../../core/furnace-registration-validate.js';
@@ -15,6 +15,7 @@ import { InvalidArgumentError } from '../../errors/base.js';
 import { FurnaceError } from '../../errors/furnace.js';
 import { ensureDir, pathExists, writeText } from '../../utils/fs.js';
 import { cancel, intro, isCancel, note, outro } from '../../utils/logger.js';
+import { loadAuthoringFurnaceConfig } from './authoring-config.js';
 import { resolveValidatedTestDir, scaffoldTestFiles } from './create-browser-test.js';
 import { formatDryRunPlan, formatSuccessNote } from './create-dry-run.js';
 import { resolveCreateFeatures } from './create-features.js';
@@ -23,12 +24,6 @@ import { assertCustomEntryPersisted } from './create-readback.js';
 import { generateCssContent, generateFtlContent, generateMjsContent } from './create-templates.js';
 import { validateCreateAgainstConfig } from './create-validation.js';
 import { scaffoldXpcshellTestFiles } from './create-xpcshell.js';
-async function loadAuthoringFurnaceConfig(projectRoot) {
-    if (await furnaceConfigExists(projectRoot)) {
-        return loadFurnaceConfig(projectRoot);
-    }
-    return createDefaultFurnaceConfig();
-}
 function knownComponentSet(config) {
     return new Set([
         ...config.stock,
@@ -64,24 +59,25 @@ function validateTagName(name) {
 }
 /**
  * Writes the scaffolded component source files to disk.
- * @param componentDir - Destination component directory
- * @param componentName - Custom element tag name
- * @param className - Generated component class name
- * @param description - Human-readable component description
- * @param localized - Whether to include a Fluent file
- * @param license - Project license used for generated headers
- * @param ftlChromeSubPath - chrome:// sub-path for the generated FTL reference, when localized
- * @param sharedFtl - Explicit shared FTL path from `--shared-ftl`, when supplied
- * @param journal - Optional rollback journal that snapshots files before writes
+ * @param options - See {@link WriteComponentFilesOptions}
  * @returns Relative filenames written for the component
  */
-async function writeComponentFiles(componentDir, componentName, className, description, localized, license, ftlChromeSubPath, sharedFtl, journal) {
+async function writeComponentFiles(options) {
+    const { componentDir, componentName, className, description, localized, license, ftlChromeSubPath, sharedFtl, journal, } = options;
     await ensureDir(componentDir);
     const files = [`${componentName}.mjs`, `${componentName}.css`];
     const mjsPath = join(componentDir, `${componentName}.mjs`);
     if (journal)
         await snapshotFile(journal, mjsPath);
-    const mjsContent = generateMjsContent(componentName, className, description, localized, getLicenseHeader(license, 'js'), ftlChromeSubPath, sharedFtl);
+    const mjsContent = generateMjsContent({
+        name: componentName,
+        className,
+        description,
+        localized,
+        header: getLicenseHeader(license, 'js'),
+        ftlChromeSubPath,
+        sharedFtl,
+    });
     await writeText(mjsPath, mjsContent);
     const cssPath = join(componentDir, `${componentName}.css`);
     if (journal)
@@ -165,7 +161,17 @@ async function performCreateMutations(args) {
         // so signal-driven rollback can clean it up even if writeComponentFiles
         // is interrupted mid-ensureDir.
         recordCreatedDir(journal, args.componentDir);
-        files = await writeComponentFiles(args.componentDir, args.componentName, args.className, args.description, args.localized, args.license, resolveFtlChromeSubPath(freshConfig.ftlBasePath), args.sharedFtl, journal);
+        files = await writeComponentFiles({
+            componentDir: args.componentDir,
+            componentName: args.componentName,
+            className: args.className,
+            description: args.description,
+            localized: args.localized,
+            license: args.license,
+            ftlChromeSubPath: resolveFtlChromeSubPath(freshConfig.ftlBasePath),
+            sharedFtl: args.sharedFtl,
+            journal,
+        });
         const customEntry = {
             description: args.description,
             targetPath: `${WIDGETS_DIR}/${args.componentName}`,

package/dist/src/commands/furnace/deploy.js

@@ -2,7 +2,7 @@
 import { loadConfig } from '../../core/config.js';
 import { applyAllComponents } from '../../core/furnace-apply.js';
 import { logApplyResult } from '../../core/furnace-apply-output.js';
-import { getFurnacePaths, loadFurnaceConfig } from '../../core/furnace-config.js';
+import { getFurnacePaths } from '../../core/furnace-config.js';
 import { reportJsconfigPathsSync } from '../../core/furnace-jsconfig.js';
 import { runFurnaceMutation, waitLockMutationOptions, } from '../../core/furnace-operation.js';
 import { assertFurnaceReady } from '../../core/furnace-precondition.js';
@@ -203,7 +203,16 @@ export async function furnaceDeployCommand(projectRoot, name, options = {}) {
     }
     const validateSpinner = spinner(isDryRun ? 'Validating (read-only)...' : 'Validating...');
     const failedComponents = getFailedComponentNames(result);
-    const validation = await runDeployValidation(validateSpinner, name, config, furnacePaths, failedComponents, isDryRun, projectRoot, result.actions);
+    const validation = await runDeployValidation({
+        validateSpinner,
+        name,
+        config,
+        furnacePaths,
+        failedComponents,
+        isDryRun,
+        projectRoot,
+        dryRunActions: result.actions,
+    });
     if (validation.done)
         return;
     const { totalErrors, totalWarnings, componentCount, skippedValidationCount } = validation;

package/dist/src/commands/furnace/init.js

@@ -13,6 +13,7 @@ import { FurnaceError } from '../../errors/furnace.js';
 import { getNodeErrorCode, toError } from '../../utils/errors.js';
 import { ensureDir, pathExists, writeText } from '../../utils/fs.js';
 import { cancel, info, intro, isCancel, note, outro, success, warn } from '../../utils/logger.js';
+import { normalizePathSlashes } from '../../utils/paths.js';
 /**
  * File extensions that are definitely FTL resources (not locale
  * directories). A value ending in one of these is almost certainly the
@@ -64,7 +65,7 @@ async function validateFtlBasePath(value, engineDir) {
     // Normalize with the POSIX rules regardless of host: `normalize` on Windows
     // emits backslashes, so a `../`-prefix test against the platform `normalize`
     // silently passes every traversal attempt there.
-    const normalized = posix.normalize(value.replace(/\\/g, '/'));
+    const normalized = posix.normalize(normalizePathSlashes(value));
     if (normalized === '..' || normalized.startsWith('../')) {
         throw new FurnaceError(`ftlBasePath "${value}" must not escape the engine checkout via parent-directory segments.`);
     }

package/dist/src/commands/furnace/override.js

@@ -4,7 +4,7 @@ import { dirname, join } from 'node:path';
 import { select, text } from '@clack/prompts';
 import { getProjectPaths, loadConfig, loadState } from '../../core/config.js';
 import { stdioIsInteractive } from '../../core/destructive.js';
-import { createDefaultFurnaceConfig, furnaceConfigExists, getFurnacePaths, loadFurnaceConfig, writeFurnaceConfig, } from '../../core/furnace-config.js';
+import { getFurnacePaths, writeFurnaceConfig } from '../../core/furnace-config.js';
 import { resolveFtlDir } from '../../core/furnace-constants.js';
 import { completeJournalRollback, runFurnaceMutation } from '../../core/furnace-operation.js';
 import { assertFurnaceEngineReady } from '../../core/furnace-precondition.js';
@@ -16,25 +16,14 @@ import { FurnaceError } from '../../errors/furnace.js';
 import { toError } from '../../utils/errors.js';
 import { copyFile, ensureDir, pathExists, writeJson } from '../../utils/fs.js';
 import { cancel, info, intro, isCancel, note, outro, warn } from '../../utils/logger.js';
-async function loadAuthoringFurnaceConfig(projectRoot) {
-    if (await furnaceConfigExists(projectRoot)) {
-        return loadFurnaceConfig(projectRoot);
-    }
-    return createDefaultFurnaceConfig();
-}
+import { loadAuthoringFurnaceConfig } from './authoring-config.js';
 /**
  * Copies the source files needed for a new override into the workspace.
- * @param engineDir - Absolute path to the engine checkout
- * @param srcDir - Original component directory in the engine checkout
- * @param destDir - Destination override directory in the workspace
- * @param componentName - Custom element tag name being overridden
- * @param hasFTL - Whether the component ships a localized `.ftl` file
- * @param overrideType - Requested override mode
- * @param ftlDir - Engine-relative directory the shared `.ftl` deploys into
- * @param journal - Rollback journal every write is recorded in
+ * @param options - See {@link CopyOverrideFilesOptions}
  * @returns Filenames copied into the override directory
  */
-async function copyOverrideFiles(engineDir, srcDir, destDir, componentName, hasFTL, overrideType, ftlDir, journal) {
+async function copyOverrideFiles(options) {
+    const { engineDir, srcDir, destDir, componentName, hasFTL, overrideType, ftlDir, journal } = options;
     await ensureDir(destDir);
     const entries = await readdir(srcDir, { withFileTypes: true });
     const copiedFiles = [];
@@ -93,7 +82,8 @@ async function copyOverrideFiles(engineDir, srcDir, destDir, componentName, hasF
  * cycles into a single surviving entry — otherwise both report success and
  * furnace.json keeps only the second writer's.
  */
-async function saveOverrideConfig(projectRoot, destDir, componentName, overrideType, description, details, firefoxVersion, journal, baseCommit) {
+async function saveOverrideConfig(options) {
+    const { projectRoot, destDir, componentName, overrideType, description, details, firefoxVersion, journal, baseCommit, } = options;
     const overrideJson = {
         type: overrideType,
         description,
@@ -138,9 +128,28 @@ async function performOverrideMutations(args) {
         ctx.registerJournal(journal);
         recordCreatedDir(journal, args.destDir);
         try {
-            const filesCopied = await copyOverrideFiles(args.engineDir, args.srcDir, args.destDir, args.componentName, args.details.hasFTL, args.overrideType, args.ftlDir, journal);
+            const filesCopied = await copyOverrideFiles({
+                engineDir: args.engineDir,
+                srcDir: args.srcDir,
+                destDir: args.destDir,
+                componentName: args.componentName,
+                hasFTL: args.details.hasFTL,
+                overrideType: args.overrideType,
+                ftlDir: args.ftlDir,
+                journal,
+            });
             await snapshotFile(journal, args.furnacePaths.furnaceConfig);
-            await saveOverrideConfig(args.projectRoot, args.destDir, args.componentName, args.overrideType, args.description, args.details, args.firefoxVersion, journal, args.baseCommit);
+            await saveOverrideConfig({
+                projectRoot: args.projectRoot,
+                destDir: args.destDir,
+                componentName: args.componentName,
+                overrideType: args.overrideType,
+                description: args.description,
+                details: args.details,
+                firefoxVersion: args.firefoxVersion,
+                journal,
+                baseCommit: args.baseCommit,
+            });
             return filesCopied;
         }
         catch (error) {

package/dist/src/commands/furnace/refresh.js

@@ -126,7 +126,15 @@ async function refreshSingleOverride(projectRoot, name, options = {}) {
             for (const entry of overrideFiles) {
                 const overridePath = join(overrideDir, entry.name);
                 const engineRelPath = getOverrideEngineTargetPath(paths.engine, overrideConfig, entry.name, ftlDir).slice(paths.engine.length + 1);
-                const result = await refreshOverrideFile(paths.engine, overridePath, engineRelPath, baseCommit, entry.name, dryRun, strategy);
+                const result = await refreshOverrideFile({
+                    engineDir: paths.engine,
+                    overridePath,
+                    engineRelPath,
+                    baseCommit,
+                    fileName: entry.name,
+                    dryRun,
+                    strategy,
+                });
                 fileResults.push(result);
             }
             // Update baseVersion and baseCommit on clean merge (not dry-run, no conflicts)

package/dist/src/commands/furnace/remove-mutations.d.ts

@@ -1,7 +1,6 @@
-import type { loadFurnaceConfig } from '../../core/furnace-config.js';
-import { getFurnacePaths } from '../../core/furnace-config.js';
+import type { FurnacePaths } from '../../core/furnace-config.js';
 import type { RollbackJournal } from '../../core/furnace-rollback.js';
-import type { FurnaceState } from '../../types/furnace.js';
+import type { FurnaceConfig, FurnaceState } from '../../types/furnace.js';
 /**
  * Engine-side and workspace-side removal for an OVERRIDE component.
  *
@@ -14,8 +13,8 @@ export declare function performOverrideRemovalMutations(args: {
     paths: {
         engine: string;
     };
-    furnacePaths: ReturnType<typeof getFurnacePaths>;
-    freshConfig: Awaited<ReturnType<typeof loadFurnaceConfig>>;
+    furnacePaths: FurnacePaths;
+    freshConfig: FurnaceConfig;
     freshState: FurnaceState;
     ftlDir: string;
     journal: RollbackJournal;
@@ -30,8 +29,8 @@ export declare function performCustomRemovalMutations(args: {
     paths: {
         engine: string;
     };
-    furnacePaths: ReturnType<typeof getFurnacePaths>;
-    freshConfig: Awaited<ReturnType<typeof loadFurnaceConfig>>;
+    furnacePaths: FurnacePaths;
+    freshConfig: FurnaceConfig;
     ftlDir: string;
     journal: RollbackJournal;
 }): Promise<void>;

package/dist/src/commands/furnace/remove-mutations.js

@@ -16,7 +16,6 @@ import { join } from 'node:path';
 import { removeCustomFtlJarMnEntry } from '../../core/furnace-apply-ftl.js';
 import { getOverrideEngineTargetPath, isOverrideCopyCandidate, restoreOverrideFileToBaseline, } from '../../core/furnace-apply-helpers.js';
 import { extractComponentChecksums } from '../../core/furnace-checksum-utils.js';
-import { getFurnacePaths } from '../../core/furnace-config.js';
 import { removeCustomElementRegistration, removeJarMnEntries, } from '../../core/furnace-registration.js';
 import { snapshotDir, snapshotFile } from '../../core/furnace-rollback.js';
 import { isGitRepository } from '../../core/git.js';

package/dist/src/commands/furnace/remove.js

@@ -16,6 +16,7 @@ import { pathExists, readText, removeDir, writeText } from '../../utils/fs.js';
 import { cancel, info, intro, isCancel, outro, warn } from '../../utils/logger.js';
 import { performCustomRemovalMutations, performOverrideRemovalMutations, } from './remove-mutations.js';
 import { dropChecksumsByPrefix } from './remove-state.js';
+import { browserTestFileName } from './test-file-name.js';
 /**
  * Removes an entire TOML section (header + body lines) for a given test file.
  * Matches from `["filename"]` up to the next section header `[` or end-of-file,
@@ -94,12 +95,7 @@ async function cleanupCustomTestFiles(name, projectRoot, journal) {
     }
     const paths = getProjectPaths(projectRoot);
     const binaryName = forgeConfig.binaryName;
-    const strippedName = name.startsWith('moz-') ? name.slice(4) : name;
-    const withoutBinaryPrefix = strippedName.startsWith(binaryName + '-')
-        ? strippedName.slice(binaryName.length + 1)
-        : strippedName;
-    const underscored = withoutBinaryPrefix.replace(/-/g, '_');
-    const testFileName = `browser_${binaryName}_${underscored}.js`;
+    const testFileName = browserTestFileName(name, binaryName);
     const testDir = join(paths.engine, 'browser/base/content/test', binaryName);
     if (!(await pathExists(testDir)))
         return { partialFailures };

package/dist/src/commands/furnace/rename-browser-test.js

@@ -1,13 +1,7 @@
 // SPDX-License-Identifier: EUPL-1.2
 import { tagNameToClassName } from '../../core/furnace-constants.js';
 import { escapeRegex } from '../../utils/regex.js';
-function deriveTestStem(componentName, binaryName) {
-    const strippedName = componentName.startsWith('moz-') ? componentName.slice(4) : componentName;
-    const withoutBinaryPrefix = strippedName.startsWith(binaryName + '-')
-        ? strippedName.slice(binaryName.length + 1)
-        : strippedName;
-    return withoutBinaryPrefix.replace(/-/g, '_');
-}
+import { deriveTestStem } from './test-file-name.js';
 /** Rewrites scaffolded browser-chrome test literals after a component rename. */
 export function updateBrowserChromeTestContent(content, oldName, newName, binaryName) {
     const oldClassName = tagNameToClassName(oldName);