Fix merge conflicts with main

README.md

@@ -94,6 +94,7 @@ cat action.yml| nix run nixpkgs#yq-go -- '[[ "Parameter", "Description", "Requir
 | Parameter                   | Description                                                                                                     | Required | Default                                                  |
 | --------------------------- | --------------------------------------------------------------------------------------------------------------- | -------- | -------------------------------------------------------- |
 | `diagnostic-endpoint`       | Diagnostic endpoint url where diagnostics and performance data is sent. To disable set this to an empty string. |          | https://install.determinate.systems/magic-nix-cache/perf |
+| `diff-store`                | Whether or not to diff the store before and after Magic Nix Cache runs.                                         |          | `false`                                                  |
 | `flakehub-api-server`       | The FlakeHub API server.                                                                                        |          | https://api.flakehub.com                                 |
 | `flakehub-cache-server`     | The FlakeHub binary cache server.                                                                               |          | https://cache.flakehub.com                               |
 | `flakehub-flake-name`       | The name of your flake on FlakeHub. The empty string will autodetect your FlakeHub flake.                       |          | `""`                                                     |

action.yml

@@ -34,6 +34,11 @@ inputs:
   startup-notification-port:
     description: "The port magic-nix-cache uses for daemon startup notification."
     default: 41239
+  diff-store:
+    description: "Whether or not to diff the store before and after Magic Nix Cache runs"
+    default: false
+    required: false
+
   source-binary:
     description: Run a version of the cache binary from somewhere already on disk. Conflicts with all other `source-*` options.
   source-branch:

dist/index.js

@@ -95307,6 +95307,7 @@ var MagicNixCacheAction = class extends DetSysAction {
     const flakeHubApiServer = inputs_exports.getString("flakehub-api-server");
     const flakeHubFlakeName = inputs_exports.getString("flakehub-flake-name");
     const useGhaCache = inputs_exports.getBool("use-gha-cache");
+    const diffStore = inputs_exports.getBool("diff-store");
     const daemonCliFlags = [
       "--startup-notification-url",
       `http://127.0.0.1:${notifyPort}`,
@@ -95318,7 +95319,7 @@ var MagicNixCacheAction = class extends DetSysAction {
       diagnosticEndpoint,
       "--nix-conf",
       nixConfPath
-    ].concat(
+    ].concat(diffStore ? ["--diff-store"] : []).concat(
       useFlakeHub ? [
         "--use-flakehub",
         "--flakehub-cache-server",

src/index.ts

@@ -192,6 +192,7 @@ class MagicNixCacheAction extends DetSysAction {
     const flakeHubApiServer = inputs.getString("flakehub-api-server");
     const flakeHubFlakeName = inputs.getString("flakehub-flake-name");
     const useGhaCache = inputs.getBool("use-gha-cache");
+    const diffStore = inputs.getBool("diff-store");
 
     const daemonCliFlags: string[] = [
       "--startup-notification-url",
@@ -205,6 +206,7 @@ class MagicNixCacheAction extends DetSysAction {
       "--nix-conf",
       nixConfPath,
     ]
+      .concat(diffStore ? ["--diff-store"] : [])
       .concat(
         useFlakeHub
           ? [