@hominis/fireforge 0.13.0 → 0.13.2

package/CHANGELOG.md

@@ -12,6 +12,17 @@
 - **`observer-topic-naming` no longer matches across newlines.** The regex that extracts topic strings from `notifyObservers`/`addObserver`/`removeObserver` calls now anchors to a single line, preventing false positives when the call spans multiple lines and an unrelated string literal appears later.
 - **`raw-color-value` now supports a file allowlist and inline suppression.** New `patchLint.rawColorAllowlist` config array in `fireforge.json` exempts file paths (exact or basename match) from the raw-color check — intended for design token files that must contain raw color values. Individual declarations can also be suppressed with an inline `/* fireforge-ignore: raw-color-value */` comment.
 - **`large-patch-lines` now uses tiered severity thresholds.** The old single >300-line warning is replaced with a three-tier system matching the `file-too-large` pattern. General patches: 800+ lines notice, 1500+ warning, 3000+ error. Test-only patches (all files match test patterns): 1500+ notice, 3000+ warning, 6000+ error. The previous threshold was too restrictive relative to file LOC limits — creating a single new file at the `file-too-large` notice tier (500 LOC) already exceeded it. Messages now include the applicable soft and hard limits.
+- **`large-patch-lines` now ignores binary content.** Patches whose diff contains GIT binary patch hunks (PNG, ICO, ICNS, BMP, etc.) no longer count base85-encoded data toward the line limit. This removes the need for `--skip-lint` on branding asset patches that are predominantly binary.
+- **`modified-file-missing-header` no longer false-positives on upstream files.** Modified upstream files (e.g. `BrowserGlue.sys.mjs`) that carry an MPL-2.0 header in `/* */` block-comment style were incorrectly flagged because the check only tried the comment style inferred from the file extension. The check now cascades through all comment styles and falls back to scanning leading lines for raw license identifier strings (MPL, Apache, MIT, GPL, SPDX).
+
+### New commands
+
+- **`fireforge patch compact`** — closes ordinal gaps in the patch queue in a single atomic operation. After deletes or splits, patch ordinals may have gaps (e.g. 1, 3, 7); `compact` renumbers them sequentially (1, 2, 3). Previously this required N sequential `patch reorder` calls. Supports `--dry-run` and `--yes`.
+
+### Register improvements
+
+- **`register` now supports `.xhtml` and `.css` files in `browser/base/content/`.** Previously only `.js` and `.mjs` files were accepted; XHTML and CSS files required manual `jar.mn` edits.
+- **`register` now gives actionable advice for unregistrable file types.** Attempting to register a `.ftl` locale file explains that FTL files are auto-discovered via `jar.mn` glob patterns. Attempting to register an individual test file explains that it should be added to the corresponding `browser.toml` and suggests the correct `register` invocation for the test directory manifest.
 
 ### General Improvements
 

package/README.md

