@hominis/fireforge 0.11.1 → 0.11.2

package/CHANGELOG.md

@@ -53,6 +53,7 @@
 - Override `baseVersion` drift now blocks `apply` and `deploy` by default instead of warning and continuing. Pass `--force` to override, or use `furnace refresh` to update the baseline.
 - Post-apply consistency check verifies that `customElements.js` and `jar.mn` entries match what was deployed.
 - Engine-side content hashes are cached in the furnace state file, making drift detection faster for the common no-change case.
+- Branding file writes are now content-aware: re-running setup with the same configuration no longer bumps file timestamps, avoiding unnecessary `config.status` reconfiguration during incremental builds.
 - `build` and `test --build` now share the same preparation pipeline including Furnace apply, so incremental test builds no longer run against stale component state.
 - `furnace remove` on an override now restores every overridden engine file to its Firefox baseline instead of leaving deployed files behind.
 - Scanner results are cached by content hash within a process, avoiding redundant parsing during scan-status-apply sequences.
@@ -63,6 +64,9 @@
 
 ### Bug fixes
 
+- `fireforge setup` now writes an initial `patches/patches.json` (with `version: 1`) when creating a new project. Previously, setup created the `patches/` directory but not the manifest, causing `fireforge doctor` to fail the "Patch manifest consistency" check on a fresh project. Re-running `setup --force` on an existing project preserves the current manifest.
+- The full Firefox integration test script (`scripts/run-full-firefox-integration.mjs`) now uses `--yes` instead of `--force` when invoking `fireforge discard`, matching the actual CLI flag. This was the sole cause of integration test failures in the discard and recovery workflow steps.
+- The integration test's cleanup loop now uses direct git operations (`git checkout` for tracked files, `git clean` for untracked) instead of routing through `fireforge discard`, which could not handle untracked branding files introduced by the build.
 - `furnace refresh` now correctly advances the per-override `baseCommit` to the engine HEAD after a successful merge, preventing phantom conflicts on subsequent refreshes.
 - `furnace rename` uses the correct file-removal function for FTL files.
 - `furnace remove` now parses browser.toml sections properly, cleaning up metadata keys below the section header instead of leaving stale fragments.
@@ -77,6 +81,10 @@
 
 ### Internal
 
+- The full Firefox integration script now accepts `FIREFORGE_FULL_FIREFOX_VERSION` to override the Firefox version used during the test run, decoupling the test from the version baked into `fireforge.json`.
+- The integration test now verifies that `obj-*/dist/bin/` exists after a build reports success, detecting cases where mach masks a build failure with exit code 0.
+- The integration test cleanup loop now uses direct git operations (`checkout` / `clean`) instead of routing through `fireforge discard`, correctly handling untracked branding files introduced by the build.
+- New unit tests from a full local Firefox integration run: Python version resolution skips candidates above mach's `MAX_PYTHON_VERSION_TO_CONSIDER` and falls through to a compatible version; fresh-project manifest consistency returns zero issues for the empty manifest that `setup` now writes; bootstrap soft-failure detection catches the `urllib.error.HTTPError: HTTP Error 403` pattern observed in real `mach bootstrap` output.
 - CLI command registration is now driven by a declarative manifest instead of hand-listed calls.
 - Doctor checks are a declarative registry with per-check `run`, `skipIf`, and `fix` fields.
 - New shared destructive-op framework handles confirmation, `--dry-run`, `--yes`/`--force-unsafe`, and audit logging for the patch mutation commands.

package/README.md

