@hominis/fireforge 0.11.1 → 0.12.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 0.12.0
+
+### JSDoc validation (breaking)
+
+- **JSDoc enforcement is now AST-based and severity `error`.** The previous heuristic (walk backwards from `export` to find `*/`) has been replaced with Acorn-based AST analysis. Exported functions must have a JSDoc block with `@param` for each parameter (names must match) and `@returns` when returning a value. Exported classes require a JSDoc block. Exported constants require `@type`. This is a breaking change: projects that previously passed with incomplete JSDoc will now see lint errors.
+- **Patch-owned scope.** JSDoc enforcement now applies to all patch-owned `.sys.mjs` files, not just files new in the current diff. A file is patch-owned if it was created by the current diff or by any existing patch in the queue.
+- New check: **`jsdoc-param-mismatch`** (error) — flags `@param` tags that are missing or have the wrong name.
+- New check: **`jsdoc-missing-returns`** (error) — flags functions that return a value but lack `@returns`.
+- Exported constants and classes require a JSDoc block but do not require specific tags like `@type`.
+
+### Optional checkJs pass
+
+- **`patchLint.checkJs`** — new opt-in config field in `fireforge.json`. When enabled, runs TypeScript's `checkJs` pass (`allowJs + checkJs + noEmit`) on patch-owned `.sys.mjs` files only. Firefox globals are shimmed automatically. Diagnostics are filtered to patch-owned files so upstream noise is suppressed.
+- New check: **`checkjs-type-error`** (error/warning) — surfaces type errors from the TypeScript compiler.
+
+### Hardening
+
+- **Path validation.** `binaryName` in `fireforge.json` now rejects null bytes and absolute paths (including Windows drive letters). `isContainedRelativePath` and `isPathInsideRoot` reject null bytes. Furnace custom component `targetPath` rejects null bytes and absolute paths.
+- **Symlink traversal protection.** Patch target validation now checks whether existing paths are symlinks resolving outside the engine tree before applying.
+- **PID-aware stale lock recovery.** The file lock writes the owning PID into the lock directory. Stale lock recovery checks whether the PID is still alive before removing, preventing premature removal when a slow operation legitimately holds the lock.
+- **Forward-import detection** now catches `ChromeUtils.importESModule()` calls in addition to static/dynamic ES imports and `defineESModuleGetters`.
+- **Furnace rollback failure markers** now include the component name and operation context, improving diagnostics in `fireforge doctor`.
+- New lint check in README: **`modified-file-missing-header`** (warning) was implemented but not documented; now listed in the lint checks table.
+
 ## 0.11.0
 
 ### New commands
@@ -53,6 +77,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 +88,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 +105,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
 
@@ -196,13 +196,21 @@ If the manifest drifts after an interrupted export or manual edits, `fireforge i
 | `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 >650 lines                  | warning  |
-| `missing-jsdoc`                | Exports in new `.sys.mjs`             | warning  |
 | `observer-topic-naming`        | Observer topics with binaryName       | warning  |
 | `large-patch-files`            | Patches affecting >5 files            | warning  |
 | `large-patch-lines`            | Patches >300 lines                    | warning  |
 
+**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 TypeScript-based 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 — the pass 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.
 
 </details>
@@ -291,6 +299,51 @@ fireforge furnace diff moz-button                  # unified diff against baseli
 
 `furnace deploy` validates components before applying — errors block, warnings are advisory. `fireforge build` and `fireforge test --build` run apply automatically. Use `fireforge doctor --repair-furnace` if the engine gets out of sync.
 