@@ -188,30 +188,30 @@ If the manifest drifts after an interrupted export or manual edits, `fireforge i
 
 `fireforge lint` runs automatically during export, export-all and re-export. Use `--skip-lint` to downgrade errors to warnings. Errors block the export; warnings are printed but do not block.
 
-| Check                          | Scope                                                                 | Severity                 |
-| ------------------------------ | --------------------------------------------------------------------- | ------------------------ |
-| `missing-license-header`       | New files (JS/CSS/FTL)                                                | error                    |
-| `relative-import`              | JS/MJS files                                                          | error                    |
-| `token-prefix-violation`       | CSS files (with furnace)                                              | error                    |
-| `raw-color-value`              | Introduced CSS color values                                           | error                    |
-| `duplicate-new-file-creation`  | Same path created by multiple patches                                 | error                    |
-| `forward-import`               | Patch imports from a later-patch file                                 | error                    |
-| `missing-jsdoc`                | Exports in patch-owned `.sys.mjs`                                     | error                    |
-| `jsdoc-param-mismatch`         | Exports in patch-owned `.sys.mjs`                                     | error                    |
-| `jsdoc-missing-returns`        | Exports in patch-owned `.sys.mjs`                                     | error                    |
-| `checkjs-type-error`           | Patch-owned `.sys.mjs` (opt-in)                                       | error                    |
-| `missing-modification-comment` | Modified upstream JS/MJS                                              | warning                  |
-| `modified-file-missing-header` | Modified upstream files (JS/CSS/FTL)                                  | warning                  |
-| `file-too-large`               | New files (tiered: 500/750/900 general, 1200/1400/1600 test)          | notice / warning / error |
-| `observer-topic-naming`        | Observer topics with binaryName                                       | warning                  |
-| `large-patch-files`            | Patches affecting >5 files                                            | warning                  |
-| `large-patch-lines`            | Patch line count (tiered: 800/1500/3000 general, 1500/3000/6000 test) | notice / warning / error |
+| Check                          | Scope                                                                     | Severity                 |
+| ------------------------------ | ------------------------------------------------------------------------- | ------------------------ |
+| `missing-license-header`       | New files (JS/CSS/FTL)                                                    | error                    |
+| `relative-import`              | JS/MJS files                                                              | error                    |
+| `token-prefix-violation`       | CSS files (with furnace)                                                  | error                    |
+| `raw-color-value`              | Introduced CSS color values (allowlist via `patchLint.rawColorAllowlist`) | error                    |
+| `duplicate-new-file-creation`  | Same path created by multiple patches                                     | error                    |
+| `forward-import`               | Patch imports from a later-patch file                                     | error                    |
+| `missing-jsdoc`                | Exports in patch-owned `.sys.mjs`                                         | error                    |
+| `jsdoc-param-mismatch`         | Exports in patch-owned `.sys.mjs`                                         | error                    |
+| `jsdoc-missing-returns`        | Exports in patch-owned `.sys.mjs`                                         | error                    |
+| `checkjs-type-error`           | Patch-owned `.sys.mjs` (opt-in)                                           | error                    |
+| `missing-modification-comment` | Modified upstream JS/MJS                                                  | warning                  |
+| `modified-file-missing-header` | Modified upstream files (JS/CSS/FTL)                                      | warning                  |
+| `file-too-large`               | New files (tiered: 500/750/900 general, 1200/1400/1600 test)              | notice / warning / error |
+| `observer-topic-naming`        | Observer topics with binaryName                                           | warning                  |
+| `large-patch-files`            | Patches affecting >5 files                                                | warning                  |
+| `large-patch-lines`            | Patch line count (tiered: 800/1500/3000 general, 1500/3000/6000 test)     | notice / warning / error |
 
 **JSDoc validation** uses AST-based analysis (Acorn) to validate exported APIs in patch-owned `.sys.mjs` files. A file is "patch-owned" if it was newly created by the current diff or by an existing patch in the queue. Functions must document every `@param` (names must match) and include `@returns` when the function returns a value. Exported constants and classes require a JSDoc block.
 
 **Optional `checkJs` pass.** Enable a TypeScript-esque bastardization of type checking for patch-owned `.sys.mjs` files by adding `"patchLint": { "checkJs": true }` to `fireforge.json`. This uses the TypeScript compiler API with `allowJs + checkJs + noEmit`, scoped only to patch-owned files. Firefox globals (`Services`, `ChromeUtils`, `lazy`, etc.) are shimmed automatically. Module-resolution errors from Firefox's `resource://` and `chrome://` URL schemes are suppressed since TypeScript cannot follow these. This pass solely focuses on type errors within the patch-owned code itself (mismatched JSDoc types, wrong argument counts, unreachable code, etc.).
 
-The two cross-patch rules (`duplicate-new-file-creation` and `forward-import`) run over the whole patch queue rather than a single diff, catching ordering issues that only surface during `import`. Forward-import detection compares leaf filenames, so a false positive is theoretically possible when two patches create files with the same basename in different directories. Suppress with an inline `// fireforge-ignore: forward-import` comment on or above the import line. This is currently the only lint rule that supports inline suppression.
+The two cross-patch rules (`duplicate-new-file-creation` and `forward-import`) run over the whole patch queue rather than a single diff, catching ordering issues that only surface during `import`. Forward-import detection compares leaf filenames, so a false positive is theoretically possible when two patches create files with the same basename in different directories. Suppress with an inline `// fireforge-ignore: forward-import` comment on or above the import line. Both `forward-import` and `raw-color-value` support inline suppression comments (`// fireforge-ignore: forward-import` and `/* fireforge-ignore: raw-color-value */` respectively).
 
 </details>
 
@@ -233,6 +233,7 @@ Then fix with the appropriate primitive:
 | Two patches each creating the same file        | `fireforge patch delete <duplicate>` or `fireforge re-export --files` |
 | A patch imports from a module in a later patch | `fireforge patch reorder <later> --before <importer>`                 |
 | Wrong patch ordering                           | `fireforge patch reorder <patch> --to <N>`                            |
+| Ordinal gaps after deletes/splits              | `fireforge patch compact`                                             |
 | A patch claims files that belong elsewhere     | `fireforge re-export --files <subset> <patch>`                        |
 | Manifest references a missing patch file       | `fireforge doctor --repair-patches-manifest`                          |
 | Unmanaged changes you want to discard          | `fireforge discard <file>` or `fireforge reset`                       |
