@hominis/fireforge 0.45.0 → 0.46.1

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 };
@@ -222,7 +218,7 @@ async function cleanupCustomMochikitTestFiles(name, projectRoot, journal) {
  * leaves an operator who ran `furnace create --with-tests --xpcshell`
  * followed by `furnace remove` with orphan `xpcshell.toml` +
  * `test_<name>_packaged.js` files still referencing the removed component.
- * This pass mirrors the mochitest one — snapshot before removal,
+ * This pass mirrors the mochitest one: snapshot before removal,
  * warn-and-continue semantics, explicit summary on partial failures.
  */
 async function cleanupCustomXpcshellTestFiles(name, projectRoot, journal) {
@@ -311,7 +307,7 @@ async function confirmFurnaceRemove(name, type, options, isInteractive) {
 }
 /**
  * Enforces the engine-as-git precondition for both override and custom
- * removals. Runs BEFORE the lock is acquired or a journal is registered so
+ * removals. Runs before the lock is acquired or a journal is registered so
  * the failure path does not involve any rollback infrastructure.
  */
 async function requireGitEngineForRemove(type, name, engineDir) {

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);
@@ -16,7 +10,7 @@ export function updateBrowserChromeTestContent(content, oldName, newName, binary
     const newUnderscored = newName.replace(/-/g, '_');
     const oldTestStem = deriveTestStem(oldName, binaryName);
     const newTestStem = deriveTestStem(newName, binaryName);
-    // ONE pass over the content, not four chained `.replace()` calls.
+    // One pass over the content, instead of four chained `.replace()` calls.
     //
     // Chaining let each rule see the previous rule's output. Renaming
     // `acme-widget` to `acme-widget-v2` rewrote `test_acme_widget_defined` to
@@ -29,12 +23,12 @@ export function updateBrowserChromeTestContent(content, oldName, newName, binary
     // alternative that matches at a given position.
     const alternatives = [
         // The stem is a short bare fragment (`moz-` and binary prefixes stripped,
-        // hyphens underscored) — `panel` for `moz-panel`. Matching it loose, even
+        // hyphens underscored), so `panel` for `moz-panel`. Matching it loose, even
         // with hyphen guards, rewrote unrelated underscore-delimited identifiers
         // such as `test_panel_group_integration`, because `_` must stay a legal
         // neighbour for the generated name to match at all. The scaffold emits the
         // stem in exactly one shape, so anchor to that shape instead of guessing
-        // from boundaries — with its own guards, so the anchored shape cannot
+        // from boundaries. The anchored shape carries its own guards so it cannot
         // match inside a longer identifier (`mytest_panel_defined_extra`).
         {
             pattern: `(?<![\\w-])test_${escapeRegex(oldTestStem)}_defined(?![\\w-])`,
@@ -43,10 +37,10 @@ export function updateBrowserChromeTestContent(content, oldName, newName, binary
         // Word-boundary-aware, matching `furnace/rename.ts` and
         // `rename-xpcshell.ts`: without the guards a rename of `moz-panel` rewrote
         // `moz-panel-group`. `_` stays a legal neighbour for the underscored form
-        // because it is deliberately embedded in generated identifiers; `-` does
+        // because it is embedded in generated identifiers on purpose. `-` is
         // not.
         //
-        // Skipped when the underscored form IS the tag name (a hyphen-less
+        // Skipped when the underscored form is the tag name (a hyphen-less
         // component): both rules then match the same text and this one would win
         // on order, substituting `newUnderscored` where the tag `newName` was
         // meant. The stem rule still covers the one generated identifier shape.
@@ -61,9 +55,10 @@ export function updateBrowserChromeTestContent(content, oldName, newName, binary
         { pattern: `(?<![\\w-])${escapeRegex(oldName)}(?![\\w-])`, to: newName },
         { pattern: `\\b${escapeRegex(oldClassName)}\\b`, to: newClassName },
     ];
-    // Each alternative is its own capture group and the replacement is picked by
-    // the group that matched — not by matched TEXT, which is ambiguous whenever
-    // two rules can produce the same match with different substitutions.
+    // Each alternative is its own capture group and the replacement is picked
+    // by the group that matched, rather than by the matched text, which is
+    // ambiguous whenever two rules can produce the same match with different
+    // substitutions.
     const combined = new RegExp(alternatives.map(({ pattern }) => `(${pattern})`).join('|'), 'g');
     return content.replace(combined, (matched, ...args) => {
         const groups = args.slice(0, alternatives.length);

package/dist/src/commands/furnace/rename-xpcshell.d.ts

@@ -8,7 +8,7 @@
  * so word-boundary occurrences of the old tag / underscored name map to the
  * new ones.
  *
- * Extracted to keep `rename.ts` under the per-file LOC budget — it already
+ * Extracted to keep `rename.ts` under the per-file LOC budget. It already
  * carries mochikit + browser-mochitest + FTL handling.
  */
 import { type RollbackJournal } from '../../core/furnace-rollback.js';
@@ -19,7 +19,7 @@ import { type RollbackJournal } from '../../core/furnace-rollback.js';
  * old tag / old underscored name inside the test body.
  *
  * Best-effort: any failure logs a warning through the shared logger
- * but never throws — the component rename itself has already succeeded
+ * but never throws. The component rename itself has already succeeded
  * at this point, and blocking on a test rewrite would leave the
  * operator with a half-renamed component.
  *

package/dist/src/commands/furnace/rename-xpcshell.js

@@ -9,7 +9,7 @@
  * so word-boundary occurrences of the old tag / underscored name map to the
  * new ones.
  *
- * Extracted to keep `rename.ts` under the per-file LOC budget — it already
+ * Extracted to keep `rename.ts` under the per-file LOC budget. It already
  * carries mochikit + browser-mochitest + FTL handling.
  */
 import { readdir } from 'node:fs/promises';
@@ -28,7 +28,7 @@ import { escapeRegex } from '../../utils/regex.js';
  * old tag / old underscored name inside the test body.
  *
  * Best-effort: any failure logs a warning through the shared logger
- * but never throws — the component rename itself has already succeeded
+ * but never throws. The component rename itself has already succeeded
  * at this point, and blocking on a test rewrite would leave the
  * operator with a half-renamed component.
  *
@@ -59,7 +59,7 @@ export async function renameXpcshellTestFiles(engineDir, projectRoot, oldName, n
     const newTestFileName = `test_${newUnderscored}_packaged.js`;
     try {
         // Journal the new scaffold dir + files so rollback (including the
-        // SIGINT path) removes them; only the old-name files were journaled
+        // SIGINT path) removes them. Only the old-name files were journaled
         // before, so a failed rename stranded the new-name scaffold.
         recordCreatedDir(journal, newScaffoldDir);
         await ensureDir(newScaffoldDir);

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

@@ -18,18 +18,7 @@ import { escapeRegex } from '../../utils/regex.js';
 import { updateBrowserChromeTestContent } from './rename-browser-test.js';
 import { rekeyStateChecksums, renameComponentFileName, updateConfigForCustomRename, updateConfigForOverrideRename, } from './rename-helpers.js';
 import { renameXpcshellTestFiles } from './rename-xpcshell.js';
-/**
- * Derives the test file name for a component, matching the convention used by
- * `furnace create --with-tests`.
- */
-function deriveTestFileName(componentName, binaryName) {
-    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, '_');
-    return `browser_${binaryName}_${underscored}.js`;
-}
+import { browserTestFileName } from './test-file-name.js';
 /**
  * Renames test files created by `furnace create --with-tests` in the engine
  * test directory. Best-effort: failures are logged as warnings but do not
@@ -44,8 +33,8 @@ async function renameTestFiles(engineDir, projectRoot, oldName, newName, journal
         return; // Cannot determine test paths without config.
     }
     const binaryName = forgeConfig.binaryName;
-    const oldTestFileName = deriveTestFileName(oldName, binaryName);
-    const newTestFileName = deriveTestFileName(newName, binaryName);
+    const oldTestFileName = browserTestFileName(oldName, binaryName);
+    const newTestFileName = browserTestFileName(newName, binaryName);
     const testDir = join(engineDir, 'browser/base/content/test', binaryName);
     if (!(await pathExists(testDir)))
         return;
@@ -88,7 +77,7 @@ async function renameTestFiles(engineDir, projectRoot, oldName, newName, journal
  * deployment. Best-effort: logs a warning but never blocks the rename.
  *
  * Without it, a rename registers and deploys the new name correctly but
- * leaves `engine/toolkit/content/widgets/<old>/` in place — subsequent
+ * leaves `engine/toolkit/content/widgets/<old>/` in place: subsequent
  * `furnace sync` runs cannot clear the stale widget, and packaging pulls in
  * both copies. The snapshot is taken before the remove so the rollback
  * journal restores the old directory if any later step in
@@ -114,7 +103,7 @@ async function removeStaleDeployedComponentDir(engineDir, oldTargetPath, journal
  * accompanying `chrome.toml` entry names the same file. Leaving both
  * unhandled produces a `test_<old>.html` that still imports
  * `chrome://global/content/elements/<old>.mjs` and references
- * `customElements.whenDefined("<old>")` — running against a component that
+ * `customElements.whenDefined("<old>")`, running against a component that
  * no longer exists under that name, and either failing or (if the old
  * component is still deployed) passing for the wrong reason.
  *
@@ -150,7 +139,7 @@ async function renameMochikitTestFiles(engineDir, oldName, newName, journal) {
         }
     }
     // Update `chrome.toml` entry if present. The file may live in the
-    // same widgets/tests directory as the test file itself; upstream
+    // same widgets/tests directory as the test file itself. Upstream
     // convention places exactly one `chrome.toml` there for all widget
     // scaffolds.
     const chromeTomlPath = join(testDir, 'chrome.toml');
@@ -206,9 +195,9 @@ async function performRenameMutations(args) {
             }
             await snapshotDir(journal, oldDir);
             await snapshotFile(journal, args.furnaceConfigPath);
-            // Journal the state file BEFORE step 4 re-keys its checksums, plus
+            // Journal the state file before step 4 re-keys its checksums, plus
             // the new dir and every new-name destination below (a snapshot of a
-            // missing path records {existed: false} → rollback DELETES it).
+            // missing path records {existed: false}, so rollback deletes it).
             // Without these, a failed or SIGINT'd rename stranded the new-name
             // scaffold and kept re-keyed state for a nonexistent component.
             await snapshotFile(journal, getFurnacePaths(projectRoot).furnaceState);
@@ -220,7 +209,7 @@ async function performRenameMutations(args) {
                 if (!entry.isFile())
                     continue;
                 const oldFileName = entry.name;
-                // Rename only when the filename starts with the component name — the
+                // Rename only when the filename starts with the component name. The
                 // scaffolding convention for both create and override is
                 // `${name}.ext`. A plain `replace(oldName, newName)` produces wrong
                 // results when the old name occurs more than once (`foo-foo.mjs`
@@ -259,7 +248,15 @@ async function performRenameMutations(args) {
             if (isCustom && config.custom[newName]?.register && (await pathExists(args.engineDir))) {
                 const ftlDir = resolveFtlDir(config.ftlBasePath);
                 const isLocalized = config.custom[newName].localized;
-                await updateEngineRegistrations(args.engineDir, oldName, newName, newDir, ftlDir, isLocalized, journal);
+                await updateEngineRegistrations({
+                    engineDir: args.engineDir,
+                    oldName,
+                    newName,
+                    newDir,
+                    ftlDir,
+                    isLocalized,
+                    journal,
+                });
             }
             // 4. Re-key furnace-state.json checksums from old name to new name
             await rekeyStateChecksums(args.projectRoot, componentType, oldName, newName);
@@ -279,7 +276,7 @@ async function performRenameMutations(args) {
                 await renameTestFiles(args.engineDir, projectRoot, oldName, newName, journal);
                 // The mochikit scaffold and widgets/chrome.toml live in a different
                 // tree than browser.toml-registered browser-chrome tests, so
-                // renameTestFiles does not reach them — leaving
+                // renameTestFiles does not reach them, leaving
                 // `engine/toolkit/content/tests/widgets/test_<old>.html` and its
                 // `chrome.toml` entry pointing at the old name, which either fails
                 // the test run outright or passes for the wrong component.
@@ -323,7 +320,14 @@ async function performRenameMutations(args) {
         }
     });
 }
-async function updateEngineRegistrations(engineDir, oldName, newName, newDir, ftlDir, isLocalized, journal) {
+/**
+ * Re-points the engine-side registrations (customElements.js, jar.mn, and
+ * the localized `.ftl` entries) from the old tag name to the new one.
+ *
+ * @param options - See {@link UpdateEngineRegistrationsOptions}
+ */
+async function updateEngineRegistrations(options) {
+    const { engineDir, oldName, newName, newDir, ftlDir, isLocalized, journal } = options;
     const customElementsPath = join(engineDir, 'toolkit/content/customElements.js');
     const jarMnPath = join(engineDir, 'toolkit/content/jar.mn');
     if (await pathExists(customElementsPath)) {
@@ -396,15 +400,15 @@ export async function furnaceRenameCommand(projectRoot, oldName, newName) {
     if (newName in config.custom || newName in config.overrides || config.stock.includes(newName)) {
         throw new FurnaceError(`A component named "${newName}" already exists in furnace.json.`, newName);
     }
-    const componentType = isCustom ? 'custom' : 'override';
-    // `componentType` is the furnace-state key (singular: `custom` /
-    // `override`); the on-disk directory label differs — custom components
-    // live under `components/custom/` (singular) while overrides live under
-    // `components/overrides/` (plural). Appending an `s` to `componentType`
-    // produces the wrong label `components/customs/` for custom components
-    // and is correct for overrides only by coincidence. `componentDirLabel`
-    // centralises the pick so every operator-facing string names the
-    // directory that actually exists on disk.
+    // The furnace-state key is singular (`custom` / `override`, derived
+    // inside performRenameMutations). The on-disk directory label differs.
+    // Custom components live under `components/custom/` (singular) while
+    // overrides live under `components/overrides/` (plural). Appending an
+    // `s` to the state key produces the wrong label `components/customs/`
+    // for custom components and is correct for overrides only by
+    // coincidence. `componentDirLabel` centralises the pick so every
+    // operator-facing string names the directory that actually exists on
+    // disk.
     const componentDirLabel = isCustom ? 'custom' : 'overrides';
     const baseDir = isCustom ? furnacePaths.customDir : furnacePaths.overridesDir;
     const oldDir = join(baseDir, oldName);
@@ -419,11 +423,7 @@ export async function furnaceRenameCommand(projectRoot, oldName, newName) {
         projectRoot,
         oldName,
         newName,
-        oldDir,
         newDir,
-        isCustom,
-        componentType,
-        config,
         furnaceConfigPath: furnacePaths.furnaceConfig,
         furnacePaths,
         engineDir: paths.engine,

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

@@ -59,7 +59,7 @@ async function promptAddComponents(components, tracked, projectRoot) {
 /**
  * Persists discovered component tag names into the `stock` section of
  * furnace.json. Shared by the interactive confirm flow and the
- * non-interactive `--track` flag — without it, scan prints a full inventory
+ * non-interactive `--track` flag. Without it, scan prints a full inventory
  * but persists nothing and says nothing about where the inventory goes.
  *
  * Wraps the furnace.json mutation in the standard furnace lifecycle so the
@@ -81,7 +81,7 @@ async function persistStockComponents(projectRoot, names) {
             // re-filter catches the edge case where the config on disk changed
             // between the scan's read and the write (concurrent scan / manual
             // edit). Without it a duplicate scan would introduce duplicate
-            // entries into stock; writeFurnaceConfig's validator would then
+            // entries into stock. writeFurnaceConfig's validator would then
             // reject the write, but the error would be less actionable than
             // silently de-duplicating here.
             const toAdd = names.filter((s) => !config.stock.includes(s));
@@ -163,7 +163,7 @@ export async function furnaceScanCommand(projectRoot, options = {}) {
     note(`Total: ${components.length}  Tracked: ${trackedCount}  Untracked: ${untrackedCount}`, 'Summary');
     // --track: persist the discovered untracked inventory into the `stock`
     // section without prompting (works non-interactively). Without it, scan
-    // stays report-only; the interactive confirm flow below is the other
+    // stays report-only. The interactive confirm flow below is the other
     // persistence path.
     if (options.track) {
         if (untrackedCount === 0) {

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

@@ -11,15 +11,10 @@ import { pathExists } from '../../utils/fs.js';
 import { info, intro, note, outro, warn } from '../../utils/logger.js';
 /**
  * Displays detailed status for a single Furnace component, including registration drift.
- * @param name - Component tag name to inspect
- * @param config - Loaded Furnace configuration
- * @param state - Loaded furnace state, for applied/engine checksums
- * @param projectRoot - Root directory of the project
- * @param paths - Resolved project paths
- * @param furnacePaths - Resolved Furnace-specific paths
- * @param ftlDir - Engine-relative directory localized components deploy their `.ftl` into
+ * @param options - See {@link DetailedComponentStatusOptions}
  */
-async function showDetailedComponentStatus(name, config, state, projectRoot, paths, furnacePaths, ftlDir) {
+async function showDetailedComponentStatus(options) {
+    const { name, config, state, projectRoot, paths, furnacePaths, ftlDir } = options;
     const customConfig = config.custom[name];
     const overrideConfig = config.overrides[name];
     if (!customConfig && !overrideConfig && !config.stock.includes(name)) {
@@ -72,7 +67,7 @@ async function showDetailedComponentStatus(name, config, state, projectRoot, pat
         outro('Status complete');
         return;
     }
-    // Custom component — run registration consistency check
+    // Custom component: run registration consistency check
     const status = await checkRegistrationConsistency(projectRoot, name, customConfig, ftlDir);
     const lines = [];
     const check = (ok, label) => {
@@ -113,13 +108,21 @@ export async function furnaceStatusCommand(projectRoot, name) {
     const furnacePaths = getFurnacePaths(projectRoot);
     const ftlDir = resolveFtlDir(config.ftlBasePath);
     if (name) {
-        await showDetailedComponentStatus(name, config, state, projectRoot, paths, furnacePaths, ftlDir);
+        await showDetailedComponentStatus({
+            name,
+            config,
+            state,
+            projectRoot,
+            paths,
+            furnacePaths,
+            ftlDir,
+        });
         return;
     }
     // Surface a pendingRepair marker before the normal summary so it cannot
     // be missed. The marker means the last mutation could not roll back
     // cleanly, so the engine and workspace may have drifted in ways apply
-    // cannot detect from checksums alone — doctor is the right next step.
+    // cannot detect from checksums alone, so doctor is the right next step.
     if (state.pendingRepair) {
         warn(`Furnace is in pending-repair state from ${state.pendingRepair.operation} (${state.pendingRepair.timestamp}): ${state.pendingRepair.reason}. Run \`fireforge doctor --repair-furnace\` to reconcile.`);
     }
@@ -151,7 +154,7 @@ export async function furnaceStatusCommand(projectRoot, name) {
     // Surface override baseVersion drift from the project config. This check
     // is cheap (no I/O besides the already-loaded fireforge.json) and catches
     // the single most common silent-drift case: Firefox bumped, overrides
-    // still point at the old version. Advisory only — status never fails.
+    // still point at the old version. Advisory only. Status never fails.
     const forgeConfig = await loadConfig(projectRoot);
     for (const entry of findOverrideBaseVersionDrift(config, forgeConfig.firefox.version)) {
         warn(formatOverrideBaseVersionDriftWarning(entry));
@@ -163,17 +166,17 @@ export async function furnaceStatusCommand(projectRoot, name) {
     if (await pathExists(paths.engine)) {
         // Held in an object rather than two `let`s: the scanner below mutates
         // them from inside a closure, and TS's control-flow analysis does not
-        // propagate that through the call — it would narrow both to the literal
+        // propagate that through the call. It would narrow both to the literal
         // `false` and flag every later read as always-falsy.
         const drift = { workspaceChanged: false, engineDrifted: false };
         /**
          * Scans one component family for workspace or engine drift.
          *
-         * The engine probe sits behind `else if` deliberately: a component whose
+         * The engine probe sits behind `else if` on purpose: a component whose
          * workspace already changed does not need an engine comparison to decide
          * what `status` reports, and the probe is the expensive half (it
-         * re-hashes deployed files). The consequence is that engine drift can go
-         * UNREPORTED for a component that also has workspace changes — the
+         * re-hashes deployed files). The consequence is that engine drift goes
+         * unreported for a component that also has workspace changes. The
          * summary says "workspace changed", not both.
          */
         const scanFamily = async (entries, baseDir, kind, probeEngineDrift) => {

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

@@ -91,12 +91,12 @@ export async function furnaceSyncCommand(projectRoot, options = {}) {
     else {
         info('All overrides are up-to-date with the current Firefox version.');
     }
-    // Phase 2.5: post-refresh gates. Refresh deliberately leaves conflict
-    // markers in workspace files and does NOT bump baseVersion on conflict —
-    // so without this gate sync warns about conflicts and then copies the
-    // marker-laden files straight into the engine via Phase 3, producing a
-    // broken build from the one command whose whole purpose is a safe upgrade.
-    // Apply and deploy both enforce a drift gate; sync must not be the back
+    // Phase 2.5: post-refresh gates. Refresh leaves conflict markers in
+    // workspace files and does not bump baseVersion on conflict, so without
+    // this gate sync warns about conflicts and then copies the marker-laden
+    // files straight into the engine via Phase 3, producing a broken build
+    // from the one command meant to make an upgrade safe.
+    // Apply and deploy both enforce a drift gate. Sync must not be the back
     // door around it.
     if (!options.dryRun) {
         const refreshedConfig = await loadFurnaceConfig(projectRoot);

package/dist/src/commands/furnace/test-file-name.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Derives the underscored stem a component's generated test files are named
+ * after.
+ *
+ * Five modules (`create-browser-test`, `create-dry-run`, `remove`, `rename`,
+ * `rename-browser-test`) had each inlined this three-step transform. The steps
+ * are not arbitrary and must agree exactly, or `furnace rename` and
+ * `furnace remove` compute a different filename than `furnace create` wrote
+ * and silently leave the old test behind:
+ *
+ * 1. drop the upstream `moz-` custom-element prefix, which never appears in a
+ *    test filename.
+ * 2. drop a leading `<binaryName>-`, because the test directory is already
+ *    named after the binary and the prefix would be doubled.
+ * 3. underscore the remaining dashes, matching mozilla-central's
+ *    `browser_*.js` convention.
+ * @param componentName - Custom-element name, e.g. `moz-mybrowser-sidebar`.
+ * @param binaryName - Configured binary name, e.g. `mybrowser`.
+ * @returns The stem, e.g. `sidebar`.
+ */
+export declare function deriveTestStem(componentName: string, binaryName: string): string;
+/**
+ * Builds the browser-chrome test filename for a component.
+ * @param componentName - Custom-element name.
+ * @param binaryName - Configured binary name.
+ * @returns The filename, e.g. `browser_mybrowser_sidebar.js`.
+ */
+export declare function browserTestFileName(componentName: string, binaryName: string): string;

package/dist/src/commands/furnace/test-file-name.js

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: EUPL-1.2
+/**
+ * Derives the underscored stem a component's generated test files are named
+ * after.
+ *
+ * Five modules (`create-browser-test`, `create-dry-run`, `remove`, `rename`,
+ * `rename-browser-test`) had each inlined this three-step transform. The steps
+ * are not arbitrary and must agree exactly, or `furnace rename` and
+ * `furnace remove` compute a different filename than `furnace create` wrote
+ * and silently leave the old test behind:
+ *
+ * 1. drop the upstream `moz-` custom-element prefix, which never appears in a
+ *    test filename.
+ * 2. drop a leading `<binaryName>-`, because the test directory is already
+ *    named after the binary and the prefix would be doubled.
+ * 3. underscore the remaining dashes, matching mozilla-central's
+ *    `browser_*.js` convention.
+ * @param componentName - Custom-element name, e.g. `moz-mybrowser-sidebar`.
+ * @param binaryName - Configured binary name, e.g. `mybrowser`.
+ * @returns The stem, e.g. `sidebar`.
+ */
+export function deriveTestStem(componentName, binaryName) {
+    const withoutMozPrefix = componentName.startsWith('moz-')
+        ? componentName.slice(4)
+        : componentName;
+    const withoutBinaryPrefix = withoutMozPrefix.startsWith(`${binaryName}-`)
+        ? withoutMozPrefix.slice(binaryName.length + 1)
+        : withoutMozPrefix;
+    return withoutBinaryPrefix.replace(/-/g, '_');
+}
+/**
+ * Builds the browser-chrome test filename for a component.
+ * @param componentName - Custom-element name.
+ * @param binaryName - Configured binary name.
+ * @returns The filename, e.g. `browser_mybrowser_sidebar.js`.
+ */
+export function browserTestFileName(componentName, binaryName) {
+    return `browser_${binaryName}_${deriveTestStem(componentName, binaryName)}.js`;
+}

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

@@ -78,16 +78,15 @@ async function autoFixIssues(projectRoot, issues) {
             warn(`Could not fix jar.mn for ${componentName}: ${toError(err).message}`);
         }
     }
-    // `wrong-registration-pattern` is deliberately NOT auto-fixed: it means the
-    // component IS registered but in the wrong block, and moving code between
-    // blocks is too risky to do unattended. Only truly missing registrations are
-    // repaired, below.
+    // `wrong-registration-pattern` is not auto-fixed: the component is
+    // registered but in the wrong block, and moving code between blocks is too
+    // risky to do unattended. Only missing registrations are repaired, below.
     // Repair components missing from customElements.js entirely (reported by
     // validate as `missing-custom-element-registration`).
     //
     // Scoped to the components named in `issues`: iterating every entry in
     // `config.custom` makes `furnace validate <one-component> --fix` write
-    // customElements.js registrations for EVERY custom component, outside the
+    // customElements.js registrations for every custom component, outside the
     // issue list it was handed and invisibly, since `fixed` is never
     // incremented here.
     const componentsWithIssues = new Set(issues.map((issue) => issue.component));
@@ -109,7 +108,7 @@ async function autoFixIssues(projectRoot, issues) {
             await addCustomElementRegistration(engineDir, componentName, modulePath);
         }
         catch {
-            // Best-effort repair — the re-validation pass at the call site reports
+            // Best-effort repair. The re-validation pass at the call site reports
             // whatever is still outstanding.
         }
     }
@@ -194,11 +193,11 @@ export async function furnaceValidateCommand(projectRoot, name, options = {}) {
         }
     }
     // Auto-fix fixable issues when --fix is passed. The counter returned by
-    // `autoFixIssues` only counts function calls that did not throw — a write
-    // that succeeded but did not actually resolve the issue (addJarMnEntries
-    // appending to a file mach later ignores) would still bump it. Re-validate
-    // the affected components and compute the *actual* drop in fixable issues
-    // so the reported number is honest.
+    // `autoFixIssues` only counts function calls that did not throw, so a
+    // write that succeeded but did not actually resolve the issue
+    // (addJarMnEntries appending to a file mach later ignores) would still
+    // bump it. Re-validate the affected components and compute the real drop
+    // in fixable issues so the reported number is honest.
     if (options.fix && allIssues.length > 0) {
         const fixableIssues = allIssues.filter((issue) => FIXABLE_CHECKS.has(issue.check));
         if (fixableIssues.length > 0) {
@@ -254,7 +253,7 @@ async function reValidateComponents(projectRoot, config, furnacePaths, component
             componentDir = join(furnacePaths.customDir, componentName);
         }
         else {
-            // Stock or removed components are not local-validated; skip silently.
+            // Stock or removed components are not local-validated, so skip silently.
             continue;
         }
         if (!(await pathExists(componentDir)))

package/dist/src/commands/furnace/validation-output.d.ts

@@ -1,4 +1,4 @@
-import type { getFurnacePaths } from '../../core/furnace-config.js';
+import type { FurnacePaths } from '../../core/furnace-config.js';
 import type { DryRunAction, FurnaceConfig, ValidationIssue } from '../../types/furnace.js';
 import { type SpinnerHandle } from '../../utils/logger.js';
 /**
@@ -16,15 +16,27 @@ export type ValidationResult = {
     componentCount: number;
     skippedValidationCount: number;
 };
+export interface RunDeployValidationOptions {
+    /** Active spinner handle for progress display. */
+    validateSpinner: SpinnerHandle;
+    /** Optional component name (validates all if omitted). */
+    name: string | undefined;
+    /** Loaded Furnace configuration. */
+    config: FurnaceConfig;
+    /** Resolved Furnace workspace paths. */
+    furnacePaths: FurnacePaths;
+    /** Names of components whose apply step failed. */
+    failedComponents: Set<string>;
+    /** Whether deploy is running in dry-run mode. */
+    isDryRun: boolean;
+    /** Root directory of the project. */
+    projectRoot: string;
+    /** Projected actions of a dry run, used to filter projected issues. */
+    dryRunActions?: DryRunAction[] | undefined;
+}
 /**
  * Runs the validation phase of a furnace deploy, checking all or a single component.
- * @param validateSpinner - Active spinner handle for progress display
- * @param name - Optional component name (validates all if omitted)
- * @param config - Loaded Furnace configuration
- * @param furnacePaths - Resolved Furnace workspace paths
- * @param failedComponents - Names of components whose apply step failed
- * @param isDryRun - Whether deploy is running in dry-run mode
- * @param projectRoot - Root directory of the project
+ * @param options - See {@link RunDeployValidationOptions}
  * @returns Validation counts, or `done: true` if the caller should early-return
  */
-export declare function runDeployValidation(validateSpinner: SpinnerHandle, name: string | undefined, config: FurnaceConfig, furnacePaths: ReturnType<typeof getFurnacePaths>, failedComponents: Set<string>, isDryRun: boolean, projectRoot: string, dryRunActions?: DryRunAction[]): Promise<ValidationResult>;
+export declare function runDeployValidation(options: RunDeployValidationOptions): Promise<ValidationResult>;

package/dist/src/commands/furnace/validation-output.js

@@ -56,16 +56,11 @@ function resolveNamedValidationTarget(name, config, furnacePaths) {
 }
 /**
  * Runs the validation phase of a furnace deploy, checking all or a single component.
- * @param validateSpinner - Active spinner handle for progress display
- * @param name - Optional component name (validates all if omitted)
- * @param config - Loaded Furnace configuration
- * @param furnacePaths - Resolved Furnace workspace paths
- * @param failedComponents - Names of components whose apply step failed
- * @param isDryRun - Whether deploy is running in dry-run mode
- * @param projectRoot - Root directory of the project
+ * @param options - See {@link RunDeployValidationOptions}
  * @returns Validation counts, or `done: true` if the caller should early-return
  */
-export async function runDeployValidation(validateSpinner, name, config, furnacePaths, failedComponents, isDryRun, projectRoot, dryRunActions) {
+export async function runDeployValidation(options) {
+    const { validateSpinner, name, config, furnacePaths, failedComponents, isDryRun, projectRoot, dryRunActions, } = options;
     let totalErrors = 0;
     let totalWarnings = 0;
     let componentCount = 0;