+## Additional Commands
+
+The commands below cover project configuration, patch queue management, build packaging, and development utilities. Run `fireforge <command> --help` for full option details.
+
+### Configuration
+
+```bash
+# Read a config value
+fireforge config firefox.version
+
+# Set a config value
+fireforge config firefox.version 145.0.0esr
+
+# Set a value at a non-standard path (requires --force)
+fireforge config customKey "value" --force
+```
+
+### Patch queue management
+
+```bash
+# Delete a patch from the queue
+fireforge patch delete 003-ui-sidebar-tweaks.patch
+
+# Reorder a patch to a new position
+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
+```
+
+Both subcommands support `--dry-run` and `--yes`.
+
+### Additional workflow commands
+
+```bash
+# Package the built browser for distribution
+fireforge package
+
+# Watch for file changes and auto-rebuild
+fireforge watch
+
+# Add a CSS design token
+fireforge token --name "--my-color" --value "light-dark(#fff, #000)"
+```
+
 ## Configuration
 
 `fireforge.json` at your project root:

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

@@ -10,8 +10,9 @@ import type { SpinnerHandle } from '../utils/logger.js';
  * @param diffContent - Raw unified diff string
  * @param config - Project configuration
  * @param skipLint - If true, downgrade errors to warnings
+ * @param patchQueueCtx - Optional cross-patch context for ownership resolution
  */
-export declare function runPatchLint(engineDir: string, filesAffected: string[], diffContent: string, config: FireForgeConfig, skipLint?: boolean): Promise<void>;
+export declare function runPatchLint(engineDir: string, filesAffected: string[], diffContent: string, config: FireForgeConfig, skipLint?: boolean, patchQueueCtx?: import('../core/patch-lint-cross.js').PatchQueueContext): Promise<void>;
 /**
  * Resolves patch metadata interactively or from flags, with shared validation.
  * @param options - Export command options

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

@@ -17,9 +17,10 @@ import { isValidPatchCategory, PATCH_CATEGORIES, validatePatchName } from '../ut
  * @param diffContent - Raw unified diff string
  * @param config - Project configuration
  * @param skipLint - If true, downgrade errors to warnings
+ * @param patchQueueCtx - Optional cross-patch context for ownership resolution
  */