@@ -266,13 +267,13 @@ fireforge register browser/modules/mybrowser/MyStore.sys.mjs
 <details>
 <summary>Supported register patterns</summary>
 
-| File pattern                               | Manifest                              | Entry format                        |
-| ------------------------------------------ | ------------------------------------- | ----------------------------------- |
-| `browser/themes/shared/*.css`              | `browser/themes/shared/jar.inc.mn`    | `skin/classic/browser/{name}.css`   |
-| `browser/base/content/*.{js,mjs}`          | `browser/base/jar.mn`                 | `content/browser/{file}`            |
-| `browser/base/content/test/*/browser.toml` | `browser/base/moz.build`              | `"content/test/{dir}/browser.toml"` |
-| `browser/modules/mybrowser/*.sys.mjs`      | `browser/modules/mybrowser/moz.build` | `"{name}.sys.mjs"`                  |
-| `toolkit/content/widgets/*/*.{mjs,css}`    | `toolkit/content/jar.mn`              | `content/global/elements/{file}`    |
+| File pattern                                | Manifest                              | Entry format                        |
+| ------------------------------------------- | ------------------------------------- | ----------------------------------- |
+| `browser/themes/shared/*.css`               | `browser/themes/shared/jar.inc.mn`    | `skin/classic/browser/{name}.css`   |
+| `browser/base/content/*.{js,mjs,xhtml,css}` | `browser/base/jar.mn`                 | `content/browser/{file}`            |
+| `browser/base/content/test/*/browser.toml`  | `browser/base/moz.build`              | `"content/test/{dir}/browser.toml"` |
+| `browser/modules/mybrowser/*.sys.mjs`       | `browser/modules/mybrowser/moz.build` | `"{name}.sys.mjs"`                  |
+| `toolkit/content/widgets/*/*.{mjs,css}`     | `toolkit/content/jar.mn`              | `content/global/elements/{file}`    |
 
 </details>
 
@@ -327,9 +328,12 @@ fireforge patch reorder 003-ui-sidebar-tweaks.patch --to 1
 
 # Move a patch before or after another
 fireforge patch reorder 003-ui-sidebar.patch --before 001-branding-logo.patch
+
+# Close ordinal gaps after deletes or splits (e.g. 1, 3, 7 → 1, 2, 3)
+fireforge patch compact
 ```
 
-Both subcommands support `--dry-run` and `--yes`.
+All subcommands support `--dry-run` and `--yes`.
 
 ### Additional workflow commands
 
@@ -360,7 +364,11 @@ fireforge token --name "--my-color" --value "light-dark(#fff, #000)"
     "product": "firefox-esr"
   },
   "build": { "jobs": 8 },
-  "wire": { "subscriptDir": "browser/components/mybrowser" }
+  "wire": { "subscriptDir": "browser/components/mybrowser" },
+  "patchLint": {
+    "checkJs": true,
+    "rawColorAllowlist": ["hominis-tokens.css"]
+  }
 }
 ```
 

package/dist/src/commands/patch/compact.d.ts

@@ -0,0 +1,25 @@
+/**
+ * `fireforge patch compact` — closes ordinal gaps in the patch queue.
+ *
+ * After deletes or splits, patch ordinals may have gaps (e.g. 1, 3, 7).
+ * This command renumbers all patches to sequential ordinals (1, 2, 3, …)
+ * in a single atomic operation, preserving relative order.
+ */
+import { Command } from 'commander';
+import type { CommandContext } from '../../types/cli.js';
+import type { PatchCompactOptions } from '../../types/commands/index.js';
+/**
+ * Runs the `patch compact` command: renumbers all patches to close ordinal
+ * gaps in a single atomic operation.
+ *
+ * @param projectRoot - Project root directory
+ * @param options - Command options
+ */
+export declare function patchCompactCommand(projectRoot: string, options?: PatchCompactOptions): Promise<void>;
+/**
+ * Registers the `patch compact` subcommand on the `patch` parent.
+ *
+ * @param parent - Parent Commander command
+ * @param context - Shared CLI registration context
+ */
+export declare function registerPatchCompact(parent: Command, context: CommandContext): void;

package/dist/src/commands/patch/compact.js

