@hominis/fireforge 0.26.0 → 0.27.1

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

@@ -6,6 +6,7 @@ import { pathExists, readText, removeFile, writeText } from '../utils/fs.js';
 import { warn } from '../utils/logger.js';
 import { PATCH_CATEGORIES } from '../utils/validation.js';
 import { discoverPatches, withPatchDirectoryLock } from './patch-apply.js';
+import { normalizePatchArtifact } from './patch-artifact-normalize.js';
 import { findAllPatchesForFilesWithDetails, } from './patch-export-coverage.js';
 import { addPatchToManifest, loadPatchesManifest, PATCHES_MANIFEST, savePatchesManifest, } from './patch-manifest.js';
 import { allocatePolicyOrder, enforcePatchPolicy } from './patch-policy.js';
@@ -95,7 +96,7 @@ export async function commitExportedPatch(input) {
             }
         }
         try {
-            await writeText(patchPath, input.diff);
+            await writeText(patchPath, normalizePatchArtifact(input.diff));
             await addPatchToManifest(input.patchesDir, plan.metadata, plan.supersededPatches.map((p) => p.filename));
             for (const oldPatch of plan.supersededPatches) {
                 await removeFile(oldPatch.path);
@@ -195,7 +196,7 @@ export async function findExistingPatchForFile(patchesDir, filePath) {
  * @param newContent - New patch content
  */
 export async function updatePatch(patchPath, newContent) {
-    await writeText(patchPath, newContent);
+    await writeText(patchPath, normalizePatchArtifact(newContent));
 }
 /**
  * Deletes a patch file and removes it from the manifest.

package/dist/src/core/status-classify.js

@@ -25,6 +25,14 @@ function getPrimaryStatusCode(status) {
     }
     return status;
 }
+function isGeneratedBrandingPath(file, binaryName) {
+    const normalized = file.replace(/\\/g, '/');
+    const brandingRoot = `browser/branding/${binaryName}`;
+    return (normalized === 'browser/moz.configure' ||
+        normalized === `${brandingRoot}/configure.sh` ||
+        normalized === `${brandingRoot}/locales/en-US/brand.properties` ||
+        normalized === `${brandingRoot}/locales/en-US/brand.ftl`);
+}
 /**
  * Classifies files into patch-backed, unmanaged, branding, furnace, or
  * conflict buckets.
@@ -63,8 +71,17 @@ export async function classifyFiles(files, engineDir, patchesDir, binaryName, fu
     }
     const results = [];
     for (const entry of files) {
-        // Branding check first
-        if (isBrandingManagedPath(entry.file, binaryName)) {
+        const owners = patchClaims.get(entry.file);
+        const primaryCode = getPrimaryStatusCode(entry.status);
+        // Branding paths are tool-managed for generated edits, but a brand-new
+        // unowned branding asset must not disappear from `status --unmanaged`.
+        // The Hominis Firefox 152 side-grade added Assets.car under the active
+        // branding tree; classifying every branding path before checking
+        // ownership hid that new patch candidate as "branding" even though no
+        // patch claimed it yet.
+        const isUnownedNewFile = owners === undefined && (primaryCode === '?' || primaryCode === 'A');
+        if (isBrandingManagedPath(entry.file, binaryName) &&
+            (!isUnownedNewFile || isGeneratedBrandingPath(entry.file, binaryName))) {
             results.push({ ...entry, classification: 'branding' });
             continue;
         }
@@ -82,7 +99,6 @@ export async function classifyFiles(files, engineDir, patchesDir, binaryName, fu
                 continue;
             }
         }
-        const owners = patchClaims.get(entry.file);
         // Multiple patches claim this file — surface the cross-patch
         // ownership conflict regardless of whether the current content
         // matches any single claim. `--ownership` reports the same state
@@ -102,7 +118,6 @@ export async function classifyFiles(files, engineDir, patchesDir, binaryName, fu
             continue;
         }
         // File is claimed by exactly one patch — compare content.
-        const primaryCode = getPrimaryStatusCode(entry.status);
         if (primaryCode === 'D') {
             // Deleted file: patch-backed only if patch expects deletion
             const expected = await computePatchedContent(patchesDir, engineDir, entry.file);

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, PatchCompactOptions, PatchDeleteOptions, PatchLintIgnoreOptions, PatchMoveFilesOptions, PatchRenameOptions, PatchReorderOptions, PatchStagedDependencyOptions, PatchTierOptions, 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, PatchLintIgnoreOptions, PatchMoveFilesOptions, PatchRenameOptions, PatchReorderOptions, PatchStagedDependencyOptions, PatchTierOptions, RebaseOptions, ReExportOptions, RegisterOptions, ResetOptions, RunOptions, SetupOptions, SourceSetOptions, StatusOptions, TestOptions, TokenAddOptions, WireOptions, } from './options.js';
 export type { ImportSummary, PatchCategory, PatchesManifest, PatchInfo, PatchLintIssue, PatchMetadata, PatchResult, PatchStagedDependencies, PatchStagedForwardImport, } from './patches.js';
 export type { DoctorCheck, ProjectStatus, TokenCoverageFileEntry, TokenCoverageReport, } from './project.js';

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

@@ -17,7 +17,7 @@ export interface SetupOptions {
     binaryName?: string;
     /** Firefox version to base on */
     firefoxVersion?: string;
-    /** Firefox product type (firefox, firefox-esr, firefox-beta) */
+    /** Firefox product type (firefox, firefox-esr, firefox-beta, firefox-devedition) */
     product?: FirefoxProduct;
     /** Overwrite existing configuration without prompting */
     force?: boolean;
@@ -31,6 +31,19 @@ export interface DownloadOptions {
     /** Force re-download, deleting existing engine/ */
     force?: boolean;
 }
+/**
+ * Options for the source command.
+ */
+export interface SourceSetOptions {
+    /** Firefox version to set */
+    version: string;
+    /** Firefox product type */
+    product: FirefoxProduct;
+    /** Optional pinned SHA-256 for the resolved source archive */
+    sha256?: string;
+    /** Clear any existing pinned SHA-256 */
+    clearSha256?: boolean;
+}
 /**
  * Options for the build command.
  */
@@ -184,6 +197,12 @@ export interface ReExportOptions {
     skipLint?: boolean;
     /** Skip confirmation prompt on shrink (required for non-TTY) */
     yes?: boolean;
+    /**
+     * Explicitly allow `--files` to remove paths that are currently owned by
+     * the patch. Without this acknowledgement, non-dry-run shrinks are refused
+     * before the interactive/`--yes` confirmation path.
+     */
+    allowShrink?: boolean;
     /** Bypass cross-patch lint refusal on projected shrink state */
     forceUnsafe?: boolean;
     /**
@@ -645,6 +664,8 @@ export interface DoctorOptions {
      * and side-effect-free.
      */
     repairFurnace?: boolean;
+    /** Run extra post-rebase checks for common Firefox registration surfaces. */
+    postRebaseAudit?: boolean;
 }
 /**
  * Global CLI options available to all commands.

package/dist/src/types/config.d.ts

@@ -1,7 +1,7 @@
 /**
  * Firefox product type for downloads.
  */
-export type FirefoxProduct = 'firefox' | 'firefox-esr' | 'firefox-beta';
+export type FirefoxProduct = 'firefox' | 'firefox-esr' | 'firefox-beta' | 'firefox-devedition';
 /**
  * Firefox version configuration.
  */

package/dist/src/utils/elapsed.d.ts

@@ -0,0 +1,4 @@
+/** Formats elapsed milliseconds for progress messages. */
+export declare function formatElapsed(ms: number): string;
+/** Returns formatted elapsed time since a start timestamp from Date.now(). */
+export declare function elapsedSince(startedAt: number): string;

package/dist/src/utils/elapsed.js

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: EUPL-1.2
+/** Formats elapsed milliseconds for progress messages. */
+export function formatElapsed(ms) {
+    const totalSeconds = Math.max(0, Math.round(ms / 1000));
+    const minutes = Math.floor(totalSeconds / 60);
+    const seconds = totalSeconds % 60;
+    if (minutes === 0)
+        return `${seconds}s`;
+    return `${minutes}m ${seconds}s`;
+}
+/** Returns formatted elapsed time since a start timestamp from Date.now(). */
+export function elapsedSince(startedAt) {
+    return formatElapsed(Date.now() - startedAt);
+}
+//# sourceMappingURL=elapsed.js.map

package/dist/src/utils/validation.d.ts

@@ -71,7 +71,7 @@ export declare function assertObject(value: unknown, name: string): asserts valu
 export declare function isValidFirefoxVersion(version: string): boolean;
 /**
  * Validates a Firefox product string.
- * Accepts: firefox, firefox-esr, firefox-beta
+ * Accepts: firefox, firefox-esr, firefox-beta, firefox-devedition
  */
 export declare function isValidFirefoxProduct(product: string): boolean;
 /**
@@ -108,7 +108,7 @@ export declare function inferProductFromVersion(version: string): 'firefox' | 'f
  *
  * Rules:
  * - `firefox-esr` requires an ESR version (e.g. "140.9.0esr", "128.0.1esr").
- * - `firefox-beta` requires a beta version (e.g. "147.0b1").
+ * - `firefox-beta` and `firefox-devedition` require a beta version (e.g. "147.0b1").
  * - `firefox` (stable) rejects both ESR and beta version strings.
  *
  * @returns An error message if incompatible, or undefined if valid.

package/dist/src/utils/validation.js

@@ -106,10 +106,10 @@ export function isValidFirefoxVersion(version) {
 }
 /**
  * Validates a Firefox product string.
- * Accepts: firefox, firefox-esr, firefox-beta
+ * Accepts: firefox, firefox-esr, firefox-beta, firefox-devedition
  */
 export function isValidFirefoxProduct(product) {
-    return ['firefox', 'firefox-esr', 'firefox-beta'].includes(product);
+    return ['firefox', 'firefox-esr', 'firefox-beta', 'firefox-devedition'].includes(product);
 }
 /**
  * Valid project license SPDX identifiers.
@@ -161,7 +161,7 @@ export function inferProductFromVersion(version) {
  *
  * Rules:
  * - `firefox-esr` requires an ESR version (e.g. "140.9.0esr", "128.0.1esr").
- * - `firefox-beta` requires a beta version (e.g. "147.0b1").
+ * - `firefox-beta` and `firefox-devedition` require a beta version (e.g. "147.0b1").
  * - `firefox` (stable) rejects both ESR and beta version strings.
  *
  * @returns An error message if incompatible, or undefined if valid.
@@ -177,9 +177,9 @@ export function validateFirefoxProductVersionCompatibility(version, product) {
             }
             break;
         case 'firefox-beta':
+        case 'firefox-devedition':
             if (!versionIsBeta) {
-                return (`Product "firefox-beta" requires a beta version (e.g. "147.0b1"), ` +
-                    `but got "${version}"`);
+                return (`Product "${product}" requires a beta version (e.g. "147.0b1"), ` + `but got "${version}"`);
             }
             break;
         case 'firefox':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hominis/fireforge",
-  "version": "0.26.0",
+  "version": "0.27.1",
   "description": "FireForge — a build tool for customizing Firefox",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -53,7 +53,7 @@
   "dependencies": {
     "@clack/prompts": "^1.2.0",
     "acorn": "^8.14.0",
-    "commander": "^14.0.0",
+    "commander": "^15.0.0",
     "estree-walker": "^3.0.3",
     "magic-string": "^0.30.17",
     "picocolors": "^1.1.0"