@@ -26,7 +26,7 @@ Inspired by [fern.js](https://github.com/ghostery/user-agent-desktop) and [Melon
 
 - **Quality checks** `fireforge lint` catches fork-specific issues (raw colours, missing licence headers, relative imports, large patches, cross-patch ordering problems) before you export. `fireforge verify` runs a read-only integrity check over the whole patch queue. `fireforge doctor` diagnoses project health including Furnace component validation.
 
-- **Built and validated against real Firefox code** Developed by editing a real Firefox ESR codebase, learning from existing patch tools, observing the breakages and edge cases that surfaced, and turning those findings into a realistic test suite. In-repo tests are thus grounded in actual development scenarios. Yes, we we mock quite a bit, but when building a tool the modifies a separate, far larger code base, I think it's a valid compromise for the time being. Full end-to-end runs are currently run locally, as they require about 30 GB of disk and significant compute for multiple full builds. Full end-to-end via Github Actions will be added soonishlyTM.
+- **Built and validated against real Firefox code** Developed by editing a real Firefox ESR codebase, learning from existing patch tools, observing the breakages and edge cases that surfaced, and turning those findings into a realistic test suite. In-repo tests are thus grounded in actual development scenarios. Yes, we mock quite a bit, but when building a tool that modifies a separate code base, I think it's a solid compromise for the time being. Full end-to-end runs are currently run locally, as they require about 30 GB of disk and significant compute for multiple full builds. Full end-to-end via Github Actions will be added soonishlyTM.
 
 ## Quick Start
 
@@ -52,7 +52,7 @@ npx fireforge build               # build the browser
 npx fireforge run                 # launch it
 ```
 
-Your project now has `fireforge.json`, an `engine/` directory with Firefox source, and a `patches/` directory ready for your first customisation.
+Your project now has `fireforge.json`, an `engine/` directory with Firefox source, and a `patches/` directory with an empty `patches.json` manifest ready for your first customisation.
 
 ### Workflow Overview
 

package/dist/src/commands/setup-support.js

@@ -3,6 +3,7 @@ import { cpus } from 'node:os';
 import { join } from 'node:path';
 import { group, select, text } from '@clack/prompts';
 import { getProjectPaths, writeConfig } from '../core/config.js';
+import { PATCHES_MANIFEST, savePatchesManifest } from '../core/patch-manifest-io.js';
 import { CancellationError, InvalidArgumentError } from '../errors/base.js';
 import { ensureDir, pathExists, readText, writeText } from '../utils/fs.js';
 import { cancel } from '../utils/logger.js';
@@ -251,6 +252,10 @@ export async function writeSetupProjectFiles(projectRoot, config) {
     await ensureDir(paths.configs);
     await ensureDir(paths.fireforgeDir);
     await writeConfig(projectRoot, config);
+    const manifestPath = join(paths.patches, PATCHES_MANIFEST);
+    if (!(await pathExists(manifestPath))) {
+        await savePatchesManifest(paths.patches, { version: 1, patches: [] });
+    }
     const gitignorePath = join(projectRoot, '.gitignore');
     const requiredIgnores = ['node_modules/', 'dist/', 'engine/', '.fireforge/'];
     if (await pathExists(gitignorePath)) {

package/dist/src/core/branding.js

@@ -2,7 +2,7 @@
 import { join } from 'node:path';
 import { FireForgeError } from '../errors/base.js';
 import { ExitCode } from '../errors/codes.js';
-import { copyDir, pathExists, readText, writeText } from '../utils/fs.js';
+import { copyDir, pathExists, readText, writeTextIfChanged } from '../utils/fs.js';
 import { warn } from '../utils/logger.js';
 /**
  * Error thrown when branding operations fail.
@@ -49,7 +49,7 @@ export async function setupBranding(engineDir, config) {
  */
 async function createConfigureScript(brandingDir, config) {
     const configureShPath = join(brandingDir, 'configure.sh');
-    await writeText(configureShPath, buildConfigureScriptContent(config));
+    await writeTextIfChanged(configureShPath, buildConfigureScriptContent(config));
 }
 function buildConfigureScriptContent(config) {
     return `# This Source Code Form is subject to the terms of the Mozilla Public
@@ -69,7 +69,7 @@ async function updateBrandProperties(brandingDir, config) {
         warn('brand.properties not found in branding directory — browser will use default strings');
         return;
     }
-    await writeText(propsPath, buildBrandPropertiesContent(config));
+    await writeTextIfChanged(propsPath, buildBrandPropertiesContent(config));
 }
 function buildBrandPropertiesContent(config) {
     return `# This Source Code Form is subject to the terms of the Mozilla Public
@@ -90,7 +90,7 @@ async function updateBrandFtl(brandingDir, config) {
         warn('brand.ftl not found in branding directory — browser will use default strings');
         return;
     }
-    await writeText(ftlPath, buildBrandFtlContent(config));
+    await writeTextIfChanged(ftlPath, buildBrandFtlContent(config));
 }
 function buildBrandFtlContent(config) {
     return `# This Source Code Form is subject to the terms of the Mozilla Public
@@ -128,7 +128,7 @@ async function patchMozConfigure(engineDir, config) {
         throw new BrandingError('Could not find MOZ_APP_VENDOR imply_option in browser/moz.configure');
     }
     content = content.replace(vendorRegex, buildMozConfigureVendorLine(config));
-    await writeText(mozConfigurePath, content);
+    await writeTextIfChanged(mozConfigurePath, content);
 }
 function buildMozConfigureVendorLine(config) {
     return `imply_option("MOZ_APP_VENDOR", "${escapeString(config.vendor)}")`;

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

@@ -57,6 +57,14 @@ export declare function readText(path: string): Promise<string>;
  * @param content - Content to write
  */
 export declare function writeText(path: string, content: string): Promise<void>;
+/**
+ * Writes text to a file only when the content has actually changed.
+ * Prevents unnecessary mtime bumps that can trigger downstream rebuilds.
+ * @param path - Path to text file
+ * @param content - Content to write
+ * @returns true if the file was written, false if content was already up to date
+ */
+export declare function writeTextIfChanged(path: string, content: string): Promise<boolean>;
 /**
  * Writes content atomically using a temp-file-and-rename strategy.
  * Temp files are created in the destination directory so rename stays atomic.

package/dist/src/utils/fs.js

@@ -112,6 +112,23 @@ export async function readText(path) {
 export async function writeText(path, content) {
     await writeFileAtomic(path, content);
 }
+/**
+ * Writes text to a file only when the content has actually changed.
+ * Prevents unnecessary mtime bumps that can trigger downstream rebuilds.
+ * @param path - Path to text file
+ * @param content - Content to write
+ * @returns true if the file was written, false if content was already up to date
+ */
+export async function writeTextIfChanged(path, content) {
+    if (await pathExists(path)) {
+        const existing = await readText(path);
+        if (existing === content) {
+            return false;
+        }
+    }
+    await writeText(path, content);
+    return true;
+}
 /**
  * Writes content atomically using a temp-file-and-rename strategy.
  * Temp files are created in the destination directory so rename stays atomic.

package/package.json

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