@@ -0,0 +1,132 @@
+// SPDX-License-Identifier: EUPL-1.2
+/**
+ * `fireforge patch compact` — closes ordinal gaps in the patch queue.
+ *
+ * After deletes or splits, patch ordinals may have gaps (e.g. 1, 3, 7).
+ * This command renumbers all patches to sequential ordinals (1, 2, 3, …)
+ * in a single atomic operation, preserving relative order.
+ */
+import { getProjectPaths } from '../../core/config.js';
+import { appendHistory, confirmDestructive } from '../../core/destructive.js';
+import { withPatchDirectoryLock } from '../../core/patch-lock.js';
+import { loadPatchesManifest, renumberPatchesInManifest, } from '../../core/patch-manifest.js';
+import { GeneralError } from '../../errors/base.js';
+import { toError } from '../../utils/errors.js';
+import { pathExists } from '../../utils/fs.js';
+import { info, intro, outro, warn } from '../../utils/logger.js';
+import { pickDefined } from '../../utils/options.js';
+import { rebuildFilenameForOrder } from './reorder.js';
+/**
+ * Computes a rename map that assigns sequential ordinals (1, 2, 3, …)
+ * to all patches, sorted by their current order.
+ */
+function computeCompactRenameMap(patches) {
+    const sorted = [...patches].sort((a, b) => a.order - b.order);
+    const renames = new Map();
+    for (const [i, patch] of sorted.entries()) {
+        const newOrder = i + 1;
+        if (patch.order !== newOrder) {
+            renames.set(patch.filename, {
+                newOrder,
+                newFilename: rebuildFilenameForOrder(patch, newOrder),
+            });
+        }
+    }
+    return renames;
+}
+/**
+ * Runs the `patch compact` command: renumbers all patches to close ordinal
+ * gaps in a single atomic operation.
+ *
+ * @param projectRoot - Project root directory
+ * @param options - Command options
+ */
+export async function patchCompactCommand(projectRoot, options = {}) {
+    intro(options.dryRun ? 'FireForge patch compact (dry run)' : 'FireForge patch compact');
+    const paths = getProjectPaths(projectRoot);
+    if (!(await pathExists(paths.patches))) {
+        throw new GeneralError('Patches directory not found.');
+    }
+    const manifest = await loadPatchesManifest(paths.patches);
+    if (!manifest || manifest.patches.length === 0) {
+        throw new GeneralError('No patches in manifest.');
+    }
+    const renameMap = computeCompactRenameMap(manifest.patches);
+    if (renameMap.size === 0) {
+        info('Patch queue is already compact. Nothing to do.');
+        outro('Compact complete (no-op)');
+        return;
+    }
+    const sorted = [...renameMap.entries()].sort((a, b) => a[1].newOrder - b[1].newOrder);
+    const summary = [`${renameMap.size} patch(es) would be renumbered:`];
+    for (const [oldFilename, entry] of sorted) {
+        summary.push(`  ${oldFilename}  →  ${entry.newFilename}  (order ${entry.newOrder})`);
+    }
+    const decision = await confirmDestructive({
+        operation: 'patch-compact',
+        title: `Compact ${manifest.patches.length} patches (${renameMap.size} rename(s))`,
+        summary,
+        yes: options.yes === true,
+        dryRun: options.dryRun === true,
+    });
+    if (decision === 'dry-run') {
+        outro('Dry run complete — no changes made');
+        return;
+    }
+    if (decision === 'cancelled') {
+        outro('Compact cancelled');
+        return;
+    }
+    await withPatchDirectoryLock(paths.patches, async () => {
+        const currentManifest = await loadPatchesManifest(paths.patches);
+        if (!currentManifest) {
+            throw new GeneralError('Manifest disappeared while waiting for lock.');
+        }
+        const currentRenameMap = computeCompactRenameMap(currentManifest.patches);
+        if (currentRenameMap.size === 0) {
+            info('Patch queue was compacted by another process. Nothing to do.');
+            return;
+        }
+        await renumberPatchesInManifest(paths.patches, currentRenameMap);
+        const historyEntry = {
+            operation: 'patch-compact',
+            args: {
+                renames: [...currentRenameMap.entries()]
+                    .sort((a, b) => a[1].newOrder - b[1].newOrder)
+                    .map(([from, entry]) => ({
+                    from,
+                    to: entry.newFilename,
+                    order: entry.newOrder,
+                })),
+            },
+            ...(options.yes === true ? { yes: true } : {}),
+            result: 'ok',
+        };
+        try {
+            await appendHistory(paths.patches, historyEntry);
+        }
+        catch (historyError) {
+            warn(`History log append failed after patch compact committed: ${toError(historyError).message}`);
+        }
+    });
+    info(`Compacted ${renameMap.size} patch(es).`);
+    outro('Compact complete');
+}
+/**
+ * Registers the `patch compact` subcommand on the `patch` parent.
+ *
+ * @param parent - Parent Commander command
+ * @param context - Shared CLI registration context
+ */
+export function registerPatchCompact(parent, context) {
+    const { getProjectRoot, withErrorHandling } = context;
+    parent
+        .command('compact')
+        .description('Close ordinal gaps in the patch queue (renumber sequentially)')
+        .option('--dry-run', 'Show what would happen without writing')
+        .option('-y, --yes', 'Skip confirmation prompt (required for non-TTY)')
+        .action(withErrorHandling(async (options) => {
+        await patchCompactCommand(getProjectRoot(), pickDefined(options));
+    }));
+}
+//# sourceMappingURL=compact.js.map