-export async function runPatchLint(engineDir, filesAffected, diffContent, config, skipLint) {
-    const issues = await lintExportedPatch(engineDir, filesAffected, diffContent, config);
+export async function runPatchLint(engineDir, filesAffected, diffContent, config, skipLint, patchQueueCtx) {
+    const issues = await lintExportedPatch(engineDir, filesAffected, diffContent, config, patchQueueCtx);
     if (issues.length === 0)
         return;
     const errors = issues.filter((i) => i.severity === 'error');

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

@@ -315,7 +315,7 @@ async function performCreateMutations(args) {
             await restoreRollbackJournalOrThrow(journal, `Failed to create custom component "${args.componentName}"`);
         }
         catch (rollbackError) {
-            await recordFurnaceRollbackFailure(args.projectRoot, 'create-rollback', toError(rollbackError).message);
+            await recordFurnaceRollbackFailure(args.projectRoot, 'create-rollback', `component "${args.componentName}": ${toError(rollbackError).message}`);
             throw rollbackError;
         }
         throw error;

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

@@ -125,7 +125,7 @@ async function restoreNamedDeployRollback(rollbackJournal, name, projectRoot) {
     }
     catch (rollbackError) {
         if (projectRoot) {
-            await recordFurnaceRollbackFailure(projectRoot, 'deploy-rollback', toError(rollbackError).message);
+            await recordFurnaceRollbackFailure(projectRoot, 'deploy-rollback', `component "${name}": ${toError(rollbackError).message}`);
         }
         throw rollbackError;
     }

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

@@ -116,7 +116,7 @@ async function performOverrideMutations(args) {
                 await restoreRollbackJournalOrThrow(journal, `Failed to override component "${args.componentName}"`);
             }
             catch (rollbackError) {
-                await recordFurnaceRollbackFailure(args.projectRoot, 'override-rollback', toError(rollbackError).message);
+                await recordFurnaceRollbackFailure(args.projectRoot, 'override-rollback', `component "${args.componentName}": ${toError(rollbackError).message}`);
                 throw rollbackError;
             }
             throw error;

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

@@ -149,7 +149,7 @@ async function refreshSingleOverride(projectRoot, name, options = {}) {
                     await restoreRollbackJournalOrThrow(journal, `Failed to refresh override "${name}"`);
                 }
                 catch (rollbackError) {
-                    await recordFurnaceRollbackFailure(projectRoot, 'refresh-rollback', toError(rollbackError).message);
+                    await recordFurnaceRollbackFailure(projectRoot, 'refresh-rollback', `override "${name}": ${toError(rollbackError).message}`);
                     throw rollbackError;
                 }
             }

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

@@ -343,7 +343,7 @@ export async function furnaceRemoveCommand(projectRoot, name, options = {}) {
                 await restoreRollbackJournalOrThrow(journal, `Failed to remove component "${name}"`);
             }
             catch (rollbackError) {
-                await recordFurnaceRollbackFailure(projectRoot, 'remove-rollback', toError(rollbackError).message);
+                await recordFurnaceRollbackFailure(projectRoot, 'remove-rollback', `component "${name}": ${toError(rollbackError).message}`);
                 throw rollbackError;
             }
             throw error;

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

@@ -185,7 +185,7 @@ async function performRenameMutations(args) {
                 await restoreRollbackJournalOrThrow(journal, `Failed to rename component "${oldName}" to "${newName}"`);
             }
             catch (rollbackError) {
-                await recordFurnaceRollbackFailure(projectRoot, 'rename-rollback', toError(rollbackError).message);
+                await recordFurnaceRollbackFailure(projectRoot, 'rename-rollback', `rename "${oldName}" → "${newName}": ${toError(rollbackError).message}`);
                 throw rollbackError;
             }
             throw error;

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

@@ -67,7 +67,7 @@ async function promptAddComponents(components, tracked, projectRoot) {
                 await restoreRollbackJournalOrThrow(journal, 'Failed to update furnace.json during scan');
             }
             catch (rollbackError) {
-                await recordFurnaceRollbackFailure(projectRoot, 'scan-rollback', toError(rollbackError).message);
+                await recordFurnaceRollbackFailure(projectRoot, 'scan-rollback', `furnace.json update during scan: ${toError(rollbackError).message}`);
                 throw rollbackError;
             }
             throw error;

package/dist/src/commands/lint.js

@@ -85,14 +85,19 @@ export async function lintCommand(projectRoot, files) {
     }
     const config = await loadConfig(projectRoot);
     const filesAffected = extractAffectedFiles(diff);
+    // Build patch queue context once so it can be shared between the
+    // per-patch ownership resolver and the cross-patch rules.
+    let ctx;
+    if (await pathExists(paths.patches)) {
+        ctx = await buildPatchQueueContext(paths.patches);
+    }
     const issues = [
-        ...(await lintExportedPatch(paths.engine, filesAffected, diff, config)),
+        ...(await lintExportedPatch(paths.engine, filesAffected, diff, config, ctx)),
     ];
     // Cross-patch rules operate over the whole queue, so run them whenever a
     // patches directory exists — they surface duplicate /dev/null creations
     // and forward-import chains that the per-patch orchestrator cannot see.
-    if (await pathExists(paths.patches)) {
-        const ctx = await buildPatchQueueContext(paths.patches);
+    if (ctx) {
         issues.push(...lintPatchQueue(ctx));
     }
     if (issues.length === 0) {

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/ast-utils.d.ts

@@ -1,3 +1,4 @@
+import * as acorn from 'acorn';
 import type * as estree from 'estree';
 import { walk } from 'estree-walker';
 /**
@@ -16,6 +17,15 @@ export type AcornESTreeNode<T extends estree.Node = estree.Node> = T & {
  * `customElements.js`, etc.) are scripts that run in a privileged scope.
  */
 export declare function parseScript(content: string): AcornESTreeNode<estree.Program>;
+/**
+ * Parse JavaScript source as an **ES module**.
+ * Used for `.sys.mjs` files which use static import/export syntax.
+ *
+ * @param content - Source text to parse
+ * @param onComment - Optional array that acorn fills with comment nodes
+ * @returns Parsed program AST with character-offset positions
+ */
+export declare function parseModule(content: string, onComment?: acorn.Comment[]): AcornESTreeNode<estree.Program>;
 /**
  * Convenience cast from `acorn.Node` (or the generic ESTree union returned
  * by estree-walker callbacks) to a positioned, narrowly-typed node.

package/dist/src/core/ast-utils.js

@@ -12,6 +12,24 @@ export function parseScript(content) {
         ecmaVersion: 'latest',
     });
 }
+/**
+ * Parse JavaScript source as an **ES module**.
+ * Used for `.sys.mjs` files which use static import/export syntax.
+ *
+ * @param content - Source text to parse
+ * @param onComment - Optional array that acorn fills with comment nodes
+ * @returns Parsed program AST with character-offset positions
+ */
+export function parseModule(content, onComment) {
+    const opts = {
+        sourceType: 'module',
+        ecmaVersion: 'latest',
+        locations: true,
+    };
+    if (onComment)
+        opts.onComment = onComment;
+    return acorn.parse(content, opts);
+}
 /**
  * Convenience cast from `acorn.Node` (or the generic ESTree union returned
  * by estree-walker callbacks) to a positioned, narrowly-typed node.

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/core/config-paths.d.ts

@@ -17,9 +17,9 @@ export declare const CONFIGS_DIR = "configs";
 /** Name of the source directory */
 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"];
+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"];
+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"];
 /**
  * Gets all project paths based on a root directory.
  * @param root - Root directory of the project

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

@@ -27,6 +27,7 @@ export const SUPPORTED_CONFIG_ROOT_KEYS = [
     'build',
     'license',
     'wire',
+    'patchLint',
 ];
 /** Supported config paths that can be read or set without --force. */
 export const SUPPORTED_CONFIG_PATHS = [
@@ -42,6 +43,8 @@ export const SUPPORTED_CONFIG_PATHS = [
     'build.jobs',
     'wire',
     'wire.subscriptDir',
+    'patchLint',
+    'patchLint.checkJs',
 ];
 /**
  * Gets all project paths based on a root directory.

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

@@ -5,7 +5,7 @@
 import { ConfigError } from '../errors/config.js';
 import { verbose } from '../utils/logger.js';
 import { parseObject } from '../utils/parse.js';
-import { isContainedRelativePath } from '../utils/paths.js';
+import { isContainedRelativePath, isExplicitAbsolutePath } from '../utils/paths.js';
 import { isValidAppId, isValidFirefoxVersion, isValidProjectLicense, PROJECT_LICENSES, validateFirefoxProductVersionCompatibility, } from '../utils/validation.js';
 import { SUPPORTED_CONFIG_ROOT_KEYS } from './config-paths.js';
 /**
@@ -27,8 +27,14 @@ export function validateConfig(data) {
     const vendor = requireConfigString(rec, 'vendor');
     const appId = requireConfigString(rec, 'appId');
     const binaryName = requireConfigString(rec, 'binaryName');
-    if (binaryName.includes('..') || binaryName.includes('/') || binaryName.includes('\\')) {
-        throw new ConfigError('Config field "binaryName" must not contain path separators or ".."');
+    if (binaryName.includes('..') ||
+        binaryName.includes('/') ||
+        binaryName.includes('\\') ||
+        binaryName.includes('\0')) {
+        throw new ConfigError('Config field "binaryName" must not contain path separators, "..", or null bytes');
+    }
+    if (isExplicitAbsolutePath(binaryName)) {
+        throw new ConfigError('Config field "binaryName" must not be an absolute path');
     }
     if (!isValidAppId(appId)) {
         throw new ConfigError('Config field "appId" must be a valid reverse-domain identifier (e.g., "org.example.browser")');
@@ -101,6 +107,18 @@ export function validateConfig(data) {
         }
         config.license = licenseRaw;
     }
+    // PatchLint
+    const patchLintRec = optionalConfigObject(rec, 'patchLint');
+    if (patchLintRec) {
+        config.patchLint = {};
+        const checkJs = patchLintRec.raw('checkJs');
+        if (checkJs !== undefined) {
+            if (typeof checkJs !== 'boolean') {
+                throw new ConfigError('Config field "patchLint.checkJs" must be a boolean');
+            }
+            config.patchLint.checkJs = checkJs;
+        }
+    }
     // Warn on unknown root keys
     const knownRootKeys = new Set(SUPPORTED_CONFIG_ROOT_KEYS);
     for (const key of rec.keys()) {

package/dist/src/core/file-lock.js

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: EUPL-1.2
-import { mkdir, rm, stat } from 'node:fs/promises';
-import { dirname } from 'node:path';
+import { mkdir, readFile, rm, stat, writeFile } from 'node:fs/promises';
+import { dirname, join } from 'node:path';
 import { toError } from '../utils/errors.js';
 import { ensureDir } from '../utils/fs.js';
 import { verbose, warn } from '../utils/logger.js';
@@ -25,6 +25,20 @@ function getNodeErrorCode(error) {
 export function createSiblingLockPath(filePath, suffix = '.fireforge.lock') {
     return `${filePath}${suffix}`;
 }
+const LOCK_PID_FILE = 'pid';
+/**
+ * Checks whether a process with the given PID is still running.
+ * Uses `kill(pid, 0)` which sends no signal but checks existence.
+ */
+function isProcessAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 async function removeIfStaleLock(lockPath, staleMs, onStaleLockMessage) {
     try {
         const lockStat = await stat(lockPath);
@@ -32,6 +46,21 @@ async function removeIfStaleLock(lockPath, staleMs, onStaleLockMessage) {
         if (ageMs <= staleMs) {
             return false;
         }
+        // If the lock directory contains a PID file, check whether the owning
+        // process is still running before removing. This prevents premature
+        // removal when a slow operation (e.g. mach build) legitimately holds
+        // the lock past the stale threshold.
+        try {
+            const pidContent = await readFile(join(lockPath, LOCK_PID_FILE), 'utf-8');
+            const pid = parseInt(pidContent.trim(), 10);
+            if (Number.isFinite(pid) && isProcessAlive(pid)) {
+                verbose(`Lock at ${lockPath} is ${Math.round(ageMs / 1000)}s old but PID ${pid} is still running — not removing`);
+                return false;
+            }
+        }
+        catch {
+            // No PID file or unreadable — fall through to stale removal
+        }
         const staleMessage = onStaleLockMessage?.(ageMs);
         if (staleMessage) {
             warn(staleMessage);
@@ -84,6 +113,14 @@ export async function withFileLock(lockPath, operation, options = {}) {
             await sleep(pollMs);
         }
     }
+    // Write PID into the lock directory so stale-lock recovery can check
+    // whether the owning process is still alive before removing.
+    try {
+        await writeFile(join(lockPath, LOCK_PID_FILE), String(process.pid), 'utf-8');
+    }
+    catch {
+        // Non-fatal: stale recovery falls back to age-only heuristic
+    }
     try {
         return await operation();
     }

package/dist/src/core/furnace-apply.js

@@ -349,7 +349,8 @@ export async function applyAllComponents(root, dryRun = false, options) {
                     // Rollback itself failed: the engine is in a partially restored
                     // state. Persist a pending-repair marker so the next `fireforge
                     // doctor --repair-furnace` run knows to reconcile.
-                    await recordFurnaceRollbackFailure(root, 'apply-rollback', toError(rollbackError).message);
+                    const failedComponents = result.errors.map((e) => e.name).join(', ');
+                    await recordFurnaceRollbackFailure(root, 'apply-rollback', `failed component(s): ${failedComponents || '(unknown)'}: ${toError(rollbackError).message}`);
                     throw rollbackError;
                 }
             }

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

@@ -4,6 +4,7 @@ import { FurnaceError } from '../errors/furnace.js';
 import { toError } from '../utils/errors.js';
 import { pathExists, readJson, writeJson } from '../utils/fs.js';
 import { warn } from '../utils/logger.js';
+import { isExplicitAbsolutePath } from '../utils/paths.js';
 import { isArray, isBoolean, isObject, isString } from '../utils/validation.js';
 import { FIREFORGE_DIR } from './config.js';
 import { resolveFtlDir } from './furnace-constants.js';
@@ -99,8 +100,11 @@ function parseCustomConfig(data, name) {
     if (!isString(data['targetPath'])) {
         throw new FurnaceError(`Furnace config: custom "${name}.targetPath" must be a string`);
     }
-    if (data['targetPath'].includes('..')) {
-        throw new FurnaceError(`Furnace config: custom "${name}.targetPath" must not contain ".." (path traversal)`);
+    if (data['targetPath'].includes('..') || data['targetPath'].includes('\0')) {
+        throw new FurnaceError(`Furnace config: custom "${name}.targetPath" must not contain ".." or null bytes (path traversal)`);
+    }
+    if (isExplicitAbsolutePath(data['targetPath'])) {
+        throw new FurnaceError(`Furnace config: custom "${name}.targetPath" must not be an absolute path`);
     }
     if (!isBoolean(data['register'])) {
         throw new FurnaceError(`Furnace config: custom "${name}.register" must be a boolean`);

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

@@ -3,7 +3,8 @@
  * Patch orchestration — coordinates patch discovery, application, and validation.
  * Pure parsing, content transformation, and lock management are in separate modules.
  */
-import { join } from 'node:path';
+import { lstat } from 'node:fs/promises';
+import { join, resolve } from 'node:path';
 import { PatchError } from '../errors/patch.js';
 import { toError } from '../utils/errors.js';
 import { pathExists, readText, writeText } from '../utils/fs.js';
@@ -34,7 +35,7 @@ async function applySinglePatch(patch, engineDir) {
     try {
         patchContent = await readText(patch.path);
         affectedFiles = extractAffectedFiles(patchContent);
-        validatePatchTargets(patch, affectedFiles);
+        await validatePatchTargets(patch, affectedFiles, engineDir);
         await applyPatchIdempotent(patch.path, engineDir);
         return { patch, success: true };
     }
@@ -143,7 +144,7 @@ export async function validatePatches(patchesDir, engineDir) {
     for (const patch of patches) {
         try {
             const patchContent = await readText(patch.path);
-            validatePatchTargets(patch, extractAffectedFiles(patchContent));
+            await validatePatchTargets(patch, extractAffectedFiles(patchContent), engineDir);
         }
         catch (error) {
             errors.push(`${patch.filename}: ${toError(error).message}`);
@@ -157,11 +158,32 @@ export async function validatePatches(patchesDir, engineDir) {
     }
     return { valid: errors.length === 0, errors };
 }
-function validatePatchTargets(patch, affectedFiles) {
+async function validatePatchTargets(patch, affectedFiles, engineDir) {
     for (const file of affectedFiles) {
         if (!isContainedRelativePath(file)) {
             throw new PatchError(`Patch targets a path outside engine/: ${file}`, patch.filename);
         }
+        // When the engine directory is known, verify that existing target paths
+        // are not symlinks pointing outside the engine tree. A crafted patch
+        // could otherwise write through a symlink to an arbitrary location.
+        if (engineDir) {
+            const targetPath = join(engineDir, file);
+            try {
+                const stats = await lstat(targetPath);
+                if (stats.isSymbolicLink()) {
+                    const realPath = resolve(engineDir, file);
+                    const resolvedEngine = resolve(engineDir);
+                    if (!realPath.startsWith(resolvedEngine + '/') && realPath !== resolvedEngine) {
+                        throw new PatchError(`Patch targets a symlink that resolves outside engine/: ${file}`, patch.filename);
+                    }
+                }
+            }
+            catch (error) {
+                // File doesn't exist yet (new file) or stat fails — skip check
+                if (error instanceof PatchError)
+                    throw error;
+            }
+        }
     }
 }
 /**