package/dist/src/commands/patch/index.d.ts

@@ -6,6 +6,7 @@
  */
 import { Command } from 'commander';
 import type { CommandContext } from '../../types/cli.js';
+export { patchCompactCommand } from './compact.js';
 export { patchDeleteCommand } from './delete.js';
 export { patchReorderCommand } from './reorder.js';
 /**

package/dist/src/commands/patch/index.js

@@ -5,8 +5,10 @@
  * command list. Queue-level verbs like `lint`, `export`, `verify`, and
  * `status` stay flat.
  */
+import { registerPatchCompact } from './compact.js';
 import { registerPatchDelete } from './delete.js';
 import { registerPatchReorder } from './reorder.js';
+export { patchCompactCommand } from './compact.js';
 export { patchDeleteCommand } from './delete.js';
 export { patchReorderCommand } from './reorder.js';
 /**
@@ -18,7 +20,8 @@ export { patchReorderCommand } from './reorder.js';
 export function registerPatch(program, context) {
     const patch = program
         .command('patch')
-        .description('Manage individual patches in the queue (delete, reorder)');
+        .description('Manage individual patches in the queue (compact, delete, reorder)');
+    registerPatchCompact(patch, context);
     registerPatchDelete(patch, context);
     registerPatchReorder(patch, context);
 }

package/dist/src/commands/patch/reorder.d.ts

@@ -9,7 +9,11 @@
  */
 import { Command } from 'commander';
 import type { CommandContext } from '../../types/cli.js';
-import type { PatchReorderOptions } from '../../types/commands/index.js';
+import type { PatchMetadata, PatchReorderOptions } from '../../types/commands/index.js';
+/** Zero-pads an ordinal number to the given width. */
+export declare function padOrder(value: number, width: number): string;
+/** Builds a new patch filename by replacing the numeric prefix with `newOrder`. */
+export declare function rebuildFilenameForOrder(existing: PatchMetadata, newOrder: number): string;
 /**
  * Runs the `patch reorder` command: computes a rename map moving the
  * target patch to the requested slot, projects the new order through

package/dist/src/commands/patch/reorder.js

@@ -20,10 +20,12 @@ import { pathExists } from '../../utils/fs.js';
 import { info, intro, outro, warn } from '../../utils/logger.js';
 import { pickDefined } from '../../utils/options.js';
 import { parsePositiveIntegerFlag } from '../../utils/validation.js';
-function padOrder(value, width) {
+/** Zero-pads an ordinal number to the given width. */
+export function padOrder(value, width) {
     return String(value).padStart(width, '0');
 }
-function rebuildFilenameForOrder(existing, newOrder) {
+/** Builds a new patch filename by replacing the numeric prefix with `newOrder`. */
+export function rebuildFilenameForOrder(existing, newOrder) {
     const currentPrefixMatch = /^(\d+)-/.exec(existing.filename);
     const currentPrefix = currentPrefixMatch?.[1] ?? '001';
     const width = Math.max(3, currentPrefix.length, String(newOrder).length);

package/dist/src/core/config-paths.d.ts

@@ -19,7 +19,7 @@ export declare const SRC_DIR = "src";
 /** Supported top-level fireforge.json keys backed by the current schema. */
 export declare const SUPPORTED_CONFIG_ROOT_KEYS: readonly ["name", "vendor", "appId", "binaryName", "firefox", "build", "license", "wire", "patchLint"];
 /** Supported config paths that can be read or set without --force. */
-export declare const SUPPORTED_CONFIG_PATHS: readonly ["name", "vendor", "appId", "binaryName", "license", "firefox", "firefox.version", "firefox.product", "build", "build.jobs", "wire", "wire.subscriptDir", "patchLint", "patchLint.checkJs"];
+export declare const SUPPORTED_CONFIG_PATHS: readonly ["name", "vendor", "appId", "binaryName", "license", "firefox", "firefox.version", "firefox.product", "build", "build.jobs", "wire", "wire.subscriptDir", "patchLint", "patchLint.checkJs", "patchLint.rawColorAllowlist"];
 /**
  * Gets all project paths based on a root directory.
  * @param root - Root directory of the project

package/dist/src/core/config-paths.js

@@ -45,6 +45,7 @@ export const SUPPORTED_CONFIG_PATHS = [
     'wire.subscriptDir',
     'patchLint',
     'patchLint.checkJs',
+    'patchLint.rawColorAllowlist',
 ];
 /**
  * Gets all project paths based on a root directory.

package/dist/src/core/config-validate.js

@@ -118,6 +118,14 @@ export function validateConfig(data) {
             }
             config.patchLint.checkJs = checkJs;
         }
+        const rawColorAllowlist = patchLintRec.raw('rawColorAllowlist');
+        if (rawColorAllowlist !== undefined) {
+            if (!Array.isArray(rawColorAllowlist) ||
+                rawColorAllowlist.some((v) => typeof v !== 'string')) {
+                throw new ConfigError('Config field "patchLint.rawColorAllowlist" must be an array of strings');
+            }
+            config.patchLint.rawColorAllowlist = rawColorAllowlist;
+        }
     }
     // Warn on unknown root keys
     const knownRootKeys = new Set(SUPPORTED_CONFIG_ROOT_KEYS);

package/dist/src/core/license-headers.d.ts

@@ -25,6 +25,21 @@ export declare function getLicenseHeader(license: ProjectLicense, style: Comment
  * @param style   - Comment syntax of the file
  */
 export declare function hasAnyLicenseHeader(content: string, style: CommentStyle): boolean;
+/**
+ * Returns true if `content` starts with any known license header in any
+ * comment style (js, css, hash).
+ *
+ * @param content - File content to check
+ */
+export declare function hasAnyLicenseHeaderAnyStyle(content: string): boolean;
+/**
+ * Returns true if the first few lines of `content` contain a recognized
+ * upstream license identifier string.
+ *
+ * @param content  - File content to check
+ * @param maxLines - Number of leading lines to inspect (default 10)
+ */
+export declare function containsUpstreamLicenseText(content: string, maxLines?: number): boolean;
 /**
  * Prepends the license header to a file on disk if it is not already present.
  *

package/dist/src/core/license-headers.js

@@ -64,6 +64,34 @@ export function hasAnyLicenseHeader(content, style) {
     const licenses = Object.keys(HEADER_LINES);
     return licenses.some((license) => content.startsWith(getLicenseHeader(license, style)));
 }
+/**
+ * Returns true if `content` starts with any known license header in any
+ * comment style (js, css, hash).
+ *
+ * @param content - File content to check
+ */
+export function hasAnyLicenseHeaderAnyStyle(content) {
+    const styles = ['js', 'css', 'hash'];
+    return styles.some((style) => hasAnyLicenseHeader(content, style));
+}
+/**
+ * Returns true if the first few lines of `content` contain a recognized
+ * upstream license identifier string.
+ *
+ * @param content  - File content to check
+ * @param maxLines - Number of leading lines to inspect (default 10)
+ */
+export function containsUpstreamLicenseText(content, maxLines = 10) {
+    const head = content.split('\n').slice(0, maxLines).join('\n');
+    const markers = [
+        'Mozilla Public License',
+        'SPDX-License-Identifier',
+        'Apache License',
+        'MIT License',
+        'GNU General Public License',
+    ];
+    return markers.some((marker) => head.includes(marker));
+}
 /**
  * Prepends the license header to a file on disk if it is not already present.
  *

package/dist/src/core/manifest-rules.js

@@ -16,7 +16,7 @@ export function getRules(binaryName) {
             extractArgs: (m) => [m[1] ?? ''],
         },
         {
-            pattern: /^browser\/base\/content\/(.+\.(?:js|mjs))$/,
+            pattern: /^browser\/base\/content\/(.+\.(?:js|mjs|xhtml|css))$/,
             isRegistered: (engineDir, fileName) => isBrowserContentRegistered(engineDir, fileName),
             register: (engineDir, after, dryRun, fileName) => registerBrowserContent(engineDir, fileName, after, undefined, dryRun),
             extractArgs: (m) => [m[1] ?? ''],
@@ -93,6 +93,19 @@ export function matchesRegistrablePattern(filePath, binaryName) {
     const rules = getRules(binaryName);
     return rules.some((rule) => rule.pattern.test(normalized));
 }
+/** Returns advice for files that cannot be registered, or null if no advice applies. */
+function getUnregistrableAdvice(filePath) {
+    if (filePath.endsWith('.ftl')) {
+        return "FTL locale files are auto-discovered via jar.mn glob patterns and don't need manual registration.";
+    }
+    const testMatch = filePath.match(/^browser\/base\/content\/test\/([^/]+)\/(?!browser\.toml$).+$/);
+    if (testMatch) {
+        const dir = testMatch[1];
+        return ('Individual test files should be added directly to the corresponding browser.toml manifest. ' +
+            `Use 'fireforge register browser/base/content/test/${dir}/browser.toml' to register new test directories.`);
+    }
+    return null;
+}
 /**
  * Checks whether a supported registrable file is already present in its manifest.
  *
@@ -112,9 +125,13 @@ export async function isFileRegistered(root, filePath) {
             return rule.isRegistered(engineDir, ...args);
         }
     }
+    const advice = getUnregistrableAdvice(normalizedPath);
+    if (advice) {
+        throw new InvalidArgumentError(advice, 'path');
+    }
     throw new InvalidArgumentError(`Unknown file pattern: "${normalizedPath}". Supported patterns:\n` +
         '  browser/themes/shared/*.css\n' +
-        '  browser/base/content/*.js\n' +
+        '  browser/base/content/*.{js,mjs,xhtml,css}\n' +
         '  browser/base/content/test/*/browser.toml\n' +
         `  browser/modules/${config.binaryName}/*.sys.mjs\n` +
         '  toolkit/content/widgets/*/*.{mjs,css}', 'path');
@@ -141,9 +158,13 @@ export async function registerFile(root, filePath, dryRun = false, after) {
             return rule.register(engineDir, after, dryRun, ...args);
         }
     }
+    const advice = getUnregistrableAdvice(normalizedPath);
+    if (advice) {
+        throw new InvalidArgumentError(advice, 'path');
+    }
     throw new InvalidArgumentError(`Unknown file pattern: "${normalizedPath}". Supported patterns:\n` +
         '  browser/themes/shared/*.css\n' +
-        '  browser/base/content/*.js\n' +
+        '  browser/base/content/*.{js,mjs,xhtml,css}\n' +
         '  browser/base/content/test/*/browser.toml\n' +
         `  browser/modules/${config.binaryName}/*.sys.mjs\n` +
         '  toolkit/content/widgets/*/*.{mjs,css}', 'path');

package/dist/src/core/patch-lint.d.ts

@@ -6,6 +6,17 @@ export { buildPatchQueueContext, collectNewFileCreatorsByPath, type ExtractedSpe
 export { buildModifiedFileAdditionsFromDiff, detectNewFilesInDiff } from './patch-lint-diff.js';
 export { type JsDocCheck, type JsDocIssue, validateExportJsDoc } from './patch-lint-jsdoc.js';
 export { resolvePatchOwnedSysMjs } from './patch-lint-ownership.js';
+/**
+ * Counts the total lines in a unified diff and the number of non-binary
+ * text lines, so binary hunks do not inflate patch size checks.
+ *
+ * @param diffContent - Raw unified diff string
+ * @returns Object with `total` line count and `textLines` (total minus binary hunk lines)
+ */
+export declare function countNonBinaryDiffLines(diffContent: string): {
+    total: number;
+    textLines: number;
+};
 /**
  * Returns true if the file path looks like a test file.
  * Matches paths containing `/test/` or filenames starting with

package/dist/src/core/patch-lint.js

@@ -5,7 +5,7 @@ import { pathExists, readText } from '../utils/fs.js';
 import { verbose } from '../utils/logger.js';
 import { hasRawCssColors, stripJsComments } from '../utils/regex.js';
 import { loadFurnaceConfig } from './furnace-config.js';
-import { getLicenseHeader, hasAnyLicenseHeader } from './license-headers.js';
+import { containsUpstreamLicenseText, getLicenseHeader, hasAnyLicenseHeader, hasAnyLicenseHeaderAnyStyle, } from './license-headers.js';
 import { runCheckJs } from './patch-lint-checkjs.js';
 import { detectNewFilesInDiff, extractAddedLinesPerFile } from './patch-lint-diff.js';
 import { validateExportJsDoc } from './patch-lint-jsdoc.js';
@@ -32,6 +32,31 @@ const FILE_SIZE_THRESHOLDS = {
     general: { notice: 500, warning: 750, error: 900 },
     test: { notice: 1200, warning: 1400, error: 1600 },
 };
+/**
+ * Counts the total lines in a unified diff and the number of non-binary
+ * text lines, so binary hunks do not inflate patch size checks.
+ *
+ * @param diffContent - Raw unified diff string
+ * @returns Object with `total` line count and `textLines` (total minus binary hunk lines)
+ */
+export function countNonBinaryDiffLines(diffContent) {
+    const lines = diffContent.split('\n');
+    const total = lines.length;
+    let binaryLines = 0;
+    let inBinaryHunk = false;
+    for (const line of lines) {
+        if (line === 'GIT binary patch' || line.startsWith('GIT binary patch')) {
+            inBinaryHunk = true;
+        }
+        else if (line.startsWith('diff --git ')) {
+            inBinaryHunk = false;
+        }
+        if (inBinaryHunk) {
+            binaryLines++;
+        }
+    }
+    return { total, textLines: total - binaryLines };
+}
 const PATCH_LINE_THRESHOLDS = {
     general: { notice: 800, warning: 1500, error: 3000 },
     test: { notice: 1500, warning: 3000, error: 6000 },
@@ -87,10 +112,10 @@ export async function lintPatchedCss(repoDir, affectedFiles, diffContent, config
     let tokenAllowlist;
     try {
         const root = join(repoDir, '..');
-        const config = await loadFurnaceConfig(root);
-        if (config.tokenPrefix) {
-            tokenPrefix = config.tokenPrefix;
-            tokenAllowlist = new Set(config.tokenAllowlist ?? []);
+        const furnaceConfig = await loadFurnaceConfig(root);
+        if (furnaceConfig.tokenPrefix) {
+            tokenPrefix = furnaceConfig.tokenPrefix;
+            tokenAllowlist = new Set(furnaceConfig.tokenAllowlist ?? []);
         }
     }
     catch (error) {
@@ -386,7 +411,9 @@ export async function lintModifiedFileHeaders(repoDir, affectedFiles, newFiles)
         if (!(await pathExists(filePath)))
             continue;
         const content = await readText(filePath);
-        if (!hasAnyLicenseHeader(content, style)) {
+        if (!hasAnyLicenseHeader(content, style) &&
+            !hasAnyLicenseHeaderAnyStyle(content) &&
+            !containsUpstreamLicenseText(content)) {
             issues.push({
                 file,
                 check: 'modified-file-missing-header',
@@ -412,7 +439,7 @@ export async function lintModifiedFileHeaders(repoDir, affectedFiles, newFiles)
  */
 export async function lintExportedPatch(repoDir, affectedFiles, diffContent, config, patchQueueCtx) {
     const newFiles = detectNewFilesInDiff(diffContent);
-    const lineCount = diffContent.split('\n').length;
+    const { textLines: lineCount } = countNonBinaryDiffLines(diffContent);
     const patchOwnedFiles = resolvePatchOwnedSysMjs(newFiles, patchQueueCtx);
     const [cssIssues, headerIssues, jsIssues, modifiedHeaderIssues] = await Promise.all([
         lintPatchedCss(repoDir, affectedFiles, diffContent, config),

package/dist/src/types/commands/index.d.ts

@@ -1,6 +1,6 @@
 /**
  * Re-exports all command-related types from focused sub-modules.
  */
-export type { BuildOptions, DiscardOptions, DoctorOptions, DownloadOptions, ExportOptions, FurnaceApplyOptions, FurnaceCreateOptions, FurnaceDeployOptions, FurnaceOverrideOptions, FurnacePreviewOptions, FurnaceRefreshOptions, FurnaceRemoveOptions, FurnaceSyncOptions, FurnaceValidateOptions, GlobalOptions, ImportOptions, PackageOptions, PatchDeleteOptions, PatchReorderOptions, RebaseOptions, ReExportOptions, RegisterOptions, ResetOptions, RunOptions, SetupOptions, StatusOptions, TestOptions, TokenAddOptions, WireOptions, } from './options.js';
+export type { BuildOptions, DiscardOptions, DoctorOptions, DownloadOptions, ExportOptions, FurnaceApplyOptions, FurnaceCreateOptions, FurnaceDeployOptions, FurnaceOverrideOptions, FurnacePreviewOptions, FurnaceRefreshOptions, FurnaceRemoveOptions, FurnaceSyncOptions, FurnaceValidateOptions, GlobalOptions, ImportOptions, PackageOptions, PatchCompactOptions, PatchDeleteOptions, PatchReorderOptions, RebaseOptions, ReExportOptions, RegisterOptions, ResetOptions, RunOptions, SetupOptions, StatusOptions, TestOptions, TokenAddOptions, WireOptions, } from './options.js';
 export type { ImportSummary, PatchCategory, PatchesManifest, PatchInfo, PatchLintIssue, PatchMetadata, PatchResult, } from './patches.js';
 export type { DoctorCheck, ProjectStatus, TokenCoverageFileEntry, TokenCoverageReport, } from './project.js';

package/dist/src/types/commands/options.d.ts

@@ -308,6 +308,15 @@ export interface PatchReorderOptions {
     dryRun?: boolean;
     forceUnsafe?: boolean;
 }
+/**
+ * Options for the patch compact command.
+ */
+export interface PatchCompactOptions {
+    /** Skip confirmation prompt; required for non-TTY runs. */
+    yes?: boolean;
+    /** Print what would happen without writing anything. */
+    dryRun?: boolean;
+}
 /**
  * Options for the status command.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hominis/fireforge",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "description": "FireForge — a build tool for customizing Firefox",
   "type": "module",
   "main": "./dist/src/